From d68b036a3b3c67273b8effa3c9925ef3869a91ba Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 07 二月 2024 13:56:50 +0800
Subject: [PATCH] wms项目 wms系统参数设置的页面开发+路由+是否显示表头配置

---
 src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 8e9290c..f8102e2 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -31,14 +31,15 @@
       searchOptions: [],
       keyword: "",
       locationId: 0,
-      productId: ""
+      productId: "",
+      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: {
@@ -130,21 +131,21 @@
     // 璇锋眰鏁版嵁
     async getData() {
       await historyInventoryAdjustment({
+        baseOperationType: this.baseOperationType,
         locationId: this.locationId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
-        productId: this.productId,
-        baseOperationType:this.baseOperationType
+        productId: this.productId
       }).then((res) => {
         if (res.code === 200) {
           const list = res.data.map((item) => {
             let product = item.details[0].product
             return {
               ...item,
-              from: item.fromLocation.name,
-              to: item.toLocation.name,
+              from: item.fromLocation?item.fromLocation.name:"",
+              to: item.toLocation?item.toLocation.name:"",
               productName: product.name,
-              amount: product.amount,
+              amount: item.details[0].amount,
               unit: product.unit
             }
           })

--
Gitblit v1.8.0