From 80e514ca619fbb1fdc1559db4e97f24d61c68b46 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 11:23:39 +0800
Subject: [PATCH] bug
---
src/views/your/car-manage/carManage.vue | 121 ++++++++++++++++++++++++++++++---------
1 files changed, 92 insertions(+), 29 deletions(-)
diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index 0af821c..3bb7a76 100644
--- a/src/views/your/car-manage/carManage.vue
+++ b/src/views/your/car-manage/carManage.vue
@@ -8,7 +8,6 @@
<Card>
<Row class="operation">
<Button @click="addCar" type="primary" icon="md-add">娣诲姞杞﹁締</Button>
- <Button @click="delAll" icon="md-trash">鎵归噺鍒犻櫎</Button>
<Button @click="init" icon="md-refresh">鍒锋柊</Button>
<Button type="dashed" @click="openTip = !openTip">{{
openTip ? "鍏抽棴鎻愮ず" : "寮�鍚彁绀�"
@@ -81,14 +80,22 @@
<FormItem label="鐗岀収" prop="carNo">
<Input v-model="carForm.carNo" />
</FormItem>
- <FormItem label="椹鹃┒浜�" prop="userId">
+ <FormItem label="鍔犳补鍗″彿" prop="addOilCode">
+ <Input v-model="carForm.addOilCode" />
+ </FormItem>
+ <FormItem label="杞﹁締缂栧彿" prop="code">
+ <Input v-model="carForm.code" />
+ </FormItem>
+ <FormItem label="鍙告満" prop="userId">
<Select v-model="carForm.userId" filterable>
- <Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>
+ <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">
+ <FormItem label="閰嶉�佸憳" prop="followUserId">
<Select v-model="carForm.followUserId" filterable>
- <Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>
+ <Option :value="0" :key="0">璇烽�夋嫨</Option>
+ <Option v-for="item in driverList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
</Select>
</FormItem>
</Form>
@@ -244,6 +251,7 @@
getEquipment,
addEquipment,
getUser,
+ getDriver,
deleteEquipment,
} from "@/api/open";
import util from "@/libs/util.js";
@@ -281,6 +289,9 @@
carForm: {
status : 0
},
+ type: {
+ type : 0
+ },
equipmentForm: {
status : 0
},
@@ -308,29 +319,7 @@
{
title: "杞︾墝鍙�",
key: "carNo",
- width: 100,
- sortable: true,
- },
- {
- title: "鍝佺墝",
- key: "brand",
- width: 100,
- },
- {
- title: "鍨嬪彿",
- key: "model",
- width: 100,
- },
- {
- title: "鎺掗噺",
- key: "displacement",
- width: 100,
- sortable: true,
- },
- {
- title: "璐疆骞翠唤",
- key: "buyYear",
- minWidth: 120,
+ width: 110,
sortable: true,
},
{
@@ -368,9 +357,65 @@
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,
+ },
+ {
title: "鎿嶄綔",
key: "action",
align: "center",
+ fixed: "right",
width: 280,
render: (h, params) => {
return h("div", [
@@ -582,6 +627,7 @@
depData: [],
dataType: 0,
carId: '',
+ driverList: [],
userList: [],
editDepartments: [],
buyYear:''
@@ -652,11 +698,20 @@
this.getDataList();
},
getAllUser(){
- getUser().then((res)=>{
+ getDriver({type:0}).then((res)=>{
if (res.success){
this.userList=res.result;
}
});
+ //this.type.type=1;
+ getDriver({type:1}).then((res)=>{
+ if (res.success){
+ this.driverList=res.result;
+ }
+ });
+ this.type.type=0;
+ console.log(this.userList);
+ console.log(this.driverList);
},
changeSort(e) {
this.searchForm.sort = e.key;
@@ -714,6 +769,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) {
@@ -798,6 +859,7 @@
this.equipmentVisible = true;
},
addCar() {
+ this.carForm={};
this.getAllUser();
this.modalType = 0;
this.modalTitle = "娣诲姞杞﹁締";
@@ -814,6 +876,7 @@
this.addEquipmentVisible = true;
},
edit(v) {
+ this.getAllUser();
this.buyYear = v.buyYear;
this.modalType = 1;
this.modalTitle = "缂栬緫";
--
Gitblit v1.9.1