.

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

@@ -76,10 +76,48 @@ angular.module('app.business').controller("customerSaveCtrl", function($scope, $
         return this.optional(element)||(checkNumber.test(value));  
     },"请输入正确的数字类型，最多两位小数！");
     
+    $scope.checkRepeat = function () {
+    	var khlx = $scope.customer.classify;
+        var zjh;
+        var checkNumber;
+        var flag = false;
+        if (null != khlx && khlx == "3152") {
+        	//个人客户的身份证号
+        	zjh = $scope.customer.identification;
+        	checkNumber = /(^\d{18}$)|(^\d{17}(\d|X)$)/g;
+        	flag = checkNumber.test(zjh);
+        }else if (null != khlx && khlx == "3153") {
+        	//企业客户的统一信用代码
+        	zjh = $scope.customer.socialCreditCode;
+        	checkNumber = /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/g; 
+        	flag = checkNumber.test(zjh);
+        } else {
+        	alert("请先选择客户类型！");
+        	return false;
+        }
+    	if (flag) {
+    		var param = {
+    	    		orgId : $rootScope.orgInfo.orgId, 
+    	    		zjh : zjh,
+    				customerId : $scope.customer.id,
+    				customerType : khlx
+    	        };
+    		$.get(APP_CONFIG.keeperHouseUrl + '/depot/business/customer/checkRepeat', param, function(data){
+            	if (data == "false") {
+            		alert("请输入正确的身份证号码,且不能重复！");
+            		return false;
+            	}
+            });
+    	} else {
+    		alert("请输入正确的身份证号码,且不能重复！");
+    		return false;
+    	}
+    }
+    
     $.validator.addMethod("validLength",function(value,element, params) {
     	var checkNumber = /(^\d{18}$)|(^\d{17}(\d|X)$)/g;
-    	return this.optional(element)||(checkNumber.test(value));  
-    },"请输入正确的身份证号码！");
+    	return this.optional(element)||(checkNumber.test(value));
+    },"请输入正确的身份证号码,且不能重复！");
     
     $.validator.addMethod("qyLength",function(value,element, params) {
     	//var checkNumber = /^\w{18}$/g; 
@@ -113,51 +151,7 @@ angular.module('app.business').controller("customerSaveCtrl", function($scope, $
     	var checkNumber = /^[0-9]{1,30}$/g;
     	return this.optional(element)||(checkNumber.test(value));
     },"请输入正确的开户账号！");
-    
-    // 自定义验证，验证用身份证或统一信用代码是否重复
-    $.validator.addMethod("zjh", function(value, element) {
-        var result = false;
-        // 设置同步
-        $.ajaxSetup({
-            async: false
-        });
-        
-        var khlx = $scope.customer.classify;
-        var zjh;
-        if (null != khlx && khlx == "3152") {
-        	//个人客户的身份证号
-        	zjh = $scope.customer.identification;
-        }else if (null != khlx && khlx == "3153") {
-        	//企业客户的统一信用代码
-        	zjh = $scope.customer.socialCreditCode;
-        } else {
-        	alert("请先选择客户类型！");
-        	return result;
-        }
-        
-        var param = {
-    		orgId : $rootScope.orgInfo.orgId, 
-    		zjh : zjh,
-			customerId : $scope.customer.id,
-			customerType : khlx
-        };
-        $.get(APP_CONFIG.keeperHouseUrl + '/depot/business/customer/checkRepeat', param, function(data){
-        	if (data == "true") {
-        		result = true;
-        	}
-        });
-        // 恢复异步
-        $.ajaxSetup({
-            async: true
-        });
-        return result;
-    }, "身份证号或统一信用代码重复，请重新输入");
-    
-    
-    // 返回.
-   /* $scope.retList = function () {
-    	$state.go('app.business.customer.list');
-    }*/
+
     // 返回.
     $scope.retList = function () {
         if ($rootScope.previousState_name != '') {

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

@@ -69,7 +69,7 @@
                                             <label class="label">身份证号<span style="color: red;">*</span></label> 
                                             <label class="input"> 
                                                 <input class="form-control" type="text" ng-model="customer.identification" ng-readonly="isNotEdit" name="identification"
-                                                validLength=true zjh=true required>
+                                                ng-blur="checkRepeat()" required>
                                             </label>
                                         </section>
                                         <section class="col col-4">
@@ -266,7 +266,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 maxlength="18">
+                                                ng-blur="checkRepeat()" required maxlength="18">
                                             </label>
                                         </section>
                                         <section class="col col-4">

src/main/resources/static/app/storage/grainCard/views/foodSituationList.html

@@ -82,8 +82,8 @@
 									  <tbody>
 										<tr ng-repeat="gainCard in pageInfo.list">
 											<td class="text-center">{{ $index+1 }}</td>
-											<td class="text-center">{{ gainCard.storehouseName }}</td>
-											<td class="text-center">{{ gainCard.warehouseName }}</td>
+											<td class="text-center">{{ storehouseObj[gainCard.storehouseId].storehouseName }}</td>
+											<td class="text-center">{{ warehouseObj[gainCard.warehouseId].warehouseName }}</td>
 											<td class="text-center">{{ gainCard.grainVarietyName }}</td>
 <!--											<td class="text-center">{{ gainCard.rksl | number : 3}}</td>-->
 											<td class="text-center">{{ gainCard.acceptDate | date:'yyyy-MM-dd'}}</td>

src/main/resources/static/app/system/views/user-edit.html

@@ -151,7 +151,7 @@
 											<label class="label">固定电话</label> 
 											<label class="input">
 												<i class="icon-prepend fa fa-phone"></i>
-												<input type="tel" ng-model="user.telphone" maxlength="30" validZjh=true />
+												<input type="tel" ng-model="user.telphone" name="telphone" maxlength="30" validZjh=true />
 											</label>
 										</section>
 										<section class="col col-4">
@@ -185,14 +185,14 @@
 											<label class="label">QQ号码</label> 
 											<label class="input"> 
 												<i class="icon-prepend fa fa-qq"></i> 
-												<input type="text" ng-model="user.qqNumber" minlength="4" maxlength="12">
+												<input type="text" ng-model="user.qqNumber" name="qqNumber" minlength="4" maxlength="12">
 											</label>
 										</section>
 										<section class="col col-4">
 											<label class="label">地址</label> 
 											<label class="input"> 
 												<i class="icon-prepend fa fa-map-marker"></i> 
-												<input type="text" ng-model="user.address" maxlength="30" />
+												<input type="text" ng-model="user.address" name="address" maxlength="100" />
 											</label>
 										</section>
 										<section class="col col-4">
@@ -303,7 +303,12 @@
 												<input type="text" ng-model="user.qdzgzchzyzgsj" name="qdzgzchzyzgsj" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" />
 											</label>
 										</section>
-										<section class="col col-4"></section>
+										<section class="col col-4">
+											<label class="label">专业</label>
+											<label class="input">
+												<input type="text" ng-model="user.zy" name="zy" maxlength="30" />
+											</label>
+										</section>
 									</div>
 								</fieldset>