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 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue b/src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
index 10bb66e..be999ab 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,6 +131,7 @@
     // 璇锋眰鏁版嵁
     async getData() {
       await historyInventoryAdjustment({
+        baseOperationType: this.baseOperationType,
         locationId: this.locationId,
         page: this.pagerOptions.currPage,
         pageSize: this.pagerOptions.pageSize,

--
Gitblit v1.8.0