From b4db7c6722e64b93741ef575e9fd9c518d012183 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, 14 May 2022 23:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=92=8C=E5=A2=9E=E5=8A=A0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/doc/goods_template.xls      | Bin 20480 -> 20480 bytes
 .../src/views/material/MaterialList.vue       |  38 +++++++-----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/jshERP-web/public/doc/goods_template.xls b/jshERP-web/public/doc/goods_template.xls
index e5d988c54b014419e1720058bacb0367cc816e85..c828f5fb30fe4598a341cd334d65255dfe3ad17f 100644
GIT binary patch
delta 574
zcmX|)PiPZC6vp4%OxkQiy1U8h?zYKh>p>g3*ocQhTiT5jDO3<mpo*YWv^iKL6hsBV
z97Gf<8lHlbg7KsU59&&fw%$~bdg!5t3PDc_9^xO0mJ(mKwhZ&l_r32oGvz9ltN46M
zw3J4*i}OXA7B{iS|07}{T99{BGGdb8Jtdp8#^<$&P7ZsoRnQU6&p5x8b#fy~s`6}*
zyK_8S;(UYsuZT<c*caH($*R95yJ3uxtejzep*VC~8O8+VRD)`YNw?H4vebR3G$+^*
zXlI~Wz?4*(=2Zog^q6maR81zos=d}O0QlWd0q$$sVtO$RLUwAPLy8V)hGp%vlapI*
zU(m*ALhD7FD$GQ;nH8AuoU9436fo_~7?!@>z5?(Z&jHc%|Ajig5TmZR!CKdvdMxm$
z8B~sEck;V<ldEeP+LN%^<r2$cY-6?I>-x}MOi{i+7rhj6`JW8$pZ=qM8~6Vm_pW@X
zELUa<pN@9lNf$dB-}0N~3nxnF$4|9EA7J+GY2)~Mex`8s?0TNQ53DFHfLm-gWKL$l
ze?NE`@qvG6XaJ=*?R0(k2hRD^-a#R~Zlxz9uAPH6{!rr8)D$QnNf73M97Fz>ktn`A
aY)WGGVXf0oj&4ffryC2iMc*F#EdBvf@}Hgn

delta 566
zcmX|<O=uHQ5XWbdm$)z6cHbteyBpIa6%mUI*&-NirEZ{9#V@oTJXPyQD%gvHU$=-N
zf{2#!;LY_YdZ=#kBu2!GAnKvV3PDfOQzS(_NS!3Mhxz~i^XA9Q<<&y0g*Z1OlBepI
zZ~2pSN!&&^`XhSdv_soKInAM#W>K(C&~wh4rA61+AITiO=l7lLXStt|9z9?Wnd^}b
z&2t^({y6(bsmRk(l;nMjnu->smq4AQagz0gVPhZNF!oZ-khEVJ)G!<hl!F;ERS7Ms
zC>z(el|t1eej5YyR2gW}6Mp@|tVKUm$?XMz<rM|+&@}6XdI5wiHoyXxhD_VtxHhd;
zyVG)Ks?(HN!W_*q)4$3rz*JE59e}qTCd-WN=2xfl06{S*g4p(dLz6e?G?2Dgn`T>&
zb~2ha)zbc2{~_Jxn&u#F%H%m!GM|N6KC~;ctkEs#(!_8@zZm!U&LCGSdOVy*|Nf+X
z?AJu=ZeKOKa^b`fd_R2tj-2k{?00hGTnfs7{`J#cik3zeWE}A8k*)U%)6u8hR}p8U
z@zD{CEv4w@o}V}uT?w{}*sCNx8}n2@7!a3`;EM<nWVAe{BZVUUa@>iDZ1wfKD7Wu#
PEb-<He~>7D;G6gdnPZ)c

diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue
index e6e07147..dd8b9c45 100644
--- a/jshERP-web/src/views/material/MaterialList.vue
+++ b/jshERP-web/src/views/material/MaterialList.vue
@@ -16,13 +16,13 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="条码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入条码查询" v-model="queryParam.barCode"></a-input>
+                <a-form-item label="关键词" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入条码、名称、规格、型号查询" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入名称查询" v-model="queryParam.name"></a-input>
+                <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input placeholder="请输入颜色查询" v-model="queryParam.color"></a-input>
                 </a-form-item>
               </a-col>
               <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
@@ -36,21 +36,7 @@
                 </a-col>
               </span>
               <template v-if="toggleSearchStatus">
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="规格" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入规格查询" v-model="queryParam.standard"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入型号查询" v-model="queryParam.model"></a-input>
-                  </a-form-item>
-                </a-col>
-                <a-col :md="6" :sm="24">
-                  <a-form-item label="颜色" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                    <a-input placeholder="请输入颜色查询" v-model="queryParam.color"></a-input>
-                  </a-form-item>
-                </a-col>
+
                 <a-col :md="6" :sm="24">
                   <a-form-item label="基础重量" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-input-number style="width: 100%" placeholder="请输入基础重量查询" v-model="queryParam.weight"></a-input-number>
@@ -61,6 +47,14 @@
                     <a-input-number style="width: 100%" placeholder="请输入保质期查询" v-model="queryParam.expiryNum"></a-input-number>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                    <a-select placeholder="请选择状态" v-model="queryParam.enabled">
+                      <a-select-option value="1">启用</a-select-option>
+                      <a-select-option value="0">禁用</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="序列号" :labelCol="labelCol" :wrapperCol="wrapperCol">
                     <a-select placeholder="有无序列号" v-model="queryParam.enableSerialNumber">
@@ -203,13 +197,11 @@
         // 查询条件
         queryParam: {
           categoryId:'',
-          barCode:'',
-          name:'',
-          standard:'',
-          model:'',
+          materialParam:'',
           color:'',
           weight:'',
           expiryNum:'',
+          enabled: '',
           enableSerialNumber:'',
           enableBatchNumber:'',
           remark:'',