From 98fcbf66162fba0a097a8abcaeba5e1c1e32000e Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期五, 04 十一月 2022 08:45:47 +0800
Subject: [PATCH] 提交更新
---
src/views/your/car-manage/carManage.vue | 118 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 40 deletions(-)
diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index 8614efc..076c2c5 100644
--- a/src/views/your/car-manage/carManage.vue
+++ b/src/views/your/car-manage/carManage.vue
@@ -80,13 +80,21 @@
<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 :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 :value="0" :key="0">璇烽�夋嫨</Option>
<Option v-for="item in driverList" :value="item.id" :key="item.id">{{ item.nickname }}</Option>
</Select>
</FormItem>
@@ -111,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>
@@ -119,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">
@@ -315,6 +323,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,
@@ -346,38 +409,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,
- sortable: true,
- },
- {
- title: "璐疆骞翠唤",
- key: "buyYear",
- minWidth: 120,
sortable: true,
},
{
@@ -667,13 +698,13 @@
this.getDataList();
},
getAllUser(){
- getDriver(this.type).then((res)=>{
+ getDriver({type:0}).then((res)=>{
if (res.success){
this.userList=res.result;
}
});
- this.type.type=1;
- getDriver(this.type).then((res)=>{
+ //this.type.type=1;
+ getDriver({type:1}).then((res)=>{
if (res.success){
this.driverList=res.result;
}
@@ -738,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) {
@@ -822,6 +859,7 @@
this.equipmentVisible = true;
},
addCar() {
+ this.carForm={};
this.getAllUser();
this.modalType = 0;
this.modalTitle = "娣诲姞杞﹁締";
--
Gitblit v1.9.1