Merge branch 'dev' into pre-production

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -264,15 +264,7 @@ export default {
             align: 'center',
             span: 11,
           },
-          {
+
-            label: '备注',
-            prop: 'notes',
-            type: 'input',
-            labelWidth: '150',
-            width: '100px',
-            align: 'center',
-            span: 11,
-          },
           {
             label: '绑定车辆',
             prop: 'bindVehicles',
@@ -454,6 +446,15 @@ export default {
             align: 'center',
             span: 11,
           },
+          {
+            label: '备注',
+            prop: 'notes',
+            type: 'input',
+            labelWidth: '150',
+            width: '100px',
+            align: 'center',
+            span: 11,
+          },
           {
             label: '人证合照照片',
             prop: 'licensePeoplePhoto',

src/views/basicdata/vehicle/basicdataVehicle.vue

@@ -907,6 +907,13 @@ export default {
   },
   methods: {
     rowSave(row, done, loading) {
+      if (row.carrierId.length > 0) {
+      row.carrierId = row.carrierId.join(",");
+      console.log( row.carrierId);
+    }
+      console.log(row.carrierId, '=====1231231');
+      
+      console.log(row,'================================================================');
       add(row).then(
         () => {
           this.onLoad(this.page);