Merge remote-tracking branch 'origin/master'

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllForm.jsp

@@ -89,14 +89,14 @@
 					if(radioVal == 1){
 						$(".invoicetype").show();
 						$("#bank").attr("class","form-control judgment layui-input");
-						$("#bankNumber").attr("class","form-control number judgment layui-input");
+						$("#bankNumber").attr("class","form-control judgment layui-input");
 						$("#orUnicode").attr("class","form-control isUscCode judgment layui-input");
 						$("#address").attr("class","form-control judgment layui-input");
 						$("#telephone").attr("class","form-control isTel judgment layui-input");
 					}else if(radioVal == 2){
 						$(".invoicetype").hide();
 						$("#bank").attr("class","form-control layui-input");
-						$("#bankNumber").attr("class","form-control number layui-input");
+						$("#bankNumber").attr("class","form-control layui-input");
 						$("#orUnicode").attr("class","form-control isUscCode layui-input");
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
@@ -832,7 +832,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  onkeyup="this.value=this.value.replace(/[^\d-]/g,'')" class="form-control layui-input"/>
 					</div>
 				</div>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceAllTwoForm.jsp

@@ -89,14 +89,14 @@
 					if(radioVal == 1){
 						$(".invoicetype").show();
 						$("#bank").attr("class","form-control judgment layui-input");
-						$("#bankNumber").attr("class","form-control number judgment layui-input");
+						$("#bankNumber").attr("class","form-control judgment layui-input");
 						$("#orUnicode").attr("class","form-control isUscCode judgment layui-input");
 						$("#address").attr("class","form-control judgment layui-input");
 						$("#telephone").attr("class","form-control isTel judgment layui-input");
 					}else if(radioVal == 2){
 						$(".invoicetype").hide();
 						$("#bank").attr("class","form-control layui-input");
-						$("#bankNumber").attr("class","form-control number layui-input");
+						$("#bankNumber").attr("class","form-control layui-input");
 						$("#orUnicode").attr("class","form-control isUscCode layui-input");
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
@@ -801,7 +801,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号" onkeyup="this.value=this.value.replace(/[^\d-]/g,'')" class="form-control layui-input"/>
 					</div>
 				</div>
 

src/main/webapp/webpage/modules/workinvoice/workInvoiceTwoForm.jsp

@@ -90,14 +90,14 @@
 					if(radioVal == 1){
 						$(".invoicetype").show();
 						$("#bank").attr("class","form-control judgment layui-input");
-						$("#bankNumber").attr("class","form-control number judgment layui-input");
+						$("#bankNumber").attr("class","form-control judgment layui-input");
 						$("#orUnicode").attr("class","form-control isUscCode judgment layui-input");
 						$("#address").attr("class","form-control judgment layui-input");
 						$("#telephone").attr("class","form-control isTel judgment layui-input");
 					}else if(radioVal == 2){
 						$(".invoicetype").hide();
 						$("#bank").attr("class","form-control layui-input");
-						$("#bankNumber").attr("class","form-control number layui-input");
+						$("#bankNumber").attr("class","form-control layui-input");
 						$("#orUnicode").attr("class","form-control isUscCode layui-input");
 						$("#address").attr("class","form-control layui-input");
 						$("#telephone").attr("class","form-control isTel layui-input");
@@ -835,7 +835,7 @@
 				<div class="layui-item layui-col-sm6">
 					<label class="layui-form-label"><span class="require-item invoicetype">*</span>银行账号：</label>
 					<div class="layui-input-block">
-						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号"  class="form-control number layui-input"/>
+						<form:input id="bankNumber" path="bankNumber" htmlEscape="false" placeholder="请输入银行账号" onkeyup="this.value=this.value.replace(/[^\d-]/g,'')"  class="form-control layui-input"/>
 					</div>
 				</div>