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) },