From 3b3805ee93cc29a79ccf44d54539ec6c93dd97e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 26 Nov 2021 00:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=BF=9B=E9=94=80=E5=AD=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=9A=84=E4=BB=93=E5=BA=93=E9=80=89=E6=8B=A9=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E5=8F=AF=E4=BB=A5=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/report/InOutStockReport.vue       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index c7f865e7..df513939 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -10,10 +10,11 @@
               <a-col :md="4" :sm="24">
                 <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-select
+                    mode="multiple" :maxTagCount="1"
                     optionFilterProp="children"
-                    showSearch allow-clear style="width: 100%"
+                    showSearch style="width: 100%"
                     placeholder="请选择仓库"
-                    v-model="queryParam.depotId">
+                    v-model="depotSelected">
                     <a-select-option v-for="(depot,index) in depotList" :value="depot.id">
                       {{ depot.depotName }}
                     </a-select-option>
@@ -118,7 +119,7 @@
           pageSize: 11,
           pageSizeOptions: ['11', '21', '31', '101', '201']
         },
-        tabKey: "1",
+        depotSelected:[],
         depotList: [],
         totalCountMoneyStr: '',
         // 表头
@@ -157,6 +158,9 @@
       moment,
       getQueryParams() {
         let param = Object.assign({}, this.queryParam, this.isorter);
+        if(this.depotSelected && this.depotSelected.length>0) {
+          param.depotIds = this.depotSelected.join()
+        }
         param.monthTime = this.queryParam.monthTime;
         param.field = this.getQueryField();
         param.currentPage = this.ipagination.current;
@@ -173,7 +177,12 @@
         })
       },
       getTotalCountMoney(){
-        getAction(this.url.totalCountMoney, this.queryParam).then((res)=>{
+        let param = Object.assign({}, this.queryParam, this.isorter);
+        if(this.depotSelected && this.depotSelected.length>0) {
+          param.depotIds = this.depotSelected.join()
+        }
+        param.monthTime = this.queryParam.monthTime;
+        getAction(this.url.totalCountMoney, param).then((res)=>{
           if(res && res.code === 200) {
             let count = res.data.totalCount.toString();
             if (count.lastIndexOf('.') > -1) {