Merge branch 'pre-production'

src/router/views/index.js

@@ -1047,18 +1047,18 @@ export default [
   //     },
   //   ],
   // },
-  // {
-  //   path: '/distribution/signfor/devtmp',
-  //   component: Layout,
-  //   redirect: '/distribution/signfor/devtmp',
-  //   children: [
-  //     {
-  //       path: '/distribution/signfor/devtmp',
-  //       name: '签收明细重构',
-  //       component: () => import('@/views/distribution/signfor/devtmp.vue'),
-  //     },
-  //   ],
-  // },
+  {
+    path: '/distribution/signfor/devtmp',
+    component: Layout,
+    redirect: '/distribution/signfor/devtmp',
+    children: [
+      {
+        path: '/distribution/signfor/devtmp',
+        name: '签收明细重构',
+        component: () => import('@/views/distribution/signfor/devtmp.vue'),
+      },
+    ],
+  },
   // {
   //   path: 'basicdata/goodsShelf/basicdataGoodsShelfView',
   //   component: Layout,

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -639,7 +639,7 @@ export default {
         console.log(row.bindVehicles);
       }
 
-      if (Array.isArray(row.bindVehicles)) {
+      if (Array.isArray(row.warehouseId)) {
         row.warehouseId = row.warehouseId.join(',');//仓库处理
         console.log(row.warehouseId);
       }