1

src/main/resources/static/app/storage/controller/qualitycheckAssayCtrl.js

@@ -1269,6 +1269,11 @@ angular.module('app.storage')
                 $scope.qualitycheck.harvestTime = parseInt($scope.qualitycheck.harvestTime);
 
                 $scope.qualitycheck.processState = 2; //化验
+
+                if ($scope.qualitycheck.checker.substring($scope.qualitycheck.checker.length-1) == ",") {
+                	$scope.qualitycheck.checker = $scope.qualitycheck.checker.substring(0, $scope.qualitycheck.checker.length-1);
+                }
+
                 qualitycheckService.save($scope.qualitycheck, $scope.qualitycheckInspection).then(function(datas){
                     if (datas.status == "success") {
                         var dataid = datas.dataid;
@@ -1360,6 +1365,14 @@ angular.module('app.storage')
         	var checkNumber = /^[1-9]\d*$/g;
             return this.optional(element)||(checkNumber.test(value));  
         },"请输入正确的正整数!");
+
+        //自定义校验检验人，多个检验人用'|'隔开
+        $.validator.addMethod("checkJyr",function(value,element, params) {
+        	value = value.replace("，",',');
+        	$scope.qualitycheck.checker = value;
+        	var checkNumber = /^[\u4e00-\u9fa5,\|?]{0,128}$/g;
+            return this.optional(element)||(checkNumber.test(value));  
+        },"请输入汉字,用','号分隔");
         // 新增一行
         $scope.addTR = function(qualitycheckId) {
             $scope.addCheckSon.push({qualitycheckId:qualitycheckId});

src/main/resources/static/app/storage/controller/qualitycheckCtrl.js

@@ -1274,6 +1274,10 @@ angular.module('app.storage')
                 $scope.qualitycheck.storeQuality = angular.copy(storeQualityId);
                 $scope.qualitycheck.harvestTime = parseInt($scope.qualitycheck.harvestTime);
 
+                if ($scope.qualitycheck.checker.substring($scope.qualitycheck.checker.length-1) == ",") {
+                	$scope.qualitycheck.checker = $scope.qualitycheck.checker.substring(0, $scope.qualitycheck.checker.length-1);
+                }
+
                 qualitycheckService.save($scope.qualitycheck, $scope.qualitycheckInspection).then(function(datas){
                     if (datas.status == "success") {
                         var dataid = datas.dataid;
@@ -1364,6 +1368,13 @@ angular.module('app.storage')
         	var checkNumber = /^[1-9]\d*$/g;
             return this.optional(element)||(checkNumber.test(value));  
         },"请输入正确的正整数!");
+        //自定义校验检验人，多个检验人用','隔开
+        $.validator.addMethod("checkJyr",function(value,element, params) {
+        	value = value.replace("，",',');
+        	$scope.qualitycheck.checker = value;
+        	var checkNumber = /^[\u4e00-\u9fa5,\|?]{0,128}$/g;
+            return this.optional(element)||(checkNumber.test(value));  
+        },"请输入汉字,用','号分隔");
 
         // 新增一行
         $scope.addTR = function(qualitycheckId) {

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

@@ -269,7 +269,7 @@
 												<label class="label">检验人：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.checker" name="checker" ng-readonly="isNotEdit"
-														   placeholder="检验人" required>
+														   placeholder="检验人" checkJyr=true required>
 												</label>
 											</section>
 <!--											<section class="col col-3">-->

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

@@ -91,7 +91,7 @@
                         		<td>
 									<!--<a has-permission="475" href-void ng-click="showAddAck(qualitycheck.id,qualitycheck.houseId,qualitycheck.warehouseId)"><i class="fa fa-plus"></i>验收</a>&nbsp;&nbsp;-->
                         			<a  href-void ng-click="showViewFck(qualitycheck.id, 'view')"><i class="fa fa-info-circle"></i>查看</a>&nbsp;&nbsp;
-                        			<a  ng-hide="isArchive" has-permission="737" href-void ng-click="showEditFck(qualitycheck.id, 'update')"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
+                        			<a  ng-hide="isArchive || qualitycheck.historyStatus=='1'" has-permission="737" href-void ng-click="showEditFck(qualitycheck.id, 'update')"><i class="fa fa-edit"></i>修改</a>&nbsp;&nbsp;
 <!--                         			<a  ng-hide="isArchive" has-permission="738" href-void ng-click="remove(qualitycheck)"><i class="fa fa-trash-o"></i>删除</a>
  -->                        		</td>
                         	</tr>

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

@@ -260,7 +260,7 @@
 												<label class="label">检验人：<span style="color: red;">*</span></label>
 												<label class="input">
 													<input type="text" ng-model="qualitycheck.checker" name="checker" ng-readonly="isNotEdit"
-														   placeholder="检验人" required>
+														   placeholder="检验人" checkJyr=true required>
 												</label>
 											</section>
 <!--											<section class="col col-3">-->

src/main/resources/static/app/storage/views/qualitycheck/qualitycheck-outcheck-list.html

@@ -85,7 +85,7 @@
 								<td>{{qualitycheck.checkTime | date:'yyyy-MM-dd'}}</td>
                         		<td>
 									<a href-void ng-click="showViewOut(qualitycheck.id, 'view')"><i class="fa fa-info-circle"></i>查看</a>
-                        			<a ng-hide="isArchive" has-permission="745" href-void ng-click="showEditOut(qualitycheck.id, 'update')"><i class="fa fa-edit"></i>修改</a>
+                        			<a ng-hide="isArchive || qualitycheck.historyStatus=='1'" has-permission="745" href-void ng-click="showEditOut(qualitycheck.id, 'update')"><i class="fa fa-edit"></i>修改</a>
 <!--                         			<a ng-hide="isArchive" has-permission="746" href-void ng-click="remove(qualitycheck)"><i class="fa fa-trash-o"></i>删除</a>
  -->                        		</td>
                         	</tr>