升级easyUI到1.9.4版本

erp_web/pages/materials/allocation_out_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,16 +58,16 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:70px;">单据编号：</td>
+                <td style="width:70px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width:150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width:150px;" readonly/>
                 </td>
                 <td style="width:80px;"></td>
                 <td style="padding:5px;width:170px;"></td>
@@ -83,7 +83,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/assemble_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,16 +58,16 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:70px;">单据编号：</td>
+                <td style="width:70px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width:150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width:150px;" readonly/>
                 </td>
                 <td style="width:80px;"></td>
                 <td style="padding:5px;width:170px;"></td>
@@ -83,7 +83,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/bill_detail.html

@@ -6,19 +6,19 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/bill_detail.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/common/common.js"></script>
     <script src="/js/pages/materials/bill_detail.js"></script>
 
 </head>
 <body>
-<div id="bill" class="easyui-panel" style="padding:10px;height:500px;" title="单据明细" iconCls="icon-list"
+<div id="bill" class="easyui-panel" style="padding:10px;height:550px;" title="单据明细" iconCls="icon-list"
      collapsible="true" closable="false">
     <!--零售出库-->
     <div class="retail_out" style="width:1100px;padding:10px 20px;top:50px"

erp_web/pages/materials/disassemble_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -26,21 +26,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -57,16 +57,16 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:70px;">单据编号：</td>
+                <td style="width:70px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width:150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width:150px;" readonly/>
                 </td>
                 <td style="width:80px;"></td>
                 <td style="padding:5px;width:170px;"></td>
@@ -82,7 +82,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/material.html

@@ -7,12 +7,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/material.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script type="text/javascript" src="/js/common/outlook_in.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
@@ -25,20 +25,20 @@
         <tr>
             <td>类别：</td>
             <td>
-                <input name="searchParentName" id="searchParentName" style="width: 100px;" readonly="readonly"/>
+                <input name="searchParentName" id="searchParentName" class="easyui-textbox" style="width: 100px;" readonly="readonly"/>
                 <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" style="height: 25px;" id="lookForSelectMaterialCategory">
-                    <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
+                    <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px"></span></span></a>
                 <input name="searchParentId" id="searchParentId" type="hidden"/>
             </td>
             <td>&nbsp;</td>
             <td>品名：</td>
             <td>
-                <input name="searchName" id="searchName" style="width:80px;"/>
+                <input name="searchName" id="searchName" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>&nbsp;</td>
             <td>型号：</td>
             <td>
-                <input name="searchModel" id="searchModel" style="width:80px;"/>
+                <input name="searchModel" id="searchModel" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -55,7 +55,7 @@
     <table id="materialTableData" style="top:50px;border-bottom-color:#FFFFFF"></table>
 </div>
 
-<div id="materialDlg" class="easyui-dialog" style="width:860px;height:420px;padding:10px 20px"
+<div id="materialDlg" class="easyui-dialog" style="width:860px;height:440px;padding:10px 20px"
      closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
     <form id="materialFM" method="post" novalidate>
         <div id="tt" class="easyui-tabs" style="width:800px;height:320px;">
@@ -64,24 +64,24 @@
                     <tr>
                         <td style="width:60px; height:30px;">品名</td>
                         <td style="padding:5px;width:180px;">
-                            <input name="Name" id="Name" class="easyui-validatebox"
+                            <input name="Name" id="Name" class="easyui-textbox"
                                    data-options="required:true,validType:'length[2,30]'"
-                                   style="width: 180px;height: 20px"/>
+                                   style="width: 180px;"/>
                         </td>
                         <td style="width:80px;">型号</td>
                         <td style="padding:5px;width:180px;">
-                            <input name="Model" id="Model" class="easyui-validatebox"
+                            <input name="Model" id="Model" class="easyui-textbox"
                                    data-options="required:true,validType:'length[1,30]'"
-                                   style="width: 180px;height: 20px"/>
+                                   style="width: 180px;"/>
                         </td>
                         <td style="width:200px;"></td>
                     </tr>
                     <tr>
                         <td style="height:30px;">类别</td>
                         <td style="padding:5px" colspan="3">
-                            <input name="parentName" id="parentName"   style="width: 180px;height: 20px" readonly="readonly"/>
+                            <input name="parentName" id="parentName" class="easyui-textbox" style="width: 180px;" readonly="readonly"/>
                             <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForMaterialCategory">
-                                <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
+                                <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
                             <input name="parentid" id="parentid" type="hidden"/>
                         </td>
                         <td></td>
@@ -89,7 +89,8 @@
                     <tr>
                         <td style="width:80px;">序列号</td>
                         <td style="padding:5px;width:180px;">
-                            <select name="EnableSerialNumber" id="EnableSerialNumber" style="width: 180px;height: 20px">
+                            <select name="EnableSerialNumber" id="EnableSerialNumber"
+                                style="width:180px;height: 30px;border: 1px solid #95B8E7;border-radius:5px;">
                                 <option value="1">有</option>
                                 <option value="0">无</option>
                             </select>
@@ -99,7 +100,7 @@
                     <tr>
                         <td style="height:30px;">备注</td>
                         <td style="padding:5px" colspan="3">
-                            <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                            <textarea name="Remark" id="Remark" class="easyui-textbox" data-options="multiline:true" placeholder="暂无备注信息"
                                       style="width: 468px; height:40px;"></textarea>
                         </td>
                         <td></td>
@@ -111,28 +112,28 @@
                     <tr>
                         <td style="height:30px;">安全存量</td>
                         <td style="padding:5px">
-                            <input name="SafetyStock" id="SafetyStock" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 180px;height: 20px"/>
+                            <input name="SafetyStock" id="SafetyStock" class="easyui-textbox"
+                                   data-options="validType:'length[1,30]'" style="width: 180px;"/>
                         </td>
                         <td>单位</td>
                         <td style="padding:5px">
-                            <input name="Unit" id="Unit" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 180px;height: 20px; "/>
+                            <input name="Unit" id="Unit"
+                                   data-options="validType:'length[1,30]'" style="width: 180px;height: 30px;border: 1px solid #95B8E7;border-radius:5px;"/>
                             <select name="manyUnit" id="manyUnit"
