From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token

---
 src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 8e9290c..be999ab 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,11 +131,11 @@
     // 璇锋眰鏁版嵁
     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) => {

--
Gitblit v1.8.0