From 037dc2d1017745b81c4d70920c51c18888fa10fc Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Tue, 21 May 2024 17:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=EF=BC=8C?=
 =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BB=A5=E5=8F=8A=E5=8F=B8=E6=9C=BA=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/zk/zkSelectSearch.vue           |  4 ++++
 .../transport/DriverWages/DriverWages/List.vue | 10 +++++++---
 .../DriverWages/DriverWages/Total.vue          |  3 ++-
 .../MaintenanceGiornaleLog/List.vue            |  9 +++++++--
 .../Maintenance/OtherExpensesLog/List.vue      | 10 +++++++---
 .../OilConsumption/OilConsumption/List.vue     |  9 +++++++--
 src/pages/Middle/transport/Tire/Tire/List.vue  | 10 +++++++---
 .../transport/TrainNumber/TrainNumber/List.vue | 18 ++++++++++--------
 .../transport/Truck/Truck/TrainNumberList.vue  | 14 +++++---------
 9 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/src/components/zk/zkSelectSearch.vue b/src/components/zk/zkSelectSearch.vue
index 3a07cdd..a98ac57 100644
--- a/src/components/zk/zkSelectSearch.vue
+++ b/src/components/zk/zkSelectSearch.vue
@@ -7,6 +7,7 @@
       :default-active-first-option="false"
       :show-arrow="false"
       :filter-option="false"
+      :allowClear ="true"
       :not-found-content="null"
       @search="handleSearch"
       @change="handleChange"
@@ -88,6 +89,9 @@ export default {
       });
 
     },
+    reset(){
+      this.value = undefined;
+    }
   },
 };
 </script>
\ No newline at end of file
diff --git a/src/pages/Middle/transport/DriverWages/DriverWages/List.vue b/src/pages/Middle/transport/DriverWages/DriverWages/List.vue
index 7808c36..60a367d 100644
--- a/src/pages/Middle/transport/DriverWages/DriverWages/List.vue
+++ b/src/pages/Middle/transport/DriverWages/DriverWages/List.vue
@@ -4,10 +4,10 @@
     <a-row type="flex">
       <a-col :flex="$mk.config.ui.searchFlex">
         <!-- 搜索区 -->
-        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
           
           <template #driver_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true"     :ListUrl="zkSelectSearch2.Search"
+            <ZkSelectSearch ref="refTruck" :ListTitle="'请选择司机'" :IsListShowCode="true"     :ListUrl="zkSelectSearch2.Search"
               :ListUrlData="zkSelectSearch2.zkSelectData"
               :ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch2.zkBackFieldNames" @zkSelectSearch="StaffhandleChange">
@@ -422,7 +422,11 @@ export default {
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
-
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
+      this.$refs.xGrid.commitProxy('query') // 提交搜索
+    },
     // 发放工资
     grant(row){
       console.log("row",row);
diff --git a/src/pages/Middle/transport/DriverWages/DriverWages/Total.vue b/src/pages/Middle/transport/DriverWages/DriverWages/Total.vue
index 6aee0d0..4df05dc 100644
--- a/src/pages/Middle/transport/DriverWages/DriverWages/Total.vue
+++ b/src/pages/Middle/transport/DriverWages/DriverWages/Total.vue
@@ -27,6 +27,8 @@
           <mk-toolbar  :isShowLog="false" :isShowSetting="false" :isShowAdd="false" @toolbarClick="toolbarClick"></mk-toolbar>
         </a-col>
       </a-row>
+      <vxe-toolbar ref="xToolbar" custom export>
+  </vxe-toolbar>
       <!-- 表格区 -->
       <div class="gridPanel">
         <vxe-grid ref='xGrid' :export-config="{}" v-bind="gridOptions">
@@ -159,7 +161,6 @@
             align: 'right', span: 6, itemRender: {  // 按钮列
               name: '$buttons', children: [{ props: { type: 'submit', content: '搜索', status: 'primary' } },  // 搜索按钮
               { props: { type: 'reset', content: '重置' } },
-              { props: { type: 'reset', content: '打印' } }
             ]
             }
           }
diff --git a/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue b/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue
index 2a367dd..e313259 100644
--- a/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue
+++ b/src/pages/Middle/transport/Maintenance/MaintenanceGiornaleLog/List.vue
@@ -4,9 +4,9 @@
     <a-row type="flex">
       <a-col :flex="$mk.config.ui.searchFlex">
         <!-- 搜索区 -->
-        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
           <template #truck_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