-                                    style="width:180px;height: 20px;display: none"></select>
+                                    style="width:180px;display: none;height: 30px;border: 1px solid #95B8E7;border-radius:5px;"></select>
                         </td>
-                        <td>
+                        <td style="text-align: left;">
                             <input id="manyUnitCheck" type="checkbox"/>多单位
                         </td>
                     </tr>
                     <tr class="first-select-unit">
                         <td style="height:30px;">首选销售单位</td>
                         <td style="padding:5px">
-                            <select name="FirstOutUnit" id="FirstOutUnit" style="width:180px;height: 20px"></select>
+                            <select name="FirstOutUnit" id="FirstOutUnit" style="width:180px; height: 30px;border: 1px solid #95B8E7;border-radius:5px;"></select>
                         </td>
                         <td>首选采购单位</td>
                         <td style="padding:5px">
-                            <select name="FirstInUnit" id="FirstInUnit" style="width:180px;height: 20px"></select>
+                            <select name="FirstInUnit" id="FirstInUnit" style="width:180px; height: 30px;border: 1px solid #95B8E7;border-radius:5px;"></select>
                         </td>
                         <td></td>
                     </tr>
@@ -149,45 +150,45 @@
                                 </tr>
                                 <tr>
                                     <td>基本单位</td>
-                                    <td style="border: 1px solid #aaa;"><span id="basicUnit"></span></td>
-                                    <td><input id="basicRetailPrice"/></td>
-                                    <td><input id="basicLowPrice"/></td>
-                                    <td><input id="basicPresetPriceOne"/></td>
-                                    <td><input id="basicPresetPriceTwo"/></td>
+                                    <td style="border: 1px solid #95B8E7;border-radius:5px;"><span id="basicUnit"></span></td>
+                                    <td><input id="basicRetailPrice" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
+                                    <td><input id="basicLowPrice" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
+                                    <td><input id="basicPresetPriceOne" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
+                                    <td><input id="basicPresetPriceTwo" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
                                 </tr>
                                 <tr>
                                     <td>副单位</td>
-                                    <td style="border: 1px solid #aaa;"><span id="otherUnit"></span></td>
-                                    <td><input id="otherRetailPrice"/></td>
-                                    <td><input id="otherLowPrice"/></td>
-                                    <td><input id="otherPresetPriceOne"/></td>
-                                    <td><input id="otherPresetPriceTwo"/></td>
+                                    <td style="border: 1px solid #95B8E7;border-radius:5px;"><span id="otherUnit"></span></td>
+                                    <td><input id="otherRetailPrice" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
+                                    <td><input id="otherLowPrice" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
+                                    <td><input id="otherPresetPriceOne" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
+                                    <td><input id="otherPresetPriceTwo" style="height:30px;border: 1px solid #95B8E7;border-radius:5px;"/></td>
                                 </tr>
                             </table>
                         </td>
                     </tr>
                     <tr class="price-one">
                         <td style="height:30px;">零售价</td>
-                        <td style="padding:5px"><input name="RetailPrice" id="RetailPrice" class="easyui-validatebox"
+                        <td style="padding:5px"><input name="RetailPrice" id="RetailPrice" class="easyui-textbox"
                                                        data-options="validType:'length[1,30]'"
-                                                       style="width: 180px;height: 20px"/></td>
+                                                       style="width: 180px;"/></td>
                         <td>最低售价</td>
-                        <td style="padding:5px"><input name="LowPrice" id="LowPrice" class="easyui-validatebox"
+                        <td style="padding:5px"><input name="LowPrice" id="LowPrice" class="easyui-textbox"
                                                        data-options="validType:'length[1,30]'"
-                                                       style="width: 180px;height: 20px"/></td>
+                                                       style="width: 180px;"/></td>
                         <td></td>
                     </tr>
                     <tr class="price-two">
                         <td style="height:30px;">预计采购价</td>
                         <td style="padding:5px"><input name="PresetPriceOne" id="PresetPriceOne"
-                                                       class="easyui-validatebox"
+                                                       class="easyui-textbox"
                                                        data-options="validType:'length[1,30]'"
-                                                       style="width: 180px;height: 20px"/></td>
+                                                       style="width: 180px;"/></td>
                         <td>销售价</td>
                         <td style="padding:5px"><input name="PresetPriceTwo" id="PresetPriceTwo"
-                                                       class="easyui-validatebox"
+                                                       class="easyui-textbox"
                                                        data-options="validType:'length[1,30]'"
-                                                       style="width: 180px;height: 20px"/></td>
+                                                       style="width: 180px;"/></td>
                         <td></td>
                     </tr>
                 </table>
@@ -197,43 +198,44 @@
                     <tr class="tr-color">
                         <td style="width:60px; height:30px;">颜色</td>
                         <td style="padding:5px">
-                            <input name="Color" id="Color" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 250px;height: 20px"/>
+                            <input name="Color" id="Color"
+                                   data-options="validType:'length[1,30]'" style="width: 250px;border: 1px solid #95B8E7;border-radius:5px;height: 30px"/>
                         </td>
                     </tr>
                     <tr class="tr-standard">
                         <td>规格</td>
                         <td style="padding:5px">
-                            <input name="Standard" id="Standard" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 250px;height: 20px"/>
+                            <input name="Standard" id="Standard"
+                                   data-options="validType:'length[1,30]'" style="width: 250px;border: 1px solid #95B8E7;border-radius:5px;height: 30px"/>
                         </td>
                     </tr>
                     <tr class="tr-mfrs">
                         <td>制造商</td>
                         <td style="padding:5px">
-                            <input name="Mfrs" id="Mfrs" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 250px;height: 20px"/>
+                            <input name="Mfrs" id="Mfrs"
+                                   data-options="validType:'length[1,30]'" style="width: 250px;border: 1px solid #95B8E7;border-radius:5px;height: 30px"/>
                         </td>
                     </tr>
                     <tr class="tr-otherField1">
                         <td>自定义1</td>
                         <td style="padding:5px">
