From 6622c8891d03e71d3dc75c2de97308ca71552786 Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 09 二月 2022 13:52:45 +0800
Subject: [PATCH] bug

---
 src/views/your/car-manage/carManage.vue |   72 +++++++++++++++++++++++++++++++-----
 1 files changed, 62 insertions(+), 10 deletions(-)

diff --git a/src/views/your/car-manage/carManage.vue b/src/views/your/car-manage/carManage.vue
index ff427d3..4164143 100644
--- a/src/views/your/car-manage/carManage.vue
+++ b/src/views/your/car-manage/carManage.vue
@@ -80,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 :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" :key="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>
@@ -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">
@@ -243,6 +251,7 @@
   getEquipment,
   addEquipment,
   getUser,
+  getDriver,
   deleteEquipment,
 } from "@/api/open";
 import util from "@/libs/util.js";
@@ -280,6 +289,9 @@
       carForm: {
         status : 0
       },
+      type: {
+        type : 0
+      },
       equipmentForm: {
         status : 0
       },
@@ -307,7 +319,7 @@
         {
           title: "杞︾墝鍙�",
           key: "carNo",
-          width: 100,
+          width: 110,
           sortable: true,
         },
         {
@@ -345,12 +357,12 @@
           sortable: true,
         },
         {
-          title: "椹鹃┒浜�",
+          title: "鍙告満",
           key: "nickName",
           width: 100,
         },
         {
-          title: "璺熻溅浜�",
+          title: "閰嶉�佸憳",
           key: "followNickName",
           width: 100,
         },
@@ -368,12 +380,35 @@
           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,
         },
         {
@@ -592,6 +627,7 @@
       depData: [],
       dataType: 0,
       carId: '',
+      driverList: [],
       userList: [],
       editDepartments: [],
       buyYear:''
@@ -662,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;
@@ -724,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) {
@@ -808,6 +859,7 @@
       this.equipmentVisible = true;
     },
     addCar() {
+      this.carForm={};
       this.getAllUser();
       this.modalType = 0;
       this.modalTitle = "娣诲姞杞﹁締";

--
Gitblit v1.9.1