增加税率的百分号和录入的校验

erp_web/js/pages/manage/supplier.js

@@ -76,7 +76,7 @@
                 { title: '预付款',field: 'advancein',width:70,align:"center"},
                 { title: '期初应收',field: 'beginneedget',width:70,align:"center"},
                 { title: '期初应付',field: 'beginneedpay',width:70,align:"center"},
-                { title: '税率', field: 'taxrate',width:50,align:"center"},
+                { title: '税率(%)', field: 'taxrate',width:50,align:"center"},
                 { title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
                     return value? "启用":"禁用";
                 }}

erp_web/js/pages/materials/in_out.js

@@ -1586,13 +1586,16 @@
 	    reject(); //撤销下、刷新商品列表
 		$("#addOrgan").off("click").on("click",function(){
 			$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
+            $('#supplierFM').form('clear');
 		});
 
         $("#addMember").off("click").on("click",function(){
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加会员信息');
+            $('#supplierFM').form('clear');
         });
         $("#addCustomer").off("click").on("click",function(){
             $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加客户信息');
+            $('#supplierFM').form('clear');
         });
 	    url = '/depotHead/addDepotHeadAndDetail';
 
@@ -2628,6 +2631,9 @@
 
 			//保存供应商信息
 			$("#saveSupplier").off("click").on("click",function() {
+                if(validateForm("supplierFM")) {
+                    return;
+                }
 				if(checkSupplierName()){
 					return;
 				}

erp_web/pages/materials/purchase_back_list.html

@@ -344,9 +344,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/purchase_in_list.html

@@ -346,9 +346,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/purchase_orders_list.html

@@ -265,9 +265,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/sale_orders_list.html

@@ -267,9 +267,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>

erp_web/pages/materials/sale_out_list.html

@@ -348,9 +348,9 @@
                 <td style="padding:1px">
                     <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
                 </td>
-                <td>税率</td>
+                <td>税率(%)</td>
                 <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
                 </td>
             </tr>
             <tr>