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;
+ }
},
};
\ 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 @@
-
+
-
@@ -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 @@
+
+
@@ -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 @@
-
+
-
@@ -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 @@
-
+
-
@@ -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 @@
-
+
-
@@ -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 @@
-
+
-
@@ -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 @@
-
+
-
-
@@ -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 @@
-