From a0654f2c21511a0e16b977427a563a3ccdfd1fba Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期二, 14 三月 2023 15:34:06 +0800
Subject: [PATCH] 搜索bug
---
src/views/your/area-manage/areaManage.vue | 36 ++++++++++-
src/views/your/car-manage/carManage.vue | 28 +++++++-
src/views/your/customerReceive-manage/customerReceive.vue | 24 +++++++-
src/views/your/order-manage/orderEvaluateManage.vue | 29 ++++++++-
src/views/your/addOil-manage/addOilManage.vue | 24 +++++++-
src/views/your/suggest-manage/suggestManage.vue | 24 +++++++-
6 files changed, 142 insertions(+), 23 deletions(-)
diff --git a/src/views/your/addOil-manage/addOilManage.vue b/src/views/your/addOil-manage/addOilManage.vue
index 6637912..62983b1 100644
--- a/src/views/your/addOil-manage/addOilManage.vue
+++ b/src/views/your/addOil-manage/addOilManage.vue
@@ -13,9 +13,9 @@
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
}}</Button>
<Input
- v-model="searchForm.carNo"
+ v-model="searchForm2.carNo"
suffix="ios-search"
- @on-change="getDataList"
+ @on-change="getDataList2"
placeholder="杈撳叆杞︾墝鍙锋悳绱�"
clearable
style="width: 250px"
@@ -255,6 +255,14 @@
order: "desc", // 榛樿鎺掑簭鏂瑰紡
key: "",
},
+ searchForm2: {
+ // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "createTime", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ key: "",
+ },
addOilForm: {
status : 0
},
@@ -453,6 +461,16 @@
getDataList() {
this.loading = true;
getAddOilList(this.searchForm).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ });
+ },
+ getDataList2() {
+ this.loading = true;
+ getAddOilList(this.searchForm2).then((res) => {
this.loading = false;
if (res.success) {
this.data = res.result.records;
@@ -878,4 +896,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/your/area-manage/areaManage.vue b/src/views/your/area-manage/areaManage.vue
index a67657b..6779ed3 100644
--- a/src/views/your/area-manage/areaManage.vue
+++ b/src/views/your/area-manage/areaManage.vue
@@ -13,9 +13,9 @@
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
}}</Button>
<Input
- v-model="searchForm.name"
+ v-model="searchForm2.name"
suffix="ios-search"
- @on-change="getDataList"
+ @on-change="getDataList2"
placeholder="杈撳叆閰嶉�佸湴鍖烘悳绱�"
clearable
style="width: 250px"
@@ -324,6 +324,14 @@
modalTitle3: "",
carList:[],
searchForm: {
+ // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "createTime", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ key: "",
+ },
+ searchForm2: {
// 鎼滅储妗嗗垵濮嬪寲瀵硅薄
pageNumber: 1, // 褰撳墠椤垫暟
pageSize: 10, // 椤甸潰澶у皬
@@ -700,6 +708,16 @@
}
});
},
+ getDataList2() {
+ this.loading = true;
+ getArea(this.searchForm2).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ });
+ },
getCustList() {
this.loading = true;
this.searchForm.pageNumber=1;
@@ -730,6 +748,16 @@
this.loading = true;
this.searchForm.areaId=areaId;
getAreaSection(this.searchForm).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data2 = res.result.records;
+ }
+ });
+ },
+ getAreaSectionList2(areaId) {
+ this.loading = true;
+ this.searchForm2.areaId=areaId;
+ getAreaSection(this.searchForm2).then((res) => {
this.loading = false;
if (res.success) {
this.data2 = res.result.records;
@@ -896,7 +924,7 @@
},
equipment(row) {
this.areaId = row.id
- this.getAreaSectionList(row.id);
+ this.getAreaSectionList2(row.id);
this.modalType = 0;
this.modalTitle2 = "鐗囧尯娈典俊鎭�";
this.$refs.areaForm.resetFields();
@@ -1332,4 +1360,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index 076c2c5..0129cd1 100644
--- a/src/views/your/car-manage/carManage.vue
+++ b/src/views/your/car-manage/carManage.vue
@@ -13,9 +13,9 @@
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
}}</Button>
<Input
- v-model="searchForm.carNo"
+ v-model="searchForm2.carNo"
suffix="ios-search"
- @on-change="getDataList"
+ @on-change="getDataList2"
placeholder="杈撳叆杞︾墝鍙锋悳绱�"
clearable
style="width: 250px"
@@ -279,6 +279,14 @@
depModalVisible: false,
modalTitle: "",
searchForm: {
+ // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "createTime", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ key: "",
+ },
+ searchForm2: {
// 鎼滅储妗嗗垵濮嬪寲瀵硅薄
pageNumber: 1, // 褰撳墠椤垫暟
pageSize: 10, // 椤甸潰澶у皬
@@ -731,10 +739,20 @@
}
});
},
+ getDataList2() {
+ this.loading = true;
+ getCarList(this.searchForm2).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ });
+ },
getEquipmentList(carId) {
this.loading = true;
- this.searchForm.carId=carId;
- getEquipment(this.searchForm).then((res) => {
+ this.searchForm2.carId=carId;
+ getEquipment(this.searchForm2).then((res) => {
this.loading = false;
if (res.success) {
this.data2 = res.result.records;
@@ -1236,4 +1254,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/your/customerReceive-manage/customerReceive.vue b/src/views/your/customerReceive-manage/customerReceive.vue
index 13419ff..e7ea829 100644
--- a/src/views/your/customerReceive-manage/customerReceive.vue
+++ b/src/views/your/customerReceive-manage/customerReceive.vue
@@ -12,9 +12,9 @@
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
}}</Button>
<Input
- v-model="searchForm.name"
+ v-model="searchForm2.name"
suffix="ios-search"
- @on-change="getDataList"
+ @on-change="getDataList2"
placeholder="杈撳叆鍟嗘埛鍚嶇О鎼滅储"
clearable
style="width: 250px"
@@ -209,6 +209,14 @@
depModalVisible: false,
modalTitle: "",
searchForm: {
+ // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "createTime", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ key: "",
+ },
+ searchForm2: {
// 鎼滅储妗嗗垵濮嬪寲瀵硅薄
pageNumber: 1, // 褰撳墠椤垫暟
pageSize: 10, // 椤甸潰澶у皬
@@ -438,6 +446,16 @@
getDataList() {
this.loading = true;
getCustomerReceive(this.searchForm).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ });
+ },
+ getDataList2() {
+ this.loading = true;
+ getCustomerReceive(this.searchForm2).then((res) => {
this.loading = false;
if (res.success) {
this.data = res.result.records;
@@ -865,4 +883,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/your/order-manage/orderEvaluateManage.vue b/src/views/your/order-manage/orderEvaluateManage.vue
index c385a00..2ee3b76 100644
--- a/src/views/your/order-manage/orderEvaluateManage.vue
+++ b/src/views/your/order-manage/orderEvaluateManage.vue
@@ -7,14 +7,14 @@
<div class="search">
<Card>
<Row class="operation">
- <Input v-model="searchForm.userName" suffix="ios-search" @on-change="getDataList" placeholder="杈撳叆閰嶉�佷汉" clearable style="width: 250px"/>
- <Input v-model="searchForm.customerName" suffix="ios-search" @on-change="getDataList" placeholder="杈撳叆鍟嗘埛鍚嶇О" clearable style="width: 250px;margin-left: 20px"/>
+ <Input v-model="searchForm2.userName" suffix="ios-search" @on-change="getDataList2" placeholder="杈撳叆閰嶉�佷汉" clearable style="width: 250px"/>
+ <Input v-model="searchForm2.customerName" suffix="ios-search" @on-change="getDataList2" placeholder="杈撳叆鍟嗘埛鍚嶇О" clearable style="width: 250px;margin-left: 20px"/>
<Date-picker clearable @on-change="time1" format="yyyy-MM-dd" type="date" placement="bottom-end" placeholder="璇烽�夋嫨閰嶉�佹棩鏈�" style="width: 240px;margin-left: 20px">
</Date-picker>
- <Select v-model="searchForm.status" style="width:200px;margin-left: 20px" clearable>
+ <Select v-model="searchForm2.status" style="width:200px;margin-left: 20px" clearable>
<Option v-for="item in cityList" :value="item.value" :key="item">{{ item.label }}</Option>
</Select>
- <Button @click="init" icon="md-refresh">鏌ヨ</Button>
+ <Button @click="init2" icon="md-refresh">鏌ヨ</Button>
</Row>
<Table
:loading="loading"
@@ -58,6 +58,12 @@
modalTitle: "",
modalVisible:false,
searchForm: {
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "sendDate", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ },
+ searchForm2: {
pageNumber: 1, // 褰撳墠椤垫暟
pageSize: 10, // 椤甸潰澶у皬
sort: "sendDate", // 榛樿鎺掑簭瀛楁
@@ -178,6 +184,9 @@
init() {
this.getDataList();
},
+ init2() {
+ this.getDataList2();
+ },
time1(e){
this.searchForm.sendDate = e;
this.getDataList();
@@ -194,6 +203,16 @@
getDataList() {
this.loading = true;
findPageOrderTask2(this.searchForm).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ });
+ },
+ getDataList2() {
+ this.loading = true;
+ findPageOrderTask2(this.searchForm2).then((res) => {
this.loading = false;
if (res.success) {
this.data = res.result.records;
@@ -222,4 +241,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/your/suggest-manage/suggestManage.vue b/src/views/your/suggest-manage/suggestManage.vue
index bfd88ca..6ead1ef 100644
--- a/src/views/your/suggest-manage/suggestManage.vue
+++ b/src/views/your/suggest-manage/suggestManage.vue
@@ -12,9 +12,9 @@
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
}}</Button>
<Input
- v-model="searchForm.content"
+ v-model="searchForm2.content"
suffix="ios-search"
- @on-change="getDataList"
+ @on-change="getDataList2"
placeholder="杈撳叆鍙嶉鍐呭鎼滅储"
clearable
style="width: 250px"
@@ -199,6 +199,14 @@
order: "desc", // 榛樿鎺掑簭鏂瑰紡
key: "",
},
+ searchForm2: {
+ // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "createTime", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ key: "",
+ },
addOilForm: {
status : 0
},
@@ -376,6 +384,16 @@
getDataList() {
this.loading = true;
getSuggest(this.searchForm).then((res) => {
+ this.loading = false;
+ if (res.success) {
+ this.data = res.result.records;
+ this.total = res.result.total;
+ }
+ });
+ },
+ getDataList2() {
+ this.loading = true;
+ getSuggest(this.searchForm2).then((res) => {
this.loading = false;
if (res.success) {
this.data = res.result.records;
@@ -845,4 +863,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.1