Merge branch 'pre-production'

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -638,8 +638,11 @@ export default {
         row.bindVehicles = row.bindVehicles.join(',');
         console.log(row.bindVehicles);
       }
-      row.warehouseId = row.warehouseId.join(',');//仓库处理
+
-      console.log(row.warehouseId);
+      if (Array.isArray(row.bindVehicles)) {
+        row.warehouseId = row.warehouseId.join(',');//仓库处理
+        console.log(row.warehouseId);
+      }
       add(row).then(
         () => {
           this.onLoad(this.page);

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -909,9 +909,29 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'totalNumber',
+          label: '包件总数',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'handQuantity',
+          label: '在库数量',
+          type: 2,
+          values: '',
+          width: '180',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'deliveryNumber',
-          label: '包件数量',
+          label: '计划数量',
           type: 2,
           values: '',
           width: '180',
@@ -1266,6 +1286,7 @@ export default {
           fixed: false,
           sortable: true,
         },
+
         {
           prop: 'reservationNum',
           label: '计划数量',

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -105,12 +105,8 @@
               >批量打印</el-button
             >
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button
+            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
-              type="danger"
+              >导出
-              icon="el-icon-download"
-              @click="handleExportInfo"
-              plain
-            >导出
             </el-button>
           </div>
           <!-- 头部右侧按钮模块 -->
@@ -323,7 +319,8 @@ import {
   remove,
   getPage,
   getstatistics,
-  printBatch, getDeliveryListExport
+  printBatch,
+  getDeliveryListExport,
 } from '@/api/distribution/distributionDeliveryList';
 import option from '@/option/distribution/distributionDeliveryList';
 import { mapGetters } from 'vuex';
@@ -706,7 +703,7 @@ export default {
     /**
      * 导出
      * */
-    handleExportInfo(){
+    handleExportInfo() {
       let row = {};
       const ids = this.selectionList.join(',');
       row.ids = ids;
@@ -715,7 +712,6 @@ export default {
         console.log(res.data);
         downloadXls(res.data, '市配配送计划数据.xlsx');
       });
-
     },
     getvehicleData() {
       return new Promise((rv, rev) => {
@@ -1161,7 +1157,7 @@ export default {
      */
     async printOrder(row) {
       console.log('row :>> ', row);
-      const res = await printBatch({ ids: row.id, type: 1 });
+      const res = await printBatch({ ids: row.id, type: 2 });
       console.log('res :>> ', res);
       const {
         data: { code, data },