From d6fe2f7b48f54c43ac201a89397cfb813024b653 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 31 Oct 2024 11:42:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=91=E7=89=8C=E5=BC=80?= =?UTF-8?q?=E5=8D=95=E5=BD=95=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/inventory/CreateOrder.vue | 4 ++++ src/views/waybill/CreateZeroOrder.vue | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index b0488bc0..202a39f9 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -4078,6 +4078,8 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => { const { totalCount, totalVolume } = details.totalObj; if (totalCount < 15 && totalVolume < 0.8 && totalVolume / (totalCount || 1) < 0.11) { + if (value.chargeType === 1) return; + value.chargeType = 1; value.systemChargeType = 1; @@ -4124,6 +4126,8 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => { value.freightPrice = _price; } } else { + if (value.chargeType === 2) return; + value.chargeType = 2; value.systemChargeType = 2; diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index fdfb0ef8..269c0032 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -3200,6 +3200,8 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => { const { totalCount, totalVolume } = details.totalObj; if (totalCount < 15 && totalVolume < 0.8 && totalVolume / (totalCount || 1) < 0.11) { + if (value.chargeType === 1) return; + value.chargeType = 1; value.systemChargeType = 1; @@ -3249,6 +3251,8 @@ const handleSpecialBrandPrice = (value, trunkLine, template) => { value.freightPrice = _price; } } else { + if (value.chargeType === 2) return; + value.chargeType = 2; value.systemChargeType = 2;