+            <ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
               :ListUrlData="zkSelectSearch.zkSelectData"
               :ListFieldName="zkSelectSearch.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@@ -395,6 +395,11 @@ export default {
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
+      this.$refs.xGrid.commitProxy('query') // 提交搜索
+    },
 
     // 选择器改变
     TruckhandleChange(value) {
diff --git a/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue b/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue
index 8b6e2cf..2d11e49 100644
--- a/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue
+++ b/src/pages/Middle/transport/Maintenance/OtherExpensesLog/List.vue
@@ -4,9 +4,9 @@
     <a-row type="flex">
       <a-col :flex="$mk.config.ui.searchFlex">
         <!-- 搜索区 -->
-        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
           <template #truck_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
+            <ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
               :ListUrlData="zkSelectSearch.zkSelectData"
               :ListFieldName="zkSelectSearch.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@@ -383,7 +383,11 @@ export default {
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
-
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
+      this.$refs.xGrid.commitProxy('query') // 提交搜索
+    },
 
     // 选择器改变
     TruckhandleChange(value) {
diff --git a/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue b/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue
index ef322d9..c91b473 100644
--- a/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue
+++ b/src/pages/Middle/transport/OilConsumption/OilConsumption/List.vue
@@ -4,9 +4,9 @@
     <a-row type="flex">
       <a-col :flex="$mk.config.ui.searchFlex">
         <!-- 搜索区 -->
-        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
           <template #truck_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
+            <ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
               :ListUrlData="zkSelectSearch.zkSelectData"
               :ListFieldName="zkSelectSearch.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@@ -363,6 +363,11 @@ export default {
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
+      this.$refs.xGrid.commitProxy('query') // 提交搜索
+    },
 
     // 选择器改变
     TruckhandleChange(value) {
diff --git a/src/pages/Middle/transport/Tire/Tire/List.vue b/src/pages/Middle/transport/Tire/Tire/List.vue
index fe2f5a7..7d30636 100644
--- a/src/pages/Middle/transport/Tire/Tire/List.vue
+++ b/src/pages/Middle/transport/Tire/Tire/List.vue
@@ -4,9 +4,9 @@
     <a-row type="flex">
       <a-col :flex="$mk.config.ui.searchFlex">
         <!-- 搜索区 -->
-        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
           <template #truck_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
+            <ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
               :ListUrlData="zkSelectSearch.zkSelectData"
               :ListFieldName="zkSelectSearch.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
@@ -418,7 +418,11 @@ export default {
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
-    
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
+      this.$refs.xGrid.commitProxy('query') // 提交搜索
+    },
     // 选择器改变
     TruckhandleChange(value) {
       this.$data.searchFormData.truck_id = value.id;
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
index 092d409..af85be3 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/List.vue
@@ -4,16 +4,16 @@
     <a-row type="flex">
       <a-col :flex="$mk.config.ui.searchFlex">
         <!-- 搜索区 -->
-        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch">
+        <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
           <template #truck_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
+            <ZkSelectSearch ref="refTruck" :ListTitle="'请选择车辆'" :IsListShowCode="true"     :ListUrl="zkSelectSearch.Search"
               :ListUrlData="zkSelectSearch.zkSelectData"
               :ListFieldName="zkSelectSearch.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch.zkBackFieldNames" @zkSelectSearch="TruckhandleChange">
             </ZkSelectSearch>
           </template>
           <template #driver_id="{ }">
-            <ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true"     :ListUrl="zkSelectSearch2.Search"
+            <ZkSelectSearch ref="refDriver" :ListTitle="'请选择司机'" :IsListShowCode="true"     :ListUrl="zkSelectSearch2.Search"
               :ListUrlData="zkSelectSearch2.zkSelectData"
               :ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
               :BackFieldNames="zkSelectSearch2.zkBackFieldNames" @zkSelectSearch="StaffhandleChange">
@@ -507,20 +507,22 @@ export default {
     onSearch() {
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
-
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
+      this.$refs['refDriver'].reset();
+      this.$refs.xGrid.commitProxy('query') // 提交搜索
+    },
     // 选择器改变
     StaffhandleChange(value) {
-      
+      console.log(value,'++++')
       this.$data.searchFormData.driver_id = value.id;
-      console.log("this.$data.searchFormData.driver_id:",this.$data.searchFormData.driver_id);
-      
       this.$refs.xGrid.commitProxy('query') // 提交搜索
       
     },
     // 选择器改变
     TruckhandleChange(value) {
       this.$data.searchFormData.truck_id = value.id;
-      console.log("this.$data.searchFormData.truck_id:",this.$data.searchFormData.truck_id);
       this.$refs.xGrid.commitProxy('query') // 提交搜索
     }
   },
diff --git a/src/pages/Middle/transport/Truck/Truck/TrainNumberList.vue b/src/pages/Middle/transport/Truck/Truck/TrainNumberList.vue
index 11fedff..5f4ff95 100644
--- a/src/pages/Middle/transport/Truck/Truck/TrainNumberList.vue
+++ b/src/pages/Middle/transport/Truck/Truck/TrainNumberList.vue
@@ -2,7 +2,7 @@
   <div>
     <vxe-form :data="searchFormData" :items="searchFormItems" titleColon @submit="onSearch" @reset="onReset">
       <template #driver_id="{ }">
-        <ZkSelectSearch :ListTitle="'请选择司机'" :IsListShowCode="true"     
+        <ZkSelectSearch :ListTitle="'请选择司机'" ref="refTruck" :IsListShowCode="true"     
           :ListUrl="zkSelectSearch2.Search"
           :ListUrlData="zkSelectSearch2.zkSelectData"
           :ListFieldName="zkSelectSearch2.zkSelectDataFieldName"
@@ -419,15 +419,11 @@ export default {
       // console.log(this.$refs.xGrid)
       // this.$refs.xGrid.commitProxy('query') // 提交搜索
     },
-    onReset(){
-      this.start_time = null;
-      this.end_time = null;
-      this.searchFormData = {
-        code: '',
-        driver_id:'',
-      }
+    onReset() {
+      this.searchFormData = {}; // 清空搜索表单数据
+      this.$refs['refTruck'].reset();
       this.initListData();
-    }
+    },
   }
 }