From 60660480617672a608ec02d50eb2d053e4de49cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 7 Feb 2023 21:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=BB=99=E5=95=86=E5=93=81=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=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/src/views/report/MaterialStock.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 2374793e..b04da503 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -30,7 +30,7 @@
               </a-col>
               <a-col :md="4" :sm="24">
                 <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
+                  <a-input placeholder="条码/名称/规格/型号/颜色" v-model="queryParam.materialParam"></a-input>
                 </a-form-item>
               </a-col>
               <a-col :md="3" :sm="24">
@@ -151,13 +151,13 @@
               return (t !== '合计') ? (parseInt(index) + 1) : t
             }
           },
-          {title: '库存流水', dataIndex: 'action', align:"center", width: 100,
+          {title: '库存流水', dataIndex: 'action', align:"center", width: 60,
             scopedSlots: { customRender: 'action' }
           },
           {title: '条码', dataIndex: 'mBarCode', width: 80},
           {title: '名称', dataIndex: 'name', width: 140, ellipsis:true},
-          {title: '规格', dataIndex: 'standard', width: 80, ellipsis:true},
-          {title: '型号', dataIndex: 'model', width: 80, ellipsis:true},
+          {title: '规格', dataIndex: 'standard', width: 100, ellipsis:true},
+          {title: '型号', dataIndex: 'model', width: 100, ellipsis:true},
           {title: '颜色', dataIndex: 'color', width: 80, ellipsis:true},
           {title: '类别', dataIndex: 'categoryName', width: 80, ellipsis:true},
           {title: '单位', dataIndex: 'unitName', width: 60, ellipsis:true},