From c356ebfc46d6f98afb6eebc252db2db6718e25f2 Mon Sep 17 00:00:00 2001
From: zuozhengqing <a13193816592@163.com>
Date: 星期六, 28 十月 2023 15:58:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

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

diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 10bb66e..ff723a9 100644
--- a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
+++ b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -31,20 +31,23 @@
       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.getData()
   },
   methods: {
     setTable() {
       this.tableList = {
         tableInfomation: [],
-        selectBox: true,
+        selectBox: false,
+        selectIndex: true,
         showcol: this.showcol,
         allcol: [],
         tableColumn: this.setTableColumn(this.showcol)
@@ -128,10 +131,12 @@
     // 璇锋眰鏁版嵁
     async getData() {
       await historyInventoryAdjustment({
+        baseOperationType:this.baseOperationType,
         locationId: this.locationId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,
-        productId: this.productId
+        productId: this.productId,
+        baseOperationType:this.baseOperationType
       }).then((res) => {
         if (res.code === 200) {
           const list = res.data.map((item) => {

--
Gitblit v1.8.0