From 4557a13f114334e9efbfe839de1363e1a3b98c81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 28 May 2022 17:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=B5=81=E6=B0=B4=E8=AE=B0=E5=BD=95=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/MaterialStock.vue             | 8 ++++++--
 jshERP-web/src/views/report/modules/MaterialInOutList.vue | 8 +++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 39a4974c..2fc706ba 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -230,8 +230,12 @@
         })
       },
       showMaterialInOutList(record) {
-        this.$refs.materialInOutList.show(record);
-        this.$refs.materialInOutList.title = "查看商品库存流水（全部仓库）";
+        let depotIds = ''
+        if(this.depotSelected && this.depotSelected.length>0) {
+          depotIds = this.depotSelected.join()
+        }
+        this.$refs.materialInOutList.show(record, depotIds);
+        this.$refs.materialInOutList.title = "查看商品库存流水";
         this.$refs.materialInOutList.disableSubmit = false;
       },
       exportExcel() {
diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
index 7b645c17..6dcc6761 100644
--- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue
+++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
@@ -50,7 +50,8 @@
         toFromType: '',
         // 查询条件
         queryParam: {
-          materialId:''
+          depotIds: '',
+          materialId:'',
         },
         tabKey: "1",
         // 表头
@@ -85,7 +86,7 @@
           sm: { span: 16 },
         },
         url: {
-          list: "/depotItem/findDetailByTypeAndMaterialId"
+          list: "/depotItem/findDetailByDepotIdsAndMaterialId"
         }
       }
     },
@@ -99,9 +100,10 @@
         param.pageSize = this.ipagination.pageSize;
         return param;
       },
-      show(record) {
+      show(record, depotIds) {
         this.model = Object.assign({}, record);
         this.visible = true;
+        this.queryParam.depotIds = depotIds
         this.queryParam.materialId = record.id
         this.loadData(1)
       },