From 06445e38167391a98276d7d2fda8c0426ac57768 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 14 Feb 2025 14:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=91=E7=89=8C=E7=89=B9?=
 =?UTF-8?q?=E6=AE=8A=E8=AE=A1=E8=B4=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/CreateOrder.vue | 7 ++++---
 src/views/waybill/CreateZeroOrder.vue            | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 20880e2b..9752f5ff 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2871,7 +2871,7 @@ const destinationWarehouseNameChange = val => {
 const handleComputed = (row: any, onlyComputedTrunline = false) => {
   const { template, trunkLine } = details.priceTemplate;
 
-  if (Boolean(isDisabled.value && template && trunkLine))
+  if (Boolean(isDisabled.value && template && trunkLine && !onlyComputedTrunline))
     handleSpecialBrandPrice(row, trunkLine, template, !onlyComputedTrunline);
 
   details.query.goodsCode = '-' + details.totalObj.totalCount;
@@ -4552,7 +4552,8 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   if (!isOnload) {
     if (trunkLine && template) {
       // 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
-      if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template, true);
+      if (isDisabled.value && !chargeType)
+        handleSpecialBrandPrice(value, trunkLine, template, true);
       else handleAssignmentItemPriceTrunkline(value, trunkLine, template, chargeType);
       // 是否为区分品类
     } else {
@@ -4591,7 +4592,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   }
 
   // 计算每行价格
-  if (!isOnload) handleComputed(value);
+  if (!isOnload) handleComputed(value, !isOnload);
 };
 
 /** 获取价格
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 1fcead82..1a7d89ce 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2161,7 +2161,7 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => {
 const handleComputed = (row: any, onlyComputedTrunline = false) => {
   const { template, trunkLine } = details.priceTemplate;
 
-  if (Boolean(isDisabled.value && template && trunkLine))
+  if (Boolean(isDisabled.value && template && trunkLine && !onlyComputedTrunline))
     handleSpecialBrandPrice(row, trunkLine, template, !onlyComputedTrunline);
 
   details.query.goodsCode = '-' + details.totalObj.totalCount;
@@ -3648,7 +3648,8 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   if (!isOnload) {
     if (trunkLine && template) {
       // 如果品牌为金牌, 切模板选择为特殊计费则特殊处理
-      if (isDisabled.value) handleSpecialBrandPrice(value, trunkLine, template, true);
+      if (isDisabled.value && !chargeType)
+        handleSpecialBrandPrice(value, trunkLine, template, true);
       else handleAssignmentItemPriceTrunkline(value, trunkLine, template, chargeType);
 
       // 是否为区分品类
@@ -3683,7 +3684,7 @@ const handleAssignmentItemPrice = (value, isOnload = false, chargeType?: number
   }
 
   // 计算每行价格
-  if (!isOnload) handleComputed(value);
+  if (!isOnload) handleComputed(value, !isOnload);
 };
 
 /** 获取价格