From 66d902f33b1590c2fa524c68707586a4ae17aa46 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 30 May 2024 17:19:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=8D=95=E5=BD=95?=
 =?UTF-8?q?=E5=8D=95=E9=85=8D=E9=80=81=E6=9C=80=E4=BD=8E=E8=AE=A1=E8=B4=B9?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index b383cdbe..ae2a9020 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2731,7 +2731,11 @@ const handleDispatchPrice = (dispatch, template) => {
   }
 
   // 是否存在最低计费
-  if ((dispatch || template) && template.trunklineIsMinCost) {
+  if (
+    (dispatch || template) &&
+    template.trunklineIsMinCost &&
+    Number(template.dispatchMinCostMode) === 1
+  ) {
     switch (Number(template.dispatchMinCostType)) {
       // 价格
       case 1:
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index dcdef1a5..4be64d40 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2268,7 +2268,11 @@ const handleDispatchPrice = (dispatch, template) => {
   }
 
   // 是否存在最低计费
-  if ((dispatch || template) && template.trunklineIsMinCost) {
+  if (
+    (dispatch || template) &&
+    template.trunklineIsMinCost &&
+    Number(template.dispatchMinCostMode) === 1
+  ) {
     switch (Number(template.dispatchMinCostType)) {
       // 价格
       case 1: