Merge branch 'dev' into pre-production

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"

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;