From b62578f8b43f15be89b3d14f463f11aed03e6fb9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 09 五月 2024 18:57:25 +0800
Subject: [PATCH] 最新版本

---
 admin/src/views/business/parkBook.vue |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/admin/src/views/business/parkBook.vue b/admin/src/views/business/parkBook.vue
index 1a9aea1..406febd 100644
--- a/admin/src/views/business/parkBook.vue
+++ b/admin/src/views/business/parkBook.vue
@@ -2,14 +2,17 @@
     <TableLayout :permissions="['business:member:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="120px" inline>
-            <el-form-item label="杞︾墝鍙�" prop="code">
-                <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+            <el-form-item label="杞︾墝鍙�" prop="carCode">
+                <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <el-form-item label="鍛樺伐濮撳悕/鎵嬫満鍙�" prop="memberName">
                 <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ憳宸ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <el-form-item label="閮ㄩ棬" prop="companyName">
                 <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ラ儴闂�" @keypress.enter.native="search"></el-input>
+            </el-form-item>
+            <el-form-item label="鍋滆溅搴撳悕绉�" prop="parksName">
+                <el-input v-model="searchForm.parksName" placeholder="璇疯緭鍏ュ仠杞﹀簱鍚嶇О" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
                 <el-button type="primary" @click="search">鎼滅储</el-button>
@@ -19,9 +22,9 @@
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
             <ul class="toolbar" v-permissions="['business:member:create', 'business:member:delete']">
-<!--                <li><el-button type="primary" @click="$refs.operaCarsWindow.open('鏂板缓杞﹁締淇℃伅琛�')" icon="el-icon-plus" v-permissions="['business:member:create']">鏂板缓</el-button></li>-->
-                <li><el-button @click="syncCars" icon="el-icon-delete" v-permissions="['business:cars:sync']">鍚屾</el-button></li>
+<!--
                 <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:cars:delete']">鍒犻櫎</el-button></li>
+-->
             </ul>
             <el-table
                 v-loading="isWorking.search"
@@ -30,7 +33,7 @@
                 @selection-change="handleSelectionChange"
             >
                 <el-table-column type="selection" width="55"></el-table-column>
-                <el-table-column prop="code" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+                <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="parksName" label="鍋滆溅鍦�" min-width="100px"></el-table-column>
                 <el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
                     <template slot-scope="{row}">
@@ -42,26 +45,43 @@
                 <el-table-column prop="memberName" label="濮撳悕" min-width="100px"></el-table-column>
                 <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
                 <el-table-column prop="companyName" label="閮ㄩ棬/鍏徃" min-width="100px"></el-table-column>
-                <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
-                <el-table-column prop="remark" label="鏈夋晥鏈�" min-width="100px">
+                <el-table-column prop="startTime" label="鏈夋晥鏈�" min-width="100px">
                     <template slot-scope="{row}">
                         <span>{{validity(row.startTime, row.endTime)}}</span>
 <!--                        <span v-if="!row.startTime || !row.endTime">闀挎湡</span>-->
 <!--                        <span v-else>{{row.startTime}} 鑷� {{row.endTime}}</span>-->
                     </template>
                 </el-table-column>
+              <el-table-column prop="startTime" label="鐘舵��" min-width="100px">
+                <template slot-scope="{row}">
+                  <div v-if="row.isdeleted==1"  style="color: red">宸插垹闄�</div>
+                  <div v-else style="color: green">
+                      <span v-if="row.hkStatus==0"  style="color: #435EBE">寰呬笅鍙�</span>
+                      <span v-if="row.hkStatus==1"  style="color: green">涓嬪彂鎴愬姛</span>
+                     <span v-if="row.hkStatus==2"  style="color: red">涓嬪彂澶辫触</span>
+                   </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="remark" label="澶囨敞" min-width="100px">
+                <template slot-scope="{row}">
+                  <span v-if="row.isdeleted !=2">{{row.remark}}</span>
+                </template>
+              </el-table-column>
                 <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
-                <el-table-column
-                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"
-                    label="鎿嶄綔"
-                    min-width="120"
-                    fixed="right"
-                >
-                    <template slot-scope="{row}">
-<!--                        <el-button type="text" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>-->
-                        <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                    v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
+<!--                    label="鎿嶄綔"-->
+<!--                    min-width="120"-->
+<!--                    fixed="right"-->
+<!--                >-->
+<!--                    <template slot-scope="{row}">-->
+<!--&lt;!&ndash;                        <el-button type="text" @click="$refs.operaCarsWindow.open('缂栬緫杞﹁締淇℃伅琛�', row)" icon="el-icon-edit" v-permissions="['business:member:update']">缂栬緫</el-button>&ndash;&gt;-->
+<!--                        <el-button type="text" @click="deleteById(row)" v-if="row.isdeleted !=1" icon="el-icon-delete" v-permissions="['business:parkbook:delete']">鍒犻櫎</el-button>-->
+<!--&lt;!&ndash;-->
+<!--                        <el-button type="text" @click="reUpdate(row)" v-if="row.isdeleted !=1 && row.hkStatus ==0" icon="el-icon-edit" v-permissions="['business:parkbook:update']">绔嬪埢涓嬪彂</el-button>-->
+<!--&ndash;&gt;-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
             </el-table>
             <pagination
                 @size-change="handleSizeChange"
@@ -80,6 +100,10 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import OperaCarsWindow from '@/components/business/OperaCarsWindow'
+import { validity } from '@/utils/util'
+import { sync } from '@/api/business/cars'
+import { batchLoss } from '@/api/business/memberCard'
+import {reUpdate} from "@/api/business/parkBook";
 export default {
   name: 'parkBook',
   extends: BaseTable,
@@ -88,8 +112,9 @@
     return {
       // 鎼滅储
       searchForm: {
-        code: '',
+        carCode: '',
         memberName: '',
+        parksName: '',
         companyName: ''
       }
     }
@@ -102,6 +127,18 @@
       'field.main': 'id'
     })
     this.search()
+  },
+  methods: {
+    validity (startTime, endTime) {
+      return validity(startTime, endTime)
+    },
+    reUpdate (row) {
+      reUpdate({ id: row.id })
+        .then(res => {
+          this.$message.success('鎿嶄綔鎴愬姛')
+          this.search()
+        })
+    }
   }
 }
 </script>

--
Gitblit v1.9.3