-                            <input name="OtherField1" id="OtherField1" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 250px;height: 20px"/>
+                            <input name="OtherField1" id="OtherField1"
+                                   data-options="validType:'length[1,30]'" style="width: 250px;border: 1px solid #95B8E7;border-radius:5px;height: 30px"/>
                         </td>
                     </tr>
                     <tr class="tr-otherField2">
                         <td>自定义2</td>
                         <td style="padding:5px">
-                            <input name="OtherField2" id="OtherField2" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 250px;height: 20px"/>
+                            <input name="OtherField2" id="OtherField2"
+                                   data-options="validType:'length[1,30]'" style="width: 250px;border: 1px solid #95B8E7;border-radius:5px;height: 30px"/>
                         </td>
                     </tr>
                     <tr class="tr-otherField3">
                         <td>自定义3</td>
                         <td style="padding:5px">
-                            <input name="OtherField3" id="OtherField3" class="easyui-validatebox"
-                                   data-options="validType:'length[1,30]'" style="width: 250px;height: 20px"/>
+                            <input name="OtherField3" id="OtherField3"
+                                   data-options="validType:'length[1,30]'"
+                                   style="width: 250px;border: 1px solid #95B8E7;border-radius:5px;height: 30px"/>
                         </td>
                     </tr>
                 </table>
@@ -518,12 +520,12 @@
                     {
                         title: '操作', field: 'op', align: "center", width: 60, formatter: function (value, rec, index) {
                             var str = '';
-                            str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
-                            str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
+                            str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
+                            str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
                             return str;
                         }
                     },
-                    {title: '品名', field: 'name', width: 100},
+                    {title: '品名', field: 'name', width: 120},
                     {title: '型号', field: 'model', width: 80},
                     {title: '类别', field: 'categoryName', width: 80},
                     {title: '扩展信息', field: 'materialOther', width: 150},
@@ -764,7 +766,7 @@
         }
 
         function findStockList(mId) {
-            $('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
+            $('#materialDetailListDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;查看出入库明细');
             $(".window-mask").css({width: webW, height: webH});
             initMaterialDetailData(mId);
             getMaterialInOutList(mId, 1, initPageSize);
@@ -1109,7 +1111,7 @@
             bindMProperty(); //根据商品属性绑定
             // $("#EnableSerialNumber").combobox('setValue','0');
             $("#EnableSerialNumber").val('0');
-            $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
+            $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
             $(".window-mask").css({width: webW, height: webH});
             $("#Name").val("").focus();
             $("#manyUnitCheck").prop("checked", false);
@@ -1300,18 +1302,17 @@
         function editMaterial(index) {
             var rowsdata = $("#tableData").datagrid("getRows")[index];
             bindMProperty(); //根据商品属性绑定
-            $("#Name").focus().val(rowsdata.name);
-            $("#Color").focus().val(rowsdata.color);
+            $("#Name").focus().textbox("setValue", rowsdata.name);
             $("#EnableSerialNumber").val(rowsdata.enableserialnumber=='1'?'1':'0');
             //商品类别id
             $("#parentid").val(rowsdata.categoryid);
             //商品类别名称
-            $("#parentName").val(rowsdata.categoryName);
+            $("#parentName").textbox("setValue", rowsdata.categoryName);
             mId = rowsdata.categoryid;
             mName = rowsdata.categoryName;
-            $("#Packing").focus().val(rowsdata.packing);
-            $("#SafetyStock").focus().val(rowsdata.safetystock);
-            $("#Model").val(rowsdata.model);
+            $("#Packing").textbox("setValue", rowsdata.packing);
+            $("#SafetyStock").textbox("setValue", rowsdata.safetystock);
+            $("#Model").textbox("setValue", rowsdata.model);
             $("#Standard").val(rowsdata.standard);
             $("#Color").val(rowsdata.color);
             $("#Mfrs").val(rowsdata.mfrs);
@@ -1319,11 +1320,11 @@
             $("#OtherField2").val(rowsdata.otherfield2);
             $("#OtherField3").val(rowsdata.otherfield3);
             $("#Unit").val(rowsdata.unit);
-            $("#RetailPrice").val(rowsdata.retailprice);
-            $("#LowPrice").val(rowsdata.lowprice);
-            $("#PresetPriceOne").val(rowsdata.presetpriceone);
-            $("#PresetPriceTwo").val(rowsdata.presetpricetwo);
-            $("#Remark").val(rowsdata.remark);
+            $("#RetailPrice").textbox("setValue", rowsdata.retailprice);
+            $("#LowPrice").textbox("setValue", rowsdata.lowprice);
+            $("#PresetPriceOne").textbox("setValue", rowsdata.presetpriceone);
+            $("#PresetPriceTwo").textbox("setValue", rowsdata.presetpricetwo);
+            $("#Remark").textbox("setValue", rowsdata.remark);
             $("#manyUnit").val(rowsdata.unitid);
             if (rowsdata.unitid) {
                 $("#manyUnitCheck").prop("checked", true);
@@ -1401,7 +1402,7 @@
             oldOtherField3 = rowsdata.otherfield3;
             oldUnit = rowsdata.unit;
             oldManyUnit = rowsdata.unitid;
-            $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
+            $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑商品信息');
             $(".window-mask").css({width: webW, height: webH});
             materialID = rowsdata.id;
             //焦点在名称输入框==定焦在输入文字后面
@@ -1424,7 +1425,7 @@
                         json.depotList = res.data;
                         $.ajax({
                             type: "get",
-                            url: "../../../pages/template/init_depot_list.html?616",
+                            url: "../../../pages/template/init_depot_list.html?61",
                             async: false,
                             success: function (tem) {
                                 if (tem) {
@@ -1490,10 +1491,10 @@
         //重置按钮
         $("#searchResetBtn").unbind().bind({
             click: function () {
-                $("#searchParentName").val("");
+                $("#searchParentName").textbox("clear");
                 $("#searchParentId").val("");
-                $("#searchName").val("");
-                $("#searchModel").val("");
+                $("#searchName").textbox("clear");
+                $("#searchModel").textbox("clear");
                 types = ""; //清空类别
                 //加载完以后重新初始化
                 $("#searchBtn").click();

erp_web/pages/materials/materialProperty.html

@@ -7,11 +7,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
 </head>
 <body>
@@ -21,7 +21,7 @@
         <tr>
             <td>名称：</td>
             <td>
-                <input name="searchNativeName" id="searchNativeName" style="width:120px;"/>
+                <input name="searchNativeName" id="searchNativeName" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -52,15 +52,15 @@
             <tr>
                 <td>排序</td>
                 <td style="padding:5px">
-                    <input name="sort" id="sort" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
+                    <input name="sort" id="sort" class="easyui-textbox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/>
                 </td>
             </tr>
             <tr>
                 <td>别名</td>
                 <td style="padding:5px">
-                    <input name="anotherName" id="anotherName" class="easyui-validatebox"
-                           data-options="validType:'length[2,30]'" style="width: 230px;height: 20px"/>
+                    <input name="anotherName" id="anotherName" class="easyui-textbox"
+                           data-options="validType:'length[2,30]'" style="width: 230px;"/>
                 </td>
             </tr>
         </table>
@@ -124,10 +124,9 @@
                 {title: '排序', field: 'sort', width: 100},
                 {title: '别名', field: 'anothername', width: 100},
                 {
-                    title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec) {
+                    title: '操作', field: 'op', align: "center", width: 80, formatter: function (value, rec, index) {
                         var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.nativename + 'AaBb' + rec.enabled + 'AaBb' + rec.sort + 'AaBb' + rec.anothername;
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterialProperty(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editMaterialProperty(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                        str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterialProperty(\'' + index + '\');"/>&nbsp;<a onclick="editMaterialProperty(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
                         return str;
                     }
                 }
@@ -211,19 +210,16 @@
     });
 
     //编辑信息
-    function editMaterialProperty(totalInfo) {
-        var materialPropertyInfo = totalInfo.split("AaBb");
-
-        $("#nativeName").text(materialPropertyInfo[1]);
-        $("#enabled").attr("checked", materialPropertyInfo[2] == 'true' ? true : false);
-        $("#sort").val(materialPropertyInfo[3]);
-        $("#anotherName").val(materialPropertyInfo[4]);
-
-        $('#materialPropertyDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑商品属性');
+    function editMaterialProperty(index) {
+        var rowsdata = $("#tableData").datagrid("getRows")[index];
+        $("#nativeName").text(rowsdata.nativename);
+        $("#enabled").attr("checked", rowsdata.enabled == true ? true : false);
+        $("#sort").textbox("setValue", rowsdata.sort);
+        $("#anotherName").textbox("setValue", rowsdata.anothername);
+        $('#materialPropertyDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑商品属性');
         $(".window-mask").css({width: webW, height: webH});
         //焦点在名称输入框==定焦在输入文字后面
-        $("#nativeName").val("").focus().val(materialPropertyInfo[1]);
-        url = '/materialProperty/update?id=' + materialPropertyInfo[0];
+        url = '/materialProperty/update?id=' + rowsdata.id;
     }
 
     //搜索处理
@@ -270,7 +266,7 @@
 
     //重置按钮
     $("#searchResetBtn").off().on("click", function () {
-        $("#searchNativeName").val("");
+        $("#searchNativeName").textbox("clear");
         //加载完以后重新初始化
         $("#searchBtn").click();
     });

erp_web/pages/materials/material_forselect.html

@@ -7,12 +7,12 @@
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/material.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/js/common/outlook_in.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
 </head>
@@ -103,10 +103,10 @@
                     if(selectType=="lookForSelectMaterial"){
                         //单个添加序列号时选择
                         $("#materialId").val(rowData.id);
-                        $("#materialName").val(rowData.name);
+                        $("#materialName").textbox("setValue",rowData.name);
                     }else if(selectType=="batLookForSelectMaterial"){
                         //批量添加序列号时选择
-                        $("#batAddMaterialName").val(rowData.name);
+                        $("#batAddMaterialName").textbox("setValue",rowData.name);
 
                     }
                     //关闭掉dialog

erp_web/pages/materials/materialcategory.html

@@ -10,11 +10,11 @@
     <meta http-equiv="Expires" content="-1">
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
 </head>
 <body>
@@ -31,36 +31,36 @@
             <tr>
                 <td>上级目录</td>
                 <td style="padding:5px">
-                    <input name="parentName" id="parentName"   style="width: 200px;height: 20px" readonly="readonly"/>
+                    <input name="parentName" id="parentName" class="easyui-textbox" style="width: 200px;" readonly="readonly"/>
                     <a href="javascript:void(0)" class="l-btn l-btn-plain" group="" id="lookForSelectMaterialCategory">
-                        <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left"></span></span></a>
+                        <span class="l-btn-left"><span class="l-btn-text icon-search l-btn-icon-left" style="height: 20px;"></span></span></a>
                     <input name="parentid" id="parentid" type="hidden"/>
                 </td>
             </tr>
             <tr>
                 <td>名称</td>
                 <td style="padding:5px">
-                    <input name="Name" id="Name" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;height: 20px"/>
+                    <input name="Name" id="Name" class="easyui-textbox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 200px;"/>
                     <input name="id" id="id" type="hidden"/>
                 </td>
             </tr>
             <tr>
                 <td>编号</td>
                 <td style="padding:5px">
-                    <input name="serialNo" id="serialNo"  style="width: 200px;height: 20px"/>
+                    <input name="serialNo" id="serialNo" class="easyui-textbox" style="width: 200px;"/>
                 </td>
             </tr>
             <tr>
                 <td>序号</td>
                 <td style="padding:5px">
-                    <input name="sort" id="sort"  style="width: 200px;height: 20px"/>
+                    <input name="sort" id="sort" class="easyui-textbox" style="width: 200px;"/>
                 </td>
             </tr>
             <tr>
                 <td>备注</td>
                 <td style="padding:5px">
-                    <textarea name="remark" id="remark" placeholder="暂无备注信息"
+                    <textarea name="remark" id="remark" class="easyui-textbox" data-options="multiline:true" placeholder="暂无备注信息"
                               style="width: 200px; height:40px;"></textarea>
                 </td>
             </tr>
@@ -121,15 +121,8 @@
 
     function addMaterialCategory() {
         $('#materialCategoryFM').form('clear');
-        $('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品类别信息');
+        $('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加商品类别信息');
         $(".window-mask").css({width: webW, height: webH});
-        $("#Name").val("").focus();
-        $("#parentName").val("");
-        $("#parentid").val("");
-        $("#serialNo").val("");
-        $("#sort").val("");
-        $("#remark").val("");
-        $("#id").val("");
         url = '/materialCategory/addMaterialCategory';
     }
     function editMaterialCategory(node) {
@@ -148,14 +141,14 @@
                         return;
                     }
                     $('#materialCategoryFM').form('clear');
-                    $('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;修改商品类别信息');
+                    $('#materialCategoryDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;修改商品类别信息');
                     $(".window-mask").css({width: webW, height: webH});
-                    $("#Name").val(res.data.name).focus();
-                    $("#parentName").val(res.data.parentName);
+                    $("#Name").textbox("setValue", res.data.name).focus();
+                    $("#parentName").textbox("setValue", res.data.parentName);
                     $("#parentid").val(res.data.parentId);
-                    $("#serialNo").val(res.data.serialNo);
-                    $("#sort").val(res.data.sort);
-                    $("#remark").val(res.data.remark);
+                    $("#serialNo").textbox("setValue", res.data.serialNo);
+                    $("#sort").textbox("setValue", res.data.sort);
+                    $("#remark").textbox("setValue", res.data.remark);
                     $("#id").val(res.data.id);
                     url = '/materialCategory/editMaterialCategory';
                 }

erp_web/pages/materials/materialcategory_forselect.html

@@ -7,11 +7,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
 </head>
 <body>
@@ -48,17 +48,17 @@
             console.log(node);
             if(clickType) {
                 if(clickType == "selectBtn") {
-                    $("#searchParentName").val(node.text);
+                    $("#searchParentName").textbox("setValue", node.text);
                     $("#searchParentId").val(node.id);
                     types = "";
                     initMCData(node.id);
                 } else if(clickType == "editBtn") {
-                    $("#parentName").val(node.text);
+                    $("#parentName").textbox("setValue", node.text);
                     $("#parentid").val(node.id);
                 }
             }
              else {
-                $("#parentName").val(node.text);
+                $("#parentName").textbox("setValue", node.text);
                 $("#parentid").val(node.id);
             }
             $('#forSelectMaterialCategoryDlg').dialog('close');

erp_web/pages/materials/other_in_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,26 +58,26 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">供应商：</td>
+                <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
                     <div class="add-org-btn">
-                        <img id="addOrgan" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addOrgan" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加供应商" title="增加供应商"/>
                     </div>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px">
@@ -92,7 +92,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/other_out_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,20 +58,20 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">客户：</td>
+                <td style="width:70px;">客户</td>
                 <td style="padding:5px;width:170px;">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px">
@@ -86,7 +86,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/person.html

@@ -7,11 +7,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
     <script type="text/javascript" src="/js/jquery-1.8.0.min.js"></script>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
-    <script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script type="text/javascript" src="/js/easyui/jquery.easyui.min.js"></script>
+    <script type="text/javascript" src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script type="text/javascript" src="/js/common/common.js"></script>
 </head>
 <body>
@@ -21,11 +21,13 @@
         <tr>
             <td>姓名：</td>
             <td>
-                <input name="searchName" id="searchName" style="width:70px;"/>
+                <input name="searchName" id="searchName" class="easyui-textbox" style="width:100px;"/>
             </td>
+            <td>&nbsp;</td>
             <td>类型：</td>
             <td>
-                <select name="searchType" id="searchType" style="width:70px;">
+                <select name="searchType" id="searchType" class="easyui-combobox"
+                        data-options="panelHeight:'auto'" style="width:100px;">
                     <option value="">全部</option>
                     <option value="业务员">业务员</option>
                     <option value="仓管员">仓管员</option>
@@ -33,8 +35,6 @@
                 </select>
             </td>
             <td>&nbsp;</td>
-            <td>&nbsp;</td>
-            <td>&nbsp;</td>
             <td>
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;&nbsp;
                 <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
@@ -51,15 +51,15 @@
             <tr>
                 <td>姓名</td>
                 <td style="padding:5px">
-                    <input name="Name" id="Name" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;height: 20px"/>
+                    <input name="Name" id="Name" class="easyui-textbox"
+                           data-options="required:true,validType:'length[2,30]'" style="width: 230px;"/>
                 </td>
             </tr>
             <tr>
                 <td>类型</td>
                 <td style="padding:5px">
-                    <select name="Type" id="Type" style="width:230px;">
-                        <option value="">请选择</option>
+                    <select name="Type" id="Type" class="easyui-combobox"
+                        data-options="panelHeight:'auto'" style="width:230px;">
                         <option value="业务员">业务员</option>
                         <option value="仓管员">仓管员</option>
                         <option value="财务员">财务员</option>
@@ -121,11 +121,10 @@
                 {title: '姓名', field: 'name', width: 180},
                 {title: '类型', field: 'type', width: 180},
                 {
-                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec) {
+                    title: '操作', field: 'op', align: "center", width: 130, formatter: function (value, rec, index) {
                         var str = '';
-                        var rowInfo = rec.id + 'AaBb' + rec.name + 'AaBb' + rec.type;
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + rowInfo + '\');"/>&nbsp;<a onclick="editPerson(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
-                        str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deletePerson(' + rec.id + ');"/>&nbsp;<a onclick="deletePerson(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
+                        str += '<img src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editPerson(\'' + index + '\');"/>&nbsp;<a onclick="editPerson(\'' + index + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a>&nbsp;&nbsp;';
+                        str += '<img src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deletePerson(' + rec.id + ');"/>&nbsp;<a onclick="deletePerson(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a>&nbsp;&nbsp;';
                         return str;
                     }
                 }
@@ -138,7 +137,7 @@
                     handler: function () {
                         addPerson();
                     }
-                },
+                },'-',
                 {
                     id: 'deletePerson',
                     text: '删除',
@@ -333,7 +332,7 @@
             return;
         }
         $('#personFM').form('clear');
-        $('#personDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加经手人信息');
+        $('#personDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/edit_add.png"/>&nbsp;增加经手人信息');
         $(".window-mask").css({width: webW, height: webH});
         $("#name").val("").focus();
 
@@ -373,19 +372,14 @@
     });
 
     //编辑信息
-    function editPerson(personTotalInfo) {
-        var personInfo = personTotalInfo.split("AaBb");
-
-        $("#Name").val(personInfo[1]);
-        $("#Type").val(personInfo[2]);
-
-        //oldPerson = personInfo[1];
-        $('#personDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/>&nbsp;编辑经手人信息');
+    function editPerson(index) {
+        var rowsdata = $("#tableData").datagrid("getRows")[index];
+        $("#Name").textbox("setValue", rowsdata.name);
+        $("#Type").combobox("setValue", rowsdata.type);
+        $('#personDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑经手人信息');
         $(".window-mask").css({width: webW, height: webH});
-        personID = personInfo[0];
-        //焦点在名称输入框==定焦在输入文字后面
-        $("#Name").val("").focus().val(personInfo[1]);
-        url = '/person/update?id=' + personInfo[0];
+        personID = rowsdata.id;
+        url = '/person/update?id=' + rowsdata.id;
     }
 
     //搜索处理

erp_web/pages/materials/purchase_back_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,20 +58,20 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">供应商：</td>
+                <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px">
@@ -86,45 +86,45 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
-                <td>优惠率：</td>
+                <td>优惠率</td>
                 <td style="padding:5px">
-                    <input id="Discount" name="Discount" style="width:110px;"/>
+                    <input id="Discount" name="Discount" class="radius-ui" style="width:110px;"/>
                     %
                 </td>
-                <td>退款优惠：</td>
+                <td>退款优惠</td>
                 <td style="padding:5px">
-                    <input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/>
+                    <input id="DiscountMoney" name="DiscountMoney" class="radius-ui" style="width:120px;"/>
                 </td>
-                <td>优惠后金额：</td>
+                <td>优惠后金额</td>
                 <td style="padding:5px">
-                    <input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/>
+                    <input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>本次退款：</td>
+                <td>本次退款</td>
                 <td style="padding:5px">
-                    <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/>
+                    <input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
             <tr>
-                <td>结算账户：</td>
+                <td>结算账户</td>
                 <td style="padding:5px">
-                    <select name="AccountId" id="AccountId" style="width:110px;"></select>
-                    <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
+                    <select name="AccountId" id="AccountId" class="radius-ui" style="width:110px;"></select>
+                    <img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
                          style="display: none;"/>
                 </td>
-                <td>本次欠款：</td>
+                <td>本次欠款</td>
                 <td style="padding:5px">
-                    <input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/>
+                    <input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>采购费用：</td>
+                <td>采购费用</td>
                 <td style="padding:5px">
-                    <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
-                    <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
+                    <input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
+                    <img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
                 </td>
                 <td></td>
                 <td style="padding:5px">

erp_web/pages/materials/purchase_in_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,30 +58,30 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">供应商：</td>
+                <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
                     <div class="add-org-btn">
-                        <img id="addOrgan" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addOrgan" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加供应商" title="增加供应商"/>
                     </div>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
-                <td style="width:70px;">关联订单：</td>
+                <td style="width:70px;">关联订单</td>
                 <td style="padding:5px">
-                    <input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
+                    <input name="LinkNumber" id="LinkNumber" class="easyui-validatebox radius-ui" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
@@ -98,48 +98,48 @@
                 </td>
             </tr>
             <tr>
-                <td>优惠率：</td>
+                <td>优惠率</td>
                 <td style="padding:5px">
-                    <input id="Discount" name="Discount" style="width:110px;"/>
+                    <input id="Discount" name="Discount" class="radius-ui" style="width:110px;"/>
                     %
                 </td>
-                <td>付款优惠：</td>
+                <td>付款优惠</td>
                 <td style="padding:5px">
-                    <input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/>
+                    <input id="DiscountMoney" name="DiscountMoney" class="radius-ui" style="width:120px;"/>
                 </td>
-                <td>优惠后金额：</td>
+                <td>优惠后金额</td>
                 <td style="padding:5px">
-                    <input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/>
+                    <input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>本次付款：</td>
+                <td>本次付款</td>
                 <td style="padding:5px">
-                    <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/>
+                    <input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
             <tr>
-                <td>结算账户：</td>
+                <td>结算账户</td>
                 <td style="padding:5px">
                     <div class="account-list">
-                        <select name="AccountId" id="AccountId" style="width:110px;"></select>
+                        <select name="AccountId" id="AccountId" class="radius-ui" style="width:110px;"></select>
                     </div>
                     <div class="add-account-btn">
-                        <img id="addAccount" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addAccount" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加结算账户" title="增加结算账户"/>
                     </div>
-                    <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
+                    <img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
                          style="display: none;"/>
                 </td>
-                <td>本次欠款：</td>
+                <td>本次欠款</td>
                 <td style="padding:5px">
-                    <input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/>
+                    <input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>采购费用：</td>
+                <td>采购费用</td>
                 <td style="padding:5px">
                     <div class="other-money-list">
-                        <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
+                        <input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
                     </div>
-                    <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
+                    <img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
                 </td>
                 <td></td>
                 <td style="padding:5px">

erp_web/pages/materials/purchase_orders_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,26 +58,26 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">供应商：</td>
+                <td style="width:70px;">供应商</td>
                 <td style="padding:5px;width:170px;">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
                     <div class="add-org-btn">
-                        <img id="addOrgan" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addOrgan" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加供应商" title="增加供应商"/>
                     </div>
                 </td>
-                <td style="width:70px;">单据日期：</td>
-                <td style="padding:5px">
+                <td style="width:70px;">单据日期</td>
+                <td style="padding:5px;width:170px;">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px">
@@ -92,7 +92,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/retail_back_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,20 +58,20 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;height:50px;">会员卡号：</td>
+                <td style="width:70px;height:50px;">会员卡号</td>
                 <td style="padding:5px;width:200px;">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width: 140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px;width:150px;"></td>
@@ -112,10 +112,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>付款账户：</td>
+                            <td>付款账户</td>
                             <td>
-                                <select name="AccountId" id="AccountId" style="width:110px;"></select>
-                                <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
+                                <select name="AccountId" id="AccountId" class="radius-ui" style="width:110px;"></select>
+                                <img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
                                      style="display: none;"/>
                             </td>
                         </tr>
@@ -124,7 +124,7 @@
             </tr>
             <tr>
                 <td colspan="8">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>
@@ -141,7 +141,7 @@
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
-            <td style="width:60px;height:50px;">会员卡号：</td>
+            <td style="width:70px;height:50px;">会员卡号：</td>
             <td style="padding:5px;width:200px;">
                 <span id="OrganIdShow"></span>
             </td>
@@ -153,7 +153,7 @@
             <td style="padding:5px;width:200px;">
                 <span id="NumberShow"></span>
             </td>
-            <td style="width:70px;"></td>
+            <td style="width:80px;"></td>
             <td style="padding:5px;width:150px;">
             </td>
         </tr>

erp_web/pages/materials/retail_out_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,30 +58,30 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;height:50px;">会员卡号：</td>
+                <td style="width:70px;height:50px;">会员卡号</td>
                 <td style="padding:5px;width:200px;">
                     <div class="org-list">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
                 <div class="add-org-btn">
-                    <img id="addMember" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                    <img id="addMember" src="/js/easyui/themes/icons/edit_add.png"
                          style="cursor: pointer;" alt="增加会员" title="增加会员"/>
                 </div>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width: 140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
-                <td style="width:70px;">付款类型：</td>
+                <td style="width:70px;">付款类型</td>
                 <td style="padding:5px;width:150px;">
-                    <select name="payType" id="payType" style="width:145px;">
+                    <select name="payType" id="payType" class="radius-ui" style="width:145px;">
                         <option value="现付">现付</option>
                     </select>
                 </td>
@@ -122,10 +122,10 @@
                             </td>
                         </tr>
                         <tr>
-                            <td>收款账户：</td>
+                            <td>收款账户</td>
                             <td>
-                                <select name="AccountId" id="AccountId" style="width:110px;"></select>
-                                <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
+                                <select name="AccountId" id="AccountId" class="radius-ui" style="width:110px;"></select>
+                                <img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
                                      style="display: none;"/>
                             </td>
                         </tr>
@@ -134,7 +134,7 @@
             </tr>
             <tr>
                 <td colspan="8">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>
@@ -151,7 +151,7 @@
      closed="true" buttons="#dlg-buttons-show" modal="true" cache="false" collapsible="false" closable="true">
     <table>
         <tr>
-            <td style="width:60px;height:50px;">会员卡号：</td>
+            <td style="width:70px;height:50px;">会员卡号：</td>
             <td style="padding:5px;width:200px;">
                 <span id="OrganIdShow"></span>
             </td>
@@ -163,7 +163,7 @@
             <td style="padding:5px;width:200px;">
                 <span id="NumberShow"></span>
             </td>
-            <td style="width:70px;">付款类型：</td>
+            <td style="width:80px;">付款类型：</td>
             <td style="padding:5px;width:150px;">
                 <span id="payTypeShow"></span>
             </td>

erp_web/pages/materials/sale_back_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,20 +58,20 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td>客户：</td>
+                <td>客户</td>
                 <td style="padding:5px">
                     <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
-                <td>单据日期：</td>
+                <td>单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td>单据编号：</td>
+                <td>单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:70px;"></td>
                 <td style="padding:5px"></td>
@@ -85,49 +85,49 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
-                <td>优惠率：</td>
+                <td>优惠率</td>
                 <td style="padding:5px">
-                    <input id="Discount" name="Discount" style="width:110px;"/>
+                    <input id="Discount" name="Discount" class="radius-ui" style="width:110px;"/>
                     %
                 </td>
-                <td>退款优惠：</td>
+                <td>退款优惠</td>
                 <td style="padding:5px">
-                    <input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/>
+                    <input id="DiscountMoney" name="DiscountMoney" class="radius-ui" style="width:120px;"/>
                 </td>
-                <td>优惠后金额：</td>
+                <td>优惠后金额</td>
                 <td style="padding:5px">
-                    <input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/>
+                    <input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>本次退款：</td>
+                <td>本次退款</td>
                 <td style="padding:5px">
-                    <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/>
+                    <input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
             <tr>
-                <td>结算账户：</td>
+                <td>结算账户</td>
                 <td style="padding:5px">
-                    <select name="AccountId" id="AccountId" style="width:120px;"></select>
-                    <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
+                    <select name="AccountId" id="AccountId" class="radius-ui" style="width:120px;"></select>
+                    <img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
                          style="display: none;"/>
                 </td>
-                <td>本次欠款：</td>
+                <td>本次欠款</td>
                 <td style="padding:5px">
-                    <input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/>
+                    <input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>销售费用：</td>
+                <td>销售费用</td>
                 <td style="padding:5px">
-                    <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
-                    <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
+                    <input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
+                    <img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
                 </td>
-                <td>销售人员：</td>
+                <td>销售人员</td>
                 <td style="padding:5px">
-                    <input id="Salesman" name="Salesman" style="width:130px;"/>
+                    <input id="Salesman" name="Salesman" class="radius-ui" style="width:130px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>

erp_web/pages/materials/sale_orders_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,30 +58,30 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">客户：</td>
+                <td style="width:70px;">客户</td>
                 <td style="padding:5px">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
                     <div class="add-org-btn">
-                        <img id="addCustomer" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addCustomer" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加客戶" title="增加客戶"/>
                     </div>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
-                <td style="width:70px;">销售人员：</td>
+                <td style="width:70px;">销售人员</td>
                 <td style="padding:5px">
-                    <input id="Salesman" name="Salesman" style="width:130px;"/>
+                    <input id="Salesman" name="Salesman" class="radius-ui" style="width:130px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
@@ -93,7 +93,7 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>

erp_web/pages/materials/sale_out_list.html

@@ -6,13 +6,13 @@
     <!-- 指定以IE8的方式来渲染 -->
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
     <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
-    <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/default/easyui.css"/>
+    <link rel="stylesheet" type="text/css" href="/js/easyui/themes/icon.css"/>
     <link type="text/css" rel="stylesheet" href="/css/common.css"/>
     <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
     <script src="/js/jquery-1.8.0.min.js"></script>
-    <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
-    <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/easyui/jquery.easyui.min.js"></script>
+    <script src="/js/easyui/locale/easyui-lang-zh_CN.js"></script>
     <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
@@ -27,21 +27,21 @@
         <tr>
             <td>单据编号：</td>
             <td>
-                <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
+                <input type="text" name="searchNumber" id="searchNumber" class="easyui-textbox" style="width:100px;"/>
             </td>
             <td>商品信息：</td>
             <td>
-                <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
+                <input type="text" name="searchMaterial" id="searchMaterial" class="easyui-textbox" placeholder="名称，型号" style="width:100px;"/>
             </td>
             <td>单据日期：</td>
             <td>
                 <input type="text" name="searchBeginTime" id="searchBeginTime"
-                       onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>-</td>
             <td>
-                <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
-                       class="txt Wdate" style="width:100px;"/>
+                <input type="text" name="searchEndTime" id="searchEndTime"
+                       class="easyui-datebox" style="width:120px;"/>
             </td>
             <td>&nbsp;</td>
             <td>
@@ -58,30 +58,30 @@
     <form id="depotHeadFM" method="post" novalidate>
         <table>
             <tr>
-                <td style="width:70px;">客户：</td>
+                <td style="width:70px;">客户</td>
                 <td style="padding:5px">
                     <div class="org-list">
                         <input id="OrganId" name="OrganId" style="width:130px;"/>
                     </div>
                     <div class="add-org-btn">
-                        <img id="addCustomer" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addCustomer" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加客戶" title="增加客戶"/>
                     </div>
                 </td>
-                <td style="width:70px;">单据日期：</td>
+                <td style="width:70px;">单据日期</td>
                 <td style="padding:5px">
                     <input type="text" name="OperTime" id="OperTime"
-                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
+                           onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate radius-ui"
                            style="width:140px;" readonly/>
                 </td>
-                <td style="width:80px;">单据编号：</td>
+                <td style="width:80px;">单据编号</td>
                 <td style="padding:5px">
-                    <input name="Number" id="Number" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
+                    <input name="Number" id="Number" class="easyui-validatebox radius-ui"
+                           data-options="validType:'length[2,30]'" style="width: 150px;" readonly/>
                 </td>
-                <td style="width:70px;">关联订单：</td>
+                <td style="width:70px;">关联订单</td>
                 <td style="padding:5px">
-                    <input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
+                    <input name="LinkNumber" id="LinkNumber" class="easyui-validatebox radius-ui" style="width: 150px;" readonly/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
@@ -93,55 +93,55 @@
             </tr>
             <tr>
                 <td colspan="9">
-                    <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
+                    <textarea name="Remark" id="Remark" rows="2" cols="2" class="radius-ui" placeholder="暂无备注信息"
                               style="width: 1130px; height:35px;"></textarea>
                 </td>
             </tr>
             <tr>
-                <td>优惠率：</td>
+                <td>优惠率</td>
                 <td style="padding:5px">
-                    <input id="Discount" name="Discount" style="width:110px;"/>
+                    <input id="Discount" name="Discount" class="radius-ui" style="width:110px;"/>
                     %
                 </td>
-                <td>收款优惠：</td>
+                <td>收款优惠</td>
                 <td style="padding:5px">
-                    <input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/>
+                    <input id="DiscountMoney" name="DiscountMoney" class="radius-ui" style="width:120px;"/>
                 </td>
-                <td>优惠后金额：</td>
+                <td>优惠后金额</td>
                 <td style="padding:5px">
-                    <input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/>
+                    <input id="DiscountLastMoney" name="DiscountLastMoney" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>本次收款：</td>
+                <td>本次收款</td>
                 <td style="padding:5px">
-                    <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/>
+                    <input id="ChangeAmount" name="ChangeAmount" class="radius-ui" data-changeamount="0" style="width:120px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>
             <tr>
-                <td>结算账户：</td>
+                <td>结算账户</td>
                 <td style="padding:5px">
                     <div class="account-list">
-                        <select name="AccountId" id="AccountId" style="width:110px;"></select>
+                        <select name="AccountId" id="AccountId" class="radius-ui" style="width:110px;"></select>
                     </div>
                     <div class="add-account-btn">
-                        <img id="addAccount" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
+                        <img id="addAccount" src="/js/easyui/themes/icons/edit_add.png"
                              style="cursor: pointer;" alt="增加结算账户" title="增加结算账户"/>
                     </div>
-                    <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
+                    <img class="many-account-ico" src="/js/easyui/themes/icons/filelist.jpg"
                          style="display: none;"/>
                 </td>
-                <td>本次欠款：</td>
+                <td>本次欠款</td>
                 <td style="padding:5px">
-                    <input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/>
+                    <input id="Debt" name="Debt" class="radius-ui" readonly="readonly" style="width:120px;"/>
                 </td>
-                <td>销售费用：</td>
+                <td>销售费用</td>
                 <td style="padding:5px">
-                    <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
-                    <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
+                    <input id="OtherMoney" name="OtherMoney" class="radius-ui" style="width:120px;" readonly="readonly"/>
+                    <img class="other-money-ico" src="/js/easyui/themes/icons/filelist.jpg"/>
                 </td>
-                <td>销售人员：</td>
+                <td>销售人员</td>
                 <td style="padding:5px">
-                    <input id="Salesman" name="Salesman" style="width:130px;"/>
+                    <input id="Salesman" name="Salesman" class="radius-ui" style="width:130px;"/>
                 </td>
                 <td style="width:100px;"></td>
             </tr>