From e3cadadc1e03e0648a079f7fc8bf8b3d0d64bc27 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 15 四月 2024 15:54:04 +0800
Subject: [PATCH] wms的出库入库调拨 3个模块新建,编辑,列表增加 主管,会计,保管员3个字段以及新建,编辑联调

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

diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index bd34aae..d1bbaa0 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -32,14 +32,14 @@
       keyword: "",
       locationId: 0,
       productId: "",
-      baseOperationType:""
+      baseOperationType: ""
     }
   },
   created() {
     this.setTable()
     this.locationId = this.$route.params.locationId
     this.productId = this.$route.params.productId
-    this.baseOperationType=this.$route.params.baseOperationType
+    this.baseOperationType = this.$route.params.baseOperationType
     this.getData()
   },
   methods: {
@@ -131,7 +131,7 @@
     // 璇锋眰鏁版嵁
     async getData() {
       await historyInventoryAdjustment({
-        baseOperationType:this.baseOperationType,
+        baseOperationType: this.baseOperationType,
         locationId: this.locationId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
@@ -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