diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index afe530ab..d0163b68 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -3148,9 +3148,11 @@ const handlePickUpPrice = (pickup, template) => { let _total = 0; for (let i = 0; i < details.goodsList.length; i++) { - _total += computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result; + _total = computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result; } + console.log('_total :>> ', _total); + // 是否存在最低计费 if ( (pickup || template) && @@ -3236,30 +3238,30 @@ const handleTrunkLinePrice = (trunkLine, template) => { switch (Number(template.trunklineMinCostType)) { // 价格 case 1: - details.query.totalFreight = template.minCost > _total ? template.minCost : _total; + details.query.totalFreight = trunkLine.minCost > _total ? trunkLine.minCost : _total; break; // 件 case 2: details.query.totalFreight = - template.minCost > details.totalObj.totalCount - ? _total + (template.additionalCost || 0) + trunkLine.minCost > details.totalObj.totalCount + ? _total + (trunkLine.minCost || 0) : _total; break; // 方 case 3: details.query.totalFreight = - template.minCost > details.totalObj.totalVolume - ? _total + (template.additionalCost || 0) + trunkLine.minCost > details.totalObj.totalVolume + ? _total + (trunkLine.minCost || 0) : _total; break; // 重量 case 4: details.query.totalFreight = - template.minCost > details.totalObj.totalWeghit - ? _total + (template.additionalCost || 0) + trunkLine.minCost > details.totalObj.totalWeghit + ? _total + (trunkLine.minCost || 0) : _total; break; diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index 9b24a11a..1680aa59 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -2316,7 +2316,7 @@ const handlePickUpPrice = (pickup, template) => { let _total = 0; for (let i = 0; i < details.goodsList.length; i++) { - _total += computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result; + _total = computeNumber(_total, '+', details.goodsList[i].subtotalPickup || 0).result; } // 是否存在最低计费 @@ -2452,7 +2452,7 @@ const handleDispatchPrice = (dispatch, template) => { for (let i = 0; i < details.goodsList.length; i++) { const value = details.goodsList[i]; if (value.subtotalDispatch) - _total += computeNumber(_total, '+', value.subtotalDispatch || 0).result; + _total = computeNumber(_total, '+', value.subtotalDispatch || 0).result; } // 是否存在最低计费