From fc895c6ecea18a38d7836136577fbaba30f2f803 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, 10 Oct 2021 21:15:40 +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=E5=92=8C=E6=B5=81=E6=B0=B4=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/MaterialStock.vue             | 8 ++++----
 jshERP-web/src/views/report/modules/MaterialInOutList.vue | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/report/MaterialStock.vue b/jshERP-web/src/views/report/MaterialStock.vue
index 63232ec8..3e98ca66 100644
--- a/jshERP-web/src/views/report/MaterialStock.vue
+++ b/jshERP-web/src/views/report/MaterialStock.vue
@@ -124,15 +124,15 @@
             }
           },
           {title: '条码', dataIndex: 'mBarCode', width: 80},
-          {title: '名称', dataIndex: 'name', width: 80},
+          {title: '名称', dataIndex: 'name', width: 140},
           {title: '规格', dataIndex: 'standard', width: 80},
           {title: '型号', dataIndex: 'model', width: 80},
           {title: '颜色', dataIndex: 'color', width: 80},
           {title: '类别', dataIndex: 'categoryName', width: 80},
-          {title: '单位', dataIndex: 'unitName', width: 80},
+          {title: '单位', dataIndex: 'unitName', width: 60},
           {title: '单价', dataIndex: 'purchaseDecimal', width: 60},
-          {title: '初始库存', dataIndex: 'initialStock', width: 80},
-          {title: '当前库存', dataIndex: 'currentStock', width: 80},
+          {title: '初始库存', dataIndex: 'initialStock', width: 60},
+          {title: '当前库存', dataIndex: 'currentStock', width: 60},
           {title: '当前库存金额', dataIndex: 'currentStockPrice', width: 80},
           { title: '库存流水', dataIndex: 'action', align:"center", width: 100,
             scopedSlots: { customRender: 'action' }
diff --git a/jshERP-web/src/views/report/modules/MaterialInOutList.vue b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
index c4e53c51..7b645c17 100644
--- a/jshERP-web/src/views/report/modules/MaterialInOutList.vue
+++ b/jshERP-web/src/views/report/modules/MaterialInOutList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-modal
     :title="title"
-    :width="1000"
+    :width="1250"
     :visible="visible"
     @cancel="handleCancel"
     cancelText="关闭"
@@ -66,15 +66,15 @@
             }
           },
           {
-            title: '单据编号', dataIndex: 'number', width: 150,
+            title: '单据编号', dataIndex: 'number', width: 100,
             scopedSlots: { customRender: 'numberCustomRender' },
           },
           { title: '类型', dataIndex: 'type', width: 100},
           { title: '条码', dataIndex: 'barCode', width: 100},
-          { title: '名称', dataIndex: 'materialName', width: 100},
+          { title: '名称', dataIndex: 'materialName', width: 200},
           { title: '仓库名称', dataIndex: 'depotName', width: 80},
           { title: '数量', dataIndex: 'basicNumber', width: 80},
-          { title: '日期', dataIndex: 'operTime', width: 180}
+          { title: '日期', dataIndex: 'operTime', width: 100}
         ],
         labelCol: {
           xs: { span: 1 },