客户管理编辑功能加了开户账号和统一信用代码的校验

src/main/resources/static/app/business/customer/controller/customerSaveCtrl.js

@@ -105,6 +105,16 @@ angular.module('app.business').controller("customerSaveCtrl", function($scope, $
     	var checkNumber = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/g;
     	return this.optional(element)||(checkNumber.test(value));  
     },"请输入正确的邮箱！");
+
+    $.validator.addMethod("khzhBlurs",function(value,element, params) {
+    	var checkNumber = /^[0-9]{1,30}$/g;
+    	return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的开户账号！");
+
+    $.validator.addMethod("khzhBlur",function(value,element, params) {
+    	var checkNumber = /^[0-9]{1,30}$/g;
+    	return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的开户账号！");
     
     
     // 返回.

src/main/resources/static/app/business/customer/views/customer-edit.html

@@ -124,7 +124,7 @@
                                             <label class="label">开户账号<span style="color: red;">*</span></label> 
                                             <label class="input"> 
                                                 <input id="verificationInputKhzh" class="form-control" type="text" ng-model="customer.accountNumber" ng-readonly="isNotEdit" name="accountNumber" 
-                                                required style="display:inline-blok;border:1px soild #A90329" ng-blur="khzhBlurs()" maxlength="30">
+                                                required style="display:inline-blok;border:1px soild #A90329" khzhBlurs=true maxlength="30">
                                             </label>
                                             <div style="color:#D56161;display:none;font-size:11px" id="verificationContainerKhzh">不能填写“无”、“暂无”、“空”</div>
                                         </section>
@@ -216,7 +216,7 @@
                                             <label class="label">统一社会信用代码<span style="color: red;">*</span></label> 
                                             <label class="input"> 
                                                 <input class="form-control" type="text" ng-model="customer.socialCreditCode" ng-readonly="isNotEdit" name="socialCreditCode"
-                                                qyLength=true required>
+                                                qyLength=true required maxlength="18">
                                             </label>
                                         </section>
                                         <section class="col col-4">
@@ -296,7 +296,7 @@
                                             <label class="label">开户账号<span style="color: red;">*</span></label> 
                                             <label class="input"> 
                                                 <input id="verificationInput" class="form-control" type="text" ng-model="customer.accountNumber" ng-readonly="isNotEdit" name="accountNumber" 
-                                                required style="display:inline-blok;border:1px soild #A90329" ng-blur="khzhBlur()" maxlength="30">
+                                                required style="display:inline-blok;border:1px soild #A90329" khzhBlur=true maxlength="30">
                                             </label>
                                             <div style="color:#D56161;display:none;font-size:11px" id="verificationContainer">不能填写“无”、“暂无”、“空”</div>
                                         </section>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -1005,8 +1005,7 @@
                     <!-- 验收管理结束 -->
                     <li data-menu-collapse>
                         <a has-func="67" href="#">
-                            <i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            数量管理
+                            <i class="fa fa-lg fa-fw fa-folder-open"></i>原粮数量管理
                         </a>
                         <ul>
                             <!--                             <li has-func="121" data-ui-sref-active="active"> -->
@@ -1901,7 +1900,7 @@
                     <li data-menu-collapse>
                         <a has-func="67" href="#">
                             <i class="fa fa-lg fa-fw fa-folder-open"></i>
-                            数量管理
+                            原粮数量管理
                         </a>
                         <ul>
                             <li has-func="122" data-ui-sref-active="active">

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-firstcheck-edit.html

@@ -380,7 +380,7 @@
 
 									</fieldset>
 
-									<!--品种切换开始--><!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166，大豆原油7052-->
+									<!--品种切换开始--><!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166，压榨成品油7052，浸出成品油7050，原油7052-->
 									<div ng-if="qualitycheck.subType==3164">
 										<header>质量指标</header>
 										<fieldset>
@@ -1069,7 +1069,7 @@
 										</fieldset>
 									</div>
 
-									<div ng-if="qualitycheck.subType==7052 && qualitycheck.subMold == 1">
+									<div ng-if="(qualitycheck.subType==7052 || qualitycheck.subType==7050 || qualitycheck.subType==7144) && qualitycheck.subMold == 1">
 										<header>质量指标</header>
 										<fieldset>
 											<div class="col-xs-15 col-sm-15">
@@ -1137,7 +1137,7 @@
 
 									<!-- 成品大豆油7052，大米7107，小麦粉7051 -->
 
-									<div ng-if="qualitycheck.subType==7052 && qualitycheck.subMold == 2">
+									<div ng-if="(qualitycheck.subType==7052 || qualitycheck.subType==7050 || qualitycheck.subType==7144) && qualitycheck.subMold == 2">
 										<header>质量指标</header>
 										<fieldset>
 											<div class="col-xs-15 col-sm-15">
@@ -1790,7 +1790,7 @@
 			</tr>
 		</table>
 
-		<!--品种切换开始--><!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166，大豆原油7052-->
+		<!--品种切换开始--><!--小麦及混合小麦3164，玉米3165，大豆2777，稻谷3166，压榨成品油7052，浸出成品油7050，原油7052-->
 		<header style="padding: 8px 0;border-bottom: 1px dashed rgba(0,0,0,.2);font-size: 16px;color: #232323;margin: 0px 0px 8px;">质量指标</header>
 		<div ng-if="qualitycheck.subType==3164">
 			<div class="col-xs-15 col-sm-15">
@@ -2297,7 +2297,7 @@
 			</div>
 		</div>
 
-		<div ng-if="qualitycheck.subType==7052 && qualitycheck.subMold == 1">
+		<div ng-if="(qualitycheck.subType==7052 || qualitycheck.subType==7050 || qualitycheck.subType==7144) && qualitycheck.subMold == 1">
 			<div class="col-xs-15 col-sm-15">
 				<table class="table table-striped  table-bordered table-hover" bordercolor="#999999"
 					style="border-style:solid;border-collapse:collapse;" border="1" width="100%">
@@ -2350,7 +2350,7 @@
 		</div>
 
 		<!-- 成品大豆油7052，大米7107，小麦粉7051 -->
-		<div ng-if="qualitycheck.subType==7052 && qualitycheck.subMold == 2">
+		<div ng-if="(qualitycheck.subType==7052 || qualitycheck.subType==7050 || qualitycheck.subType==7144) && qualitycheck.subMold == 2">
 			<div class="col-xs-15 col-sm-15">
 				<table class="table table-striped  table-bordered table-hover" bordercolor="#999999"
 					style="border-style:solid;border-collapse:collapse;" border="1" width="100%">