From 4b23754c4f068a5ad9735e66f267d7aba8a0e011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 24 Oct 2021 16:58:18 +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=8A=A5=E8=A1=A8=EF=BC=8C=E5=8F=AF=E4=BB=A5=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F0=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/MaterialStock.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 02ba6d6e..7fb1f374 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -7,7 +7,7 @@
         <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
             <a-row :gutter="24">
-              <a-col :md="4" :sm="24">
+              <a-col :md="3" :sm="24">
                 <a-form-item label="仓库" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-select
                     showSearch optionFilterProp="children"
@@ -20,7 +20,7 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="3" :sm="24">
                 <a-form-item label="类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
                        :treeData="categoryTree" v-model="queryParam.categoryId" placeholder="请选择类别">
@@ -32,6 +32,14 @@
                   <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
+              <a-col :md="3" :sm="24">
+                <a-form-item label="零库存" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-select v-model="queryParam.zeroStock">
+                    <a-select-option value="0">隐藏</a-select-option>
+                    <a-select-option value="1">显示</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
                 <a-col :md="4" :sm="24">
                   <a-button type="primary" @click="searchQuery">查询</a-button>
@@ -122,6 +130,7 @@
           depotId:'',
           categoryId:'',
           materialParam:'',
+          zeroStock: '0',
           mpList: getMpListShort(Vue.ls.get('materialPropertyList'))  //扩展属性
         },
         ipagination:{