From 1dfede5acec9f6bb97b8769f55501b67262316e0 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 27 三月 2023 17:19:22 +0800
Subject: [PATCH] 搜索bug
---
src/views/your/car-manage/carManage.vue | 152 +++++++++++++++++++++++++++++---------------------
1 files changed, 89 insertions(+), 63 deletions(-)
diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index 57bff33..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"
@@ -88,11 +88,13 @@
</FormItem>
<FormItem label="鍙告満" prop="userId">
<Select v-model="carForm.userId" filterable>
+ <Option :value="0">璇烽�夋嫨</Option>
<Option v-for="item in userList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
</Select>
</FormItem>
<FormItem label="閰嶉�佸憳" prop="followUserId">
<Select v-model="carForm.followUserId" filterable>
+ <Option :value="0" :key="0">璇烽�夋嫨</Option>
<Option v-for="item in driverList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
</Select>
</FormItem>
@@ -117,7 +119,7 @@
</Modal>
<Modal :title="modalTitle" v-model="addEquipmentVisible" :mask-closable="false" :width="500">
<Form ref="equipmentForm" :model="equipmentForm" :label-width="80" :rules="equipmentFormValidate">
- <FormItem label="璁惧" prop="type">
+ <FormItem label="璁惧绫诲瀷" prop="type">
<Select v-model="equipmentForm.type">
<Option :value="0">杞︽満</Option>
<Option :value="1">鎽勫儚鏈�</Option>
@@ -125,10 +127,10 @@
<Option :value="3">pad</Option>
</Select>
</FormItem>
- <FormItem label="璁惧" prop="status">
+ <FormItem label="鐘舵��" prop="status">
<Select v-model="equipmentForm.status">
<Option :value="0">姝ｅ父</Option>
- <Option :value="1">鍋滅敤</Option>
+ <Option :value="1">寮傚父</Option>
</Select>
</FormItem>
<FormItem label="缂栧彿" prop="code">
@@ -284,6 +286,14 @@
order: "desc", // 榛樿鎺掑簭鏂瑰紡
key: "",
},
+ searchForm2: {
+ // 鎼滅储妗嗗垵濮嬪寲瀵硅薄
+ pageNumber: 1, // 褰撳墠椤垫暟
+ pageSize: 10, // 椤甸潰澶у皬
+ sort: "createTime", // 榛樿鎺掑簭瀛楁
+ order: "desc", // 榛樿鎺掑簭鏂瑰紡
+ key: "",
+ },
carForm: {
status : 0
},
@@ -321,6 +331,61 @@
sortable: true,
},
{
+ title: "鍙告満",
+ key: "nickName",
+ width: 100,
+ },
+ {
+ title: "閰嶉�佸憳",
+ key: "followNickName",
+ width: 100,
+ },
+ {
+ title: "鍝佺墝",
+ key: "brand",
+ width: 100,
+ },
+ {
+ title: "鍨嬪彿",
+ key: "model",
+ width: 100,
+ },
+ {
+ title: "鎺掗噺",
+ key: "displacement",
+ width: 100,
+ },
+ {
+ title: "鍔犳补鍗″彿",
+ key: "addOilCode",
+ minWidth: 120,
+ // sortable: true,
+ render: (h, params) => {
+ return h("div",params.row.addOilCode=="undefined" ? '':params.row.addOilCode);
+ }
+ },
+ {
+ title: "缂栧彿",
+ key: "code",
+ minWidth: 120,
+ tooltip:true,
+ // render: (h, params) => {
+ // return h("div",params.row.code=="undefined" ? '':params.row.code);
+ // }
+ },
+ {
+ title: "璐疆骞翠唤",
+ key: "buyYear",
+ minWidth: 120,
+ sortable: true,
+ },
+ {
+ title: "鐧昏鏃ユ湡",
+ key: "createTime",
+ minWidth: 180,
+ sortable: true,
+ },
+ {
title: "鐘舵��",
key: "status",
width: 100,
@@ -352,61 +417,6 @@
title: "绉婚櫎鍘熷洜",
key: "removeReason",
width: 170,
- sortable: true,
- },
- {
- title: "鍙告満",
- key: "nickName",
- width: 100,
- },
- {
- title: "閰嶉�佸憳",
- key: "followNickName",
- width: 100,
- },
- {
- title: "鍝佺墝",
- key: "brand",
- width: 100,
- },
- {
- title: "鍨嬪彿",
- key: "model",
- width: 100,
- },
- {
- title: "鎺掗噺",
- key: "displacement",
- width: 100,
- },
- {
- title: "鍔犳补鍗″彿",
- key: "addOilCode",
- minWidth: 120,
- sortable: true,
- render: (h, params) => {
- return h("div",params.row.addOilCode=="undefined" ? '':params.row.addOilCode);
- }
- },
- {
- title: "缂栧彿",
- key: "code",
- minWidth: 120,
- sortable: true,
- render: (h, params) => {
- return h("div",params.row.code=="undefined" ? '':params.row.code);
- }
- },
- {
- title: "璐疆骞翠唤",
- key: "buyYear",
- minWidth: 120,
- sortable: true,
- },
- {
- title: "鐧昏鏃ユ湡",
- key: "createTime",
- minWidth: 180,
sortable: true,
},
{
@@ -729,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;
@@ -767,6 +787,12 @@
this.roleModalVisible = false;
},
submitCar() {
+ if(this.carForm.userId==undefined || this.carForm.userId==0){
+ this.carForm.userId="";
+ }
+ if(this.carForm.followUserId==undefined || this.carForm.followUserId==0){
+ this.carForm.followUserId="";
+ }
this.carForm.buyYear = this.buyYear;
this.$refs.carForm.validate((valid) => {
if (valid) {
@@ -1228,4 +1254,4 @@
this.init();
},
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.1