From 2099f5a95f6f52162d6e263fee1d52f1bda1f4ca 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, 13 Dec 2020 01:13:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/pages/manage/unit.html                   | 10 +++++++---
 erp_web/pages/template/init_depot_show_list.html |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/erp_web/pages/manage/unit.html b/erp_web/pages/manage/unit.html
index 303a51dc..ea14fb24 100644
--- a/erp_web/pages/manage/unit.html
+++ b/erp_web/pages/manage/unit.html
@@ -43,7 +43,6 @@
                 <td style="padding:5px">
                     <input name="basicName" id="basicName" class="easyui-textbox"
                            data-options="required:true,validType:'length[1,10]'" style="width: 100px;"/>
-                    基本单位应为最小度量单位
                 </td>
             </tr>
             <tr>
@@ -52,11 +51,16 @@
                     <input name="otherName" id="otherName" class="easyui-textbox"
                            data-options="required:true,validType:'length[1,5]'" style="width: 100px;"/>
                     =
-                    <input name="otherNum" id="otherNum" class="easyui-textbox"
-                           data-options="required:true,validType:'length[1,5]'" style="width: 50px;"/>
+                    <input name="otherNum" id="otherNum" class="easyui-numberbox"
+                           data-options="required:true, min:0,precision:0" style="width: 50px;"/>
                     <span id="unitName"></span>
                 </td>
             </tr>
+            <tr>
+                <td colspan="2" style="height: 30px;color:#7c7c7c;">
+                    注：基本单位应为最小度量单位，副单位为大单位
+                </td>
+            </tr>
         </table>
     </form>
 </div>
diff --git a/erp_web/pages/template/init_depot_show_list.html b/erp_web/pages/template/init_depot_show_list.html
index debea9f1..26ebe3e8 100644
--- a/erp_web/pages/template/init_depot_show_list.html
+++ b/erp_web/pages/template/init_depot_show_list.html
@@ -1,11 +1,16 @@
 <table>
+    <tr>
+        <td style="width:130px;height:30px;line-height:30px;padding:8px;float:left;color:#7c7c7c"><b>仓库名称</b></td>
+        <td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;color:#7c7c7c"><b>初始库存</b></td>
+        <td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;color:#7c7c7c"><b>总计库存</b></td>
+    </tr>
     {{#depotList}}
     <tr>
         <td style="width:130px;height:30px;line-height:30px;padding:8px;float:left;" title="{{name}}">
             <p style="width:110px;overflow: hidden;white-space:nowrap;text-overflow: ellipsis;">{{name}}</p>
         </td>
-        <td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;">初始库存：{{stock}}</td>
-        <td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;">总计库存：{{allStock}}</td>
+        <td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;">{{stock}}</td>
+        <td style="width:120px;height:30px;line-height:30px;padding:8px;float:left;">{{allStock}}</td>
     </tr>
     {{/depotList}}
 </table>
\ No newline at end of file