From 15758023c35381d0a502e0e81403a294f8b61f5d Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 30 Jul 2024 09:57:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E5=8D=95=E5=B8=A6?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 41e062df..e5035014 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2459,7 +2459,7 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
       ? computeNumber(row.price, '*', row[_trunklineKey]).result
       : 0;
 
-  if (onlyComputedTrunline) {
+  if (!onlyComputedTrunline) {
     // 计算提货价格 -- 行
     if (_pickupKey)
       row.subtotalPickup = _pickupKey
@@ -2679,9 +2679,9 @@ const handlePickUpPrice = (pickup, template) => {
     if (
       (pickup || template) &&
       template.pickupIsMinCost &&
-      Number(template.pickupMinCostMode) === 1
+      Number(template.pickupCompleteOrNot) === 0
     ) {
-      switch (Number(template.dispatchMinCostType)) {
+      switch (Number(template.pickupMinCostType)) {
         // 价格
         case 1:
           details.query.pickupFee = pickup.minCost > _total ? pickup.minCost : _total;
@@ -3500,7 +3500,7 @@ const handleAssignmentItemPriceWarehouseManagementPrice = (
     // 不区分品类 -- 暂时默认为按件
     value.warehouseManagementPrice =
       getObjType(additionalCategory) === 'array' && additionalCategory.length > 0
-        ? additionalCategory[0].price || 0
+        ? additionalCategory[0].warehouseManagementPrice || 0
         : 0;
   }
 };
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 55ba484a..0ab248ab 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -2006,7 +2006,7 @@ const handleComputed = (row: any, onlyComputedTrunline = false) => {
       ? computeNumber(row.price, '*', row[_trunklineKey]).result
       : 0;
 
-  if (onlyComputedTrunline) {
+  if (!onlyComputedTrunline) {
     // 计算提货价格 -- 行
     if (_pickupKey)
       row.subtotalPickup = _pickupKey
@@ -2219,9 +2219,9 @@ const handlePickUpPrice = (pickup, template) => {
     if (
       (pickup || template) &&
       template.pickupIsMinCost &&
-      Number(template.pickupMinCostMode) === 1
+      Number(details.query.pickupCompleteOrNot) === 0
     ) {
-      switch (Number(template.dispatchMinCostType)) {
+      switch (Number(template.pickupMinCostType)) {
         // 价格
         case 1:
           details.query.pickupFee = pickup.minCost > _total ? pickup.minCost : _total;
@@ -3026,7 +3026,7 @@ const handleAssignmentItemPriceWarehouseManagementPrice = (
     // 不区分品类 -- 暂时默认为按件
     value.warehouseManagementPrice =
       getObjType(additionalCategory) === 'array' && additionalCategory.length > 0
-        ? additionalCategory[0].price || 0
+        ? additionalCategory[0].warehouseManagementPrice || 0
         : 0;
   }
 };