From 18f79dfac360a57248a5e68cc7dfb66f27f24ba6 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 20 Feb 2025 14:26:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E5=BD=95=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/CreateOrder.vue | 4 ++++
 src/views/waybill/CreateZeroOrder.vue            | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index e28aba0e..7c5c5ecb 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2430,6 +2430,10 @@ const onEditLoad = async () => {
           val.deliveryPrice = isNumber(val.deliveryPrice) ? Number(val.deliveryPrice) : 0;
           val.pickupPrice = isNumber(val.pickupPrice) ? Number(val.pickupPrice) : 0;
           val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
+          val.subtotalPickup = isNumber(val.subtotalPickup) ? Number(val.subtotalPickup) : 0;
+          val.subtotalDeliveryFee = isNumber(val.subtotalDeliveryFee)
+            ? Number(val.subtotalDeliveryFee)
+            : 0;
           /** 系统维护 -- 干线计价方式 */
           val.systemChargeType = val.systemChargeType || 1;
           /** 系统维护 -- 配送计价方式 */
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 1c8d01f2..3a102880 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -1907,6 +1907,10 @@ const initPageInfo = async () => {
           val.deliveryPrice = isNumber(val.deliveryPrice) ? Number(val.deliveryPrice) : 0;
           val.pickupPrice = isNumber(val.pickupPrice) ? Number(val.pickupPrice) : 0;
           val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
+          val.subtotalPickup = isNumber(val.subtotalPickup) ? Number(val.subtotalPickup) : 0;
+          val.subtotalDeliveryFee = isNumber(val.subtotalDeliveryFee)
+            ? Number(val.subtotalDeliveryFee)
+            : 0;
 
           /** 系统维护 -- 干线计价方式 */
           val.systemChargeType = val.systemChargeType || 1;

From da71f6115e593cefea5cebe59e863ee5fa97629f Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 20 Feb 2025 17:57:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/waybill/CreateZeroOrder.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 3a102880..da977d40 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2043,7 +2043,7 @@ const handleAdd = () => {
     }
   }
 
-  details.goodsList.push({
+  const _obj = {
     /** 货物名称  */
     goodsName: '',
     /** 品类Id */
@@ -2077,7 +2077,11 @@ const handleAdd = () => {
     /** 运费小计 */
     subtotalFreight: 0,
     goodsListOptions: [],
-  });
+  };
+
+  handleAssignmentItemPrice(_obj);
+
+  details.goodsList.push(_obj);
 };
 
 /** 移除 */