From b80d335af45e7244b982425d0a40407ac215d890 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 29 Apr 2024 09:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=BC=80?=
 =?UTF-8?q?=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/inventory/CreateOrder.vue    |  3 ++-
 src/views/waybill/CreateZeroOrder.vue         | 26 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index f80d6235..84ff4037 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1939,7 +1939,8 @@ const onLoad = async (idsArr = []) => {
     details.query.shipperId = data.shipperClientId || '';
     details.query.consigneeId = data.consigneeClientId || '';
 
-    details.query.destination = data.destinationArray;
+    details.query.destination = data.destinationArray || [];
+    details.query.departure = data.departureArray || [];
     details.query.queryDestinationWarehouseName = data.destinationWarehouseName || '';
     // 是否提货
     details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0;
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 3f203d8d..fbc19547 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -1680,16 +1680,16 @@ const initPageInfo = async () => {
 
       details.query.xianPay = isNumber(data.warehouseWaybill.xpay)
         ? Number(data.warehouseWaybill.xpay)
-        : data.warehouseWaybill.xpay;
+        : data.warehouseWaybill.xpay || 0;
       details.query.huiPay = isNumber(data.warehouseWaybill.hpay)
         ? Number(data.warehouseWaybill.hpay)
-        : data.warehouseWaybill.hpay;
+        : data.warehouseWaybill.hpay || 0;
       details.query.yuePay = isNumber(data.warehouseWaybill.ypay)
         ? Number(data.warehouseWaybill.ypay)
-        : data.warehouseWaybill.ypay;
+        : data.warehouseWaybill.ypay || 0;
       details.query.daoPay = isNumber(data.warehouseWaybill.dpay)
         ? Number(data.warehouseWaybill.dpay)
-        : data.warehouseWaybill.dpay;
+        : data.warehouseWaybill.dpay || 0;
       // 转译到站
       if (details.regionOptione.length !== 0) {
         handleTranslationLocation('departure');
@@ -1807,7 +1807,23 @@ const onLoad = async () => {
     details.query.transportType = '1';
     details.query.deliveryWay = '1';
     details.query.urgency = '1';
-    details.query.destination = '';
+    // details.query.destination = '';
+    details.query.shipperId = data.shipperClientId || '';
+    details.query.consigneeId = data.consigneeClientId || '';
+
+    details.query.destination = data.destinationArray || [];
+    details.query.departure = data.departureArray || [];
+    details.query.queryDestinationWarehouseName = data.destinationWarehouseName || '';
+    // 是否提货
+    details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0;
+    // 是否整车 -- 提货
+    details.query.pickupCompleteOrNot = details.query.pickupCompleteOrNot
+      ? details.query.pickupCompleteOrNot
+      : 0;
+    // 是否整车 -- 干线
+    details.query.trunklineCompleteOrNot = details.query.trunklineCompleteOrNot
+      ? details.query.trunklineCompleteOrNot
+      : 0;
   } catch (error) {
     console.log('error :>> ', error);
   } finally {