修复部分bug

src/views/waybill/CreateZeroOrder.vue

@@ -354,7 +354,7 @@
                 () => {
                   details.query.pickupFee = 0;
                   if (!details.query.isPickUp) return;
-                  handlePrice();
+                  handlePrice(false, 'pickup');
                 }
               "
               v-model="query.isPickUp"
@@ -373,7 +373,7 @@
               @change="
                 () => {
                   details.query.pickupFee = 0;
-                  handlePrice();
+                  handlePrice(false, 'pickup');
                 }
               "
             >
@@ -393,7 +393,7 @@
               @change="
                 () => {
                   details.query.pickupFee = 0;
-                  handlePrice();
+                  handlePrice(false, 'pickup');
                 }
               "
             >
@@ -417,7 +417,7 @@
               @change="
                 () => {
                   details.query.totalFreight = 0;
-                  handlePrice();
+                  handlePrice(false, 'trunkline');
                 }
               "
               :disabled="isDisabled"
@@ -438,7 +438,7 @@
               @change="
                 () => {
                   details.query.totalFreight = 0;
-                  handlePrice();
+                  handlePrice(false, 'trunkline');
                 }
               "
             >
@@ -1981,7 +1981,10 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => {
   }
 };
 
-/** 计算行合计 */
+/** 计算行合计
+ * row -- 行数据
+ * onlyComputedTrunline -- 是否只计算干线的价格
+ */
 const handleComputed = (row: any) => {
   const { template, trunkLine } = details.priceTemplate;
 
@@ -2003,30 +2006,27 @@ const handleComputed = (row: any) => {
       ? computeNumber(row.price, '*', row[_trunklineKey]).result
       : 0;
 
-  // 计算提货价格 -- 行
-  if (_pickupKey)
-    row.subtotalPickup = _pickupKey
-      ? computeNumber(row.deliveryPrice, '*', row[_pickupKey]).result
-      : 0;
-
-  // 计算配送价格 -- 行
-  if (_dispatchKey)
-    row.subtotalDispatch = _dispatchKey
-      ? computeNumber(row.deliveryPrice, '*', row[_dispatchKey]).result
-      : 0;
+  if (onlyComputedTrunline) {
+    // 计算提货价格 -- 行
+    if (_pickupKey)
+      row.subtotalPickup = _pickupKey
+        ? computeNumber(row.pickupPrice || 0, '*', row[_pickupKey]).result
+        : 0;
 
-  if (_warehouseKey)
-    row.subtotalWarehouseManagement = _warehouseKey
-      ? computeNumber(row.warehouseManagementPrice, '*', row[_warehouseKey]).result
-      : 0;
+    // 计算配送价格 -- 行
+    if (_dispatchKey)
+      row.subtotalDispatch = _dispatchKey
+        ? computeNumber(row.deliveryPrice || 0, '*', row[_dispatchKey]).result
+        : 0;
 
-  // if (row.chargeType === 1) row.subtotalFreight = computeNumber(row.num, '*', row.price).result;
-  // else if (row.chargeType === 2)
-  //   row.subtotalFreight = computeNumber(row.volume, '*', row.price).result;
-  // else if (row.chargeType === 3)
-  //   row.subtotalFreight = computeNumber(row.weight, '*', row.price).result;
+    if (_warehouseKey)
+      row.subtotalWarehouseManagement = _warehouseKey
+        ? computeNumber(row.warehouseManagementPrice || 0, '*', row[_warehouseKey]).result
+        : 0;
+    console.log('row :>> ', row);
+  }
 
-  handlePrice();
+  handlePrice(!onlyComputedTrunline, 'trunkline');
 };
 
 /** 查询客户信息 */
@@ -2405,17 +2405,17 @@ const handleWarehouseManagement = () => {
 };
 
 /** 处理模板费用 */
-const handlePrice = () => {
+const handlePrice = (isAll = false, type) => {
   const { dispatch, pickup, template, trunkLine } = details.priceTemplate;
 
   /** 处理提货费用 */
-  handlePickUpPrice(pickup, template);
+  (isAll || type === 'pickup') && handlePickUpPrice(pickup, template);
   /** 处理干线费用 */
-  handleTrunkLinePrice(trunkLine, template);
+  (isAll || type === 'trunkline') && handleTrunkLinePrice(trunkLine, template);
   /** 处理配送费 */
-  handleDispatchPrice(dispatch, template);
+  (isAll || type === 'dispatch') && handleDispatchPrice(dispatch, template);
   /** 处理仓库管理费 */
-  handleWarehouseManagement();
+  (isAll || type === 'warehouseMangement') && handleWarehouseManagement();
 };
 
 /** 重置值 */