From 76fd851ea1ab9caf43cec4179ebe4df212909c10 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, 27 Dec 2020 13:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/materials/material.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 2ad1d3d4..1112fb6b 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -419,8 +419,9 @@
                     {title: '名称', field: 'name', width: 120},
                     {title: '规格', field: 'standard', width: 80},
                     {title: '型号', field: 'model', width: 80},
+                    {title: '颜色', field: 'color', width: 50},
                     {title: '类别', field: 'categoryName', width: 80},
-                    {title: '扩展信息', field: 'materialOther', width: 140},
+                    {title: '扩展信息', field: 'materialOther', width: 100},
                     {title: '单位', field: 'unit', width: 80,
                         formatter: function (value, rec) {
                             if(value) {
@@ -449,7 +450,7 @@
                         }
                     },
                     {
-                        title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
+                        title: '序列号', field: 'enableSerialNumber', width: 60, align: "center", formatter: function (value) {
                             return value=='1' ? "<span style='color:green'>有</span>" : "无";
                         }
                     }