Merge branch 'dev' into pre-production

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

@@ -621,6 +621,9 @@ export default {
       if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) {
           row.bindVehicles = row.bindVehicles.join(",");
           console.log(row.bindVehicles);
+      }else{
+        row.bindVehicles = '';
+
       }
 
       add(row).then(
@@ -640,6 +643,12 @@ export default {
     },
     rowUpdate(row, index, done, loading) {
       console.log('swx>>>>>>>>>>>>>>');
+      if (Array.isArray(row.bindVehicles) && row.bindVehicles.length > 0) {
+        row.bindVehicles = row.bindVehicles.join(",");
+        console.log(row.bindVehicles);
+      }else{
+        row.bindVehicles = '';
+      }
       update(row).then(
         () => {
           this.onLoad(this.page);

src/views/basicdata/vehicle/basicdataVehicle.vue

@@ -915,6 +915,8 @@ export default {
 if (Array.isArray(row.vehicleOwners) && row.vehicleOwners.length > 0) {
   row.vehicleOwners = row.vehicleOwners.join(",");
   console.log(row.vehicleOwners);
+}else{
+  row.vehicleOwners=''
 }
       console.log(row.vehicleOwners, '=====1231231');