From 95ff77e1e2994fe1088c69b326bdd7023c8563dc Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 17 四月 2024 14:32:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
---
src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 8da377a..d1bbaa0 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -142,8 +142,8 @@
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: item.details[0].amount,
unit: product.unit
--
Gitblit v1.8.0