From 4d91cbdf5db6df8ac31ff67dbf1130eb2f3ed744 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 7 Nov 2023 22:57:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=B7=BB=E5=8A=A0warehou?=
 =?UTF-8?q?se=5Fid=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=A4=E9=99=A4String?=
 =?UTF-8?q?=E5=92=8CArray?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../driverArtery/basicdataDriverArtery.vue    |  7 ++++--
 .../distributionDeliveryListedt.vue           | 23 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
index 7a0ea5d9..8869fdb9 100644
--- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue
+++ b/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);
diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index d4a86a0f..54975555 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/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: '计划数量',

From ae39d53dfcd1ab38eff759f27235c068f7f61b29 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 7 Nov 2023 22:58:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B8=82=E9=85=8D=E5=8D=95=E4=B8=AA?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryListmar.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index 0b5a5116..068454cc 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/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
-              type="danger"
-              icon="el-icon-download"
-              @click="handleExportInfo"
-              plain
-            >导出
+            <el-button 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 },