From abd170611a0cec6df576d65662787068c5fd7461 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 14 Nov 2024 15:35:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E9=85=8D=E8=BD=BD=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/artery/AddVehicleStowage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index 180a1640..a2aa9928 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -771,9 +771,9 @@
         <el-input-number
           :controls="false"
           controls-position="right"
-          :min="0"
+          :min="details.editInfo.realNum || 0"
           :precision="0"
-          :max="details.editInfo.stockNum"
+          :max="details.editInfo.stockNum + details.editInfo.realNum"
           class="editInput"
           v-model="details.editInfo.enterPlanNum"
           style="flex: 1; text-align: left !important"

From ddd87baf57235103ac1e84c33b79c53ef700d24d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 14 Nov 2024 15:37:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/BookingNote.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue
index 4e3a5b52..f7daab1b 100644
--- a/src/views/distribution/inventory/BookingNote.vue
+++ b/src/views/distribution/inventory/BookingNote.vue
@@ -1543,16 +1543,16 @@ const onLoad = async () => {
       info.value.maxNum = 0;
       details.deepCloneGoodsList = [];
       details.goodsList = data.warehouseWaybill.detailList.map(val => {
-        val.num = Number(val.num);
-        val.volume = Number(val.volume);
-        val.weight = Number(val.weight);
-        val.price = Number(val.price);
-        val.subtotalFreight = Number(val.subtotalFreight);
+        val.num = isNumber(val.num) ? Number(val.num) : 0;
+        val.volume = isNumber(val.volume) ? Number(val.volume) : 0;
+        val.weight = isNumber(val.weight) ? Number(val.weight) : 0;
+        val.price = isNumber(val.price) ? Number(val.price) : 0;
+        val.subtotalFreight = isNumber(val.subtotalFreight) ? Number(val.subtotalFreight) : 0;
 
         val.goodsName = val.productName;
 
         // 计算运费小计
-        if (!val.subtotalFreight) handleComputed(val);
+        // if (!val.subtotalFreight) handleComputed(val);
 
         // 计算件数最大值
         info.value.maxNum += val.num;