From 828f9ce304a2399de0223e129548e165f16b8bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 24 Apr 2020 00:05:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/erp_web/pages/materials/material.html b/erp_web/pages/materials/material.html
index 66ff541e..3d996dc0 100644
--- a/erp_web/pages/materials/material.html
+++ b/erp_web/pages/materials/material.html
@@ -131,15 +131,15 @@
                         <td style="text-align: left;"></td>
                     </tr>
                     <tr>
-                        <td colspan="7" style="padding:5px 20px 10px 0; width: 1130px">
-                            <table id="materialExtendData" style="width:100%;border-bottom-color:#FFFFFF"></table>
+                        <td colspan="7" style="padding:5px 20px 10px 0; width: 1200px">
+                            <table id="materialExtendData" style="width:1200px;border-bottom-color:#FFFFFF"></table>
                         </td>
                     </tr>
                     <tr>
                         <td style="height:30px;">备注</td>
                         <td style="padding:5px 20px 5px 5px" colspan="6">
                             <textarea name="Remark" id="Remark" class="easyui-textbox" data-options="multiline:true" placeholder="暂无备注信息"
-                                      style="width: 100%; height:40px;"></textarea>
+                                      style="width: 1130px; height:40px;"></textarea>
                         </td>
                     </tr>
                 </table>
@@ -491,12 +491,12 @@
                     {title: '最低售价', field: 'lowDecimal', width: 70},
                     {
                         title: '状态', field: 'enabled', width: 50, align: "center", formatter: function (value) {
-                            return value ? "启用" : "禁用";
+                            return value ? "<span style='color:green'>启用</span>" : "<span style='color:red'>禁用</span>";
                         }
                     },
                     {
                         title: '序列号', field: 'enableserialnumber', width: 70, align: "center", formatter: function (value) {
-                            return value=='1' ? "有" : "无";
+                            return value=='1' ? "<b>有</b>" : "无";
                         }
                     }
                 ]],