From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git

---
 src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index be999ab..d1bbaa0 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -142,10 +142,10 @@
             let product = item.details[0].product
             return {
               ...item,
-              from: item.fromLocation.name,
-              to: item.toLocation.name,
+              from: item.details[0].fromLocation.jointName?item.details[0].fromLocation.jointName:"",
+              to: item.details[0].toLocation.jointName?item.details[0].toLocation.jointName:"",
               productName: product.name,
-              amount: product.amount,
+              amount: item.details[0].amount,
               unit: product.unit
             }
           })

--
Gitblit v1.8.0