From 20d2b75dac378d2e2d1a2b2c6004adc036d395c7 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Mon, 28 Oct 2024 19:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index c7fdce3a..000dd1e3 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -545,7 +545,7 @@
                     <div>
                       <el-form label-width="fit-content">
                         <el-row>
-                          <el-form-item label="运费12414:">
+                          <el-form-item label="运费:">
                             <el-input readonly v-model="query.totalFreight" disabled></el-input>
                           </el-form-item>
 
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index ef694604..9f5aad81 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2332,7 +2332,7 @@ const onEditLoad = async () => {
           val.freightPrice = isNumber(val.freightPrice) ? Number(val.freightPrice) : 0;
           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.pickupPrice) : 0;
+          val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
           /** 系统维护 -- 干线计价方式 */
           val.systemChargeType = 1;
           /** 系统维护 -- 配送计价方式 */
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 71a3bfb1..1530f009 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -1839,7 +1839,7 @@ const initPageInfo = async () => {
           val.freightPrice = isNumber(val.freightPrice) ? Number(val.freightPrice) : 0;
           val.deliveryPrice = isNumber(val.deliveryPrice) ? Number(val.deliveryPrice) : 0;
           val.pickupPrice = isNumber(val.pickupPrice) ? Number(val.pickupPrice) : 0;
-          val.subtotalFreight = Number(val.subtotalFreight);
+          val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
 
           val.goodsName = val.productName;
           val.goodsId = val.productId;