From 440df788c0eb51d3376c70bc181c1f4a00ce8161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 25 Nov 2021 01:15:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=9A=84=E4=BB=93=E5=BA=93=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=AE=BE=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     |  2 +-
 jshERP-web/src/views/report/MaterialStock.vue | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/jshERP-web/src/views/report/InOutStockReport.vue b/jshERP-web/src/views/report/InOutStockReport.vue
index 8a5070e3..c7f865e7 100644
--- a/jshERP-web/src/views/report/InOutStockReport.vue
+++ b/jshERP-web/src/views/report/InOutStockReport.vue
@@ -40,7 +40,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item>
-                  <span>本月合计金额：{{totalCountMoneyStr}}</span>
+                  <span>总结存金额：{{totalCountMoneyStr}}</span>
                 </a-form-item>
               </a-col>
             </a-row>
diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 94a3fcf5..983c889b 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -7,13 +7,14 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="3" :sm="24">
+              <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>
@@ -40,7 +41,7 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="5" :sm="24">
+              <a-col :md="4" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
                   <a-button style="margin-left: 8px" v-print="'#reportPrint'" icon="printer">打印</a-button>
@@ -49,7 +50,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item>
-                  <span>当前总库存：{{currentStock}}，当前总库存金额：{{currentStockPrice}}</span>
+                  <span>总库存：{{currentStock}}，总库存金额：{{currentStockPrice}}</span>
                 </a-form-item>
               </a-col>
             </a-row>
@@ -123,7 +124,6 @@
         },
         // 查询条件
         queryParam: {
-          depotId:'',
           categoryId:'',
           materialParam:'',
           zeroStock: '0',
@@ -133,6 +133,7 @@
           pageSize: 11,
           pageSizeOptions: ['11', '21', '31', '101', '201']
         },
+        depotSelected:[],
         depotList: [],
         categoryTree:[],
         currentStock: '',
@@ -154,8 +155,8 @@
           {title: '单位', dataIndex: 'unitName', width: 60},
           {title: '单价', dataIndex: 'purchaseDecimal', sorter: (a, b) => a.purchaseDecimal - b.purchaseDecimal, width: 60},
           {title: '初始库存', dataIndex: 'initialStock', sorter: (a, b) => a.initialStock - b.initialStock, width: 60},
-          {title: '当前库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60},
-          {title: '当前库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80},
+          {title: '库存', dataIndex: 'currentStock', sorter: (a, b) => a.currentStock - b.currentStock, width: 60},
+          {title: '库存金额', dataIndex: 'currentStockPrice', sorter: (a, b) => a.currentStockPrice - b.currentStockPrice, width: 80},
           { title: '库存流水', dataIndex: 'action', align:"center", width: 100,
             scopedSlots: { customRender: 'action' }
           }
@@ -173,6 +174,9 @@
       moment,
       getQueryParams() {
         let param = Object.assign({}, this.queryParam, this.isorter);
+        if(this.depotSelected && this.depotSelected.length>0) {
+          param.depotIds = this.depotSelected.join()
+        }
         param.field = this.getQueryField();
         param.currentPage = this.ipagination.current;
         param.pageSize = this.ipagination.pageSize-1;
@@ -205,15 +209,11 @@
         this.loadData(1);
       },
       loadData(arg) {
-        if(!this.url.list){
-          this.$message.error("请设置url.list属性!")
-          return
-        }
         //加载数据 若传入参数1则加载第一页的内容
         if (arg === 1) {
           this.ipagination.current = 1;
         }
-        var params = this.getQueryParams();//查询条件
+        let params = this.getQueryParams();//查询条件
         this.loading = true;
         getAction(this.url.list, params).then((res) => {
           if (res.code===200) {