From 7e9b5b28797ad4dcb40a32294101666f5d3dfe64 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 29 Jul 2024 18:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driverArtery/basicdataDriverArtery.vue    | 44 ++++++++++++++++---
 .../driverArtery/basicdataDriverArteryAdd.vue |  8 ++--
 2 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index 33b538fa..d84c3252 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
@@ -160,6 +160,7 @@ export default {
       search: false,
       query: {},
       columnList: deepClone(columnList),
+      dataType:[],
       data: [],
       drawerShow: false,
       page: {
@@ -250,20 +251,52 @@ export default {
 
               for (let _index = 0; _index < _value.checkarr.length; _index++) {
                 const item = _value.checkarr[_index];
-
+                
                 if (Number(value[_prop]) !== Number(item.value)) continue;
                 value[_value.prop] = item.label;
                 break;
               }
             }
-
             // 仓库
             value.warehouseNames = value.warehouses.map(val => val.warehouseName).join(',');
           }
+   
+          if(!this.dataType.length){
+            let  BizData=[]
+            BizData = await getDictionaryBiz('basic_driverjob_type');
+            if(BizData.data.code ==200 && BizData.data.data.length){
+            this.dataType= await BizData.data.data.map(res=>{
+            return{
+              label:res.dictValue,
+              value:res.dictKey
+            }
+          })
+          }
+          }
+          this.data.forEach(items => {
+          let aValues;
+           // 检查 items.jobType 是否存在并且是字符串
+          if (typeof items.jobType === 'string') {
+          if (items.jobType.split(',').length > 1) {
+            // 如果 jobType 包含逗号，则分隔并处理
+          aValues = items.jobType.split(',').map(value => value.trim());
+          } else {
+           // 否则，直接作为单个值处理
+          aValues = [items.jobType.trim()];
+          }
+        } else {
+          // 如果 items.jobType 不是字符串，设置空数组
+          aValues = [];
+        }
+        // 根据 aValues 的值查找对应的 label
+        items.jobTypeName = this.dataType
+          .filter(item => aValues.includes(item.value)) // 过滤出匹配的项
+          .map(item => item.label) // 提取对应的 label
+          .join(','); // 用逗号连接所有的 label
+      });
 
-          console.log('this.data :>> ', this.data);
-          //查询车辆绑定情况
-          this.getVehiclede();
+    //查询车辆绑定情况
+          // this.getVehiclede();
         } catch (error) {
           console.log('error :>> ', error);
         } finally {
@@ -484,6 +517,7 @@ export default {
             }
             value.checkarr = _data;
           }
+
         }
         console.log('res :>> ', res);
       } catch (error) {
diff --git a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
index 25f29710..02b9629a 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
+++ b/src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue
@@ -644,7 +644,7 @@ export default {
       this.form = {
         ..._data,
       };
-
+      this.form.jobType=  this.form.jobTypeString
       this.form.bindVehicles = _data.bindVehicles && _data.bindVehicles.split(',');
       this.form.warehouseIds = _data.warehouses.map(val => val.warehouseId);
       console.log('_data :>> ', _data);
@@ -657,7 +657,8 @@ export default {
         const submitData = { ...this.form };
         submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(',');
         submitData.phone = this.form.phone.trim();
-
+        submitData.jobType = submitData.jobType.join(',')
+        
         const res = await add(submitData);
         const { code, msg } = res.data;
         if (code !== 200) return;
@@ -670,6 +671,7 @@ export default {
           type: 'warning',
         })
           .then(() => {
+            submitData.jobType=[]
             this.$refs.formRef.resetFields();
           })
           .catch(() => this.back());
@@ -687,7 +689,7 @@ export default {
         const submitData = { ...this.form };
         submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(',');
         submitData.phone = this.form.phone.trim();
-
+        submitData.jobType = submitData.jobType.join(',')
         const res = await update(submitData);
         const { code, msg } = res.data;
         if (code !== 200) return;