From 777bcb6c5660c0ed14d85207377b62b779d81dde Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:08:55 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun

---
 admin/src/views/business/driverList.vue |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/admin/src/views/business/driverList.vue b/admin/src/views/business/driverList.vue
index 7e7b6b4..41156d4 100644
--- a/admin/src/views/business/driverList.vue
+++ b/admin/src/views/business/driverList.vue
@@ -61,7 +61,8 @@
         </el-table-column>
         <el-table-column label="鎿嶄綔" min-width="100" fixed="right">
           <template slot-scope="{row}">
-            <el-button type="text"   @click="handleDetail(row)">璇︽儏</el-button>
+            <el-button type="text" @click="handleEdit(row)">缂栬緫</el-button>
+            <el-button type="text"   @click="handleDetail(row)">鍙告満璇︽儏</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -72,6 +73,7 @@
       ></pagination>
     </template>
     <OperaDriverDetail ref="operaDriverDetail" />
+    <OperaDriverEditWindow ref="operaDriverEditWindow" @success="handlePageChange" />
   </TableLayout>
 </template>
 
@@ -80,12 +82,13 @@
 import TableLayout from '@/layouts/TableLayout'
 import Pagination from '@/components/common/Pagination'
 import OperaDriverDetail from '@/components/business/OperaDriverDetail'
+import OperaDriverEditWindow from '@/components/business/OperaDriverEditWindow'
 import { updateStatus, exportExcel } from '@/api/business/driver'
 
 export default {
   name: 'DriverList',
   extends: BaseTable,
-  components: { TableLayout, Pagination, OperaDriverDetail },
+  components: { TableLayout, Pagination, OperaDriverDetail, OperaDriverEditWindow },
   data () {
     return {
       searchForm: {
@@ -94,8 +97,9 @@
         status: '',
         sex: '',
         createTime1: '',
-        startTime: '',
-        endTime: '',
+        versionType: 0,
+        createTimeStart: '',
+        createTimeEnd: '',
         auditStatus: 3
       }
     }
@@ -108,9 +112,12 @@
     this.search()
   },
   methods: {
+    handleEdit (row) {
+      this.$refs.operaDriverEditWindow.open('缂栬緫闂ㄥ簵', row)
+    },
     handleDateChange (val) {
-      this.searchForm.startTime = val ? val[0] : ''
-      this.searchForm.endTime = val ? val[1] : ''
+      this.searchForm.createTimeStart = val ? val[0] : ''
+      this.searchForm.createTimeEnd = val ? val[1] : ''
       this.search()
     },
     handleDetail (row) {
@@ -124,6 +131,20 @@
         this.$tip.apiFailed(e)
       })
     },
+    reset () {
+      this.searchForm = {
+        keyword: '',
+        carNo: '',
+        status: '',
+        sex: '',
+        createTime1: '',
+        versionType: 0,
+        createTimeStart: '',
+        createTimeEnd: '',
+        auditStatus: 3
+      }
+      this.search()
+    },
     handleExport () {
       this.isWorking.export = true
       exportExcel(this.getTableParams())

--
Gitblit v1.9.3