Merge remote-tracking branch 'origin/dev' into dev

src/views/basic/property/basicPropertyDetails.vue

@@ -580,6 +580,7 @@ export default {
               this.option.column = this.option.column.filter((item, index, self) => {
                 return index === self.findIndex(t => t.prop === item.prop);
               });
+              this.getListvalues(masterId);
               this.loading = false;
               console.log('所有 Promise 都已完成>>>>>', this.option.column);
               // 执行后续操作，例如更新页面显示、关闭加载提示等

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -274,12 +274,12 @@ export default {
             align: 'center',
             span: 11,
             multiple: true,
-            dicData: [],
-            // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
-            // props: {
-            //   label: 'vehicleNub',
-            //   value: 'id',
-            // },
+           // dicData: [],
+            dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+            props: {
+              label: 'vehicleNub',
+              value: 'id',
+            },
             // addDisplay: false,
             // editDisplay: false,
             // viewDisplay: false,
@@ -618,11 +618,9 @@ export default {
     rowSave(row, done, loading) {
       console.log(row, 'row信息');
 
-      if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) {
-          row.bindVehicles = row.bindVehicles.join(",");
-          console.log(row.bindVehicles);
-      }else{
-         row.vehicleOwners=''
+      if (Array.isArray(row.bindVehicles)) {
+        row.bindVehicles = row.bindVehicles.join(",");
+        console.log(row.bindVehicles);
       }
 
       add(row).then(
@@ -641,7 +639,11 @@ export default {
       );
     },
     rowUpdate(row, index, done, loading) {
-      console.log('swx>>>>>>>>>>>>>>');
+
+      if (Array.isArray(row.bindVehicles)) {
+        row.bindVehicles = row.bindVehicles.join(",");
+        console.log(row.bindVehicles);
+      }
       update(row).then(
         () => {
           this.onLoad(this.page);
@@ -776,7 +778,7 @@ export default {
         //查询车辆绑定情况
         this.getVehiclede();
         //查询人员信息
-        this.getpeople();
+        //this.getpeople();
         // getVehicle().then(res => {
         //   console.log("res.data.data>>>>>>>",res.data.data)
         //    res.data.data.map(v=>{

src/views/basicdata/vehicle/basicdataVehicle.vue

@@ -197,18 +197,18 @@ export default {
             align: 'center',
             span: 11,
           },
-        {
-          label: '承运商名称',
-          labelWidth: '150',
-         // width: 'fit-content',
-           width: '100px',
-          align: 'center',
-          span: 11,
-          prop: 'carrierName',
-          type: 'input',
-          editDisplay: false,
-          addDisplay: false,
-       },
+       //  {
+       //    label: '承运商名称',
+       //    labelWidth: '150',
+       //   // width: 'fit-content',
+       //     width: '100px',
+       //    align: 'center',
+       //    span: 11,
+       //    prop: 'carrierName',
+       //    type: 'input',
+       //    editDisplay: false,
+       //    addDisplay: false,
+       // },
           {
             label: '绑定驾驶人',
             prop: 'vehicleOwners',
@@ -218,16 +218,16 @@ export default {
             align: 'center',
             span: 11,
             multiple: true,
-            dicData: [],
-            // dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
-            // props: {
-            //   label: 'vehicleNub',
-            //   value: 'id',
-            // },
-            // addDisplay: false,
-            // editDisplay: false,
-            // viewDisplay: false,
-            // hide: true,
+            // dicData: [],
+            dicUrl: '/api/logpm-basicdata/vehicle/dictionary',
+            props: {
+              label: 'vehicleNub',
+              value: 'id',
+            },
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
+            hide: true,
           },
           {
             label: '车辆来源',
@@ -908,19 +908,19 @@ export default {
   methods: {
     rowSave(row, done, loading) {
 
-
-
-
-
-if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) {
-  row.vehicleOwners = row.vehicleOwners.join(",");
-  console.log(row.vehicleOwners);
-}else{
-  row.vehicleOwners=''
-}
+// if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) {
+//   row.vehicleOwners = row.vehicleOwners.join(",");
+//   console.log(row.vehicleOwners);
+// }else{
+//   row.vehicleOwners=''
+// }
+      if (Array.isArray(row.vehicleOwners)) {
+        row.vehicleOwners = row.vehicleOwners.join(",");
+        console.log(row.vehicleOwners);
+      }
       console.log(row.vehicleOwners, '=====1231231');
-      
-      console.log(row,'================================================================');
+
+      console.log('================================================================',row);
       add(row).then(
         () => {
           this.onLoad(this.page);
@@ -955,6 +955,7 @@ if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) {
       this.edit = true;
     },
     rowUpdate(row, index, done, loading) {
+
       update(row).then(
         () => {
           this.onLoad(this.page);

src/views/basicdata/vehicle/basicdataVehicleform.vue

@@ -862,6 +862,11 @@ export default {
     },
     submitForm() {
       this.$refs.myForm.validate(valid => {
+        console.log('swx>>>>>>>>>>>>>>');
+        if (Array.isArray(this.form.vehicleOwners)) {
+          this.form.vehicleOwners = this.form.vehicleOwners.join(",");
+          console.log(this.form.vehicleOwners);
+        }
         if (valid) {
           this.isDis = true;
           let row = this.form;