gaodd 2 lat temu
rodzic
commit
95ccb99fd5

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

@@ -139,7 +139,7 @@
139 139
                             <i class="fa fa-fw fa-folder-open"></i>储备粮管理
140 140
                         </a>
141 141
                         <ul>
142
-                            <li has-func="273" data-ui-sref-active="active">
142
+                            <li has-func="0" data-ui-sref-active="active">
143 143
                                 <a data-ui-sref="app.business.grainReservesManage-receiveNotice">接收合同</a>
144 144
                             </li>
145 145
                             <li has-func="273" data-ui-sref-active="active">

+ 27 - 0
src/main/resources/static/app/system/controller/userCtrl.js

@@ -466,6 +466,33 @@ angular.module('app.system').controller("userEditCtrl",
466 466
                 $state.go("app.system.user");
467 467
             }
468 468
         }
469
+        
470
+        //部门名称
471
+        $scope.bmmcBlur=function(){
472
+        	if(null != $scope.user.bmmc || undefined != $scope.user.bmmc){
473
+        		if($scope.user.bmmc.includes('无') || $scope.user.bmmc.includes('暂无') || $scope.user.bmmc.includes('空')){
474
+        			$("#verificationContainer").css("display","block");
475
+        			$("#verificationInput").css("background","#fff0f0");
476
+        		}else{
477
+        			$("#verificationContainer").css("display","none");
478
+        			$("#verificationInput").css("background","");
479
+        		}
480
+        	}else{
481
+        		$("#verificationContainer").css("display","none");
482
+    			$("#verificationInput").css("background","");
483
+        	}
484
+        }
485
+        
486
+        //入职日期
487
+    	 $scope.rzrqChange = function() {
488
+    		 var rzrq = $('#rzrq').val();
489
+    		 if (rzrq != "" && rzrq != null && $rootScope.orgInfo.registDate > rzrq){
490
+         		alert("入职日期要晚于企业注册日期");
491
+         		$('#rzrq').val('');
492
+         	 }
493
+    	}
494
+    	 
495
+        
469 496
     });
470 497
 
471 498
 angular.module('app.system').controller("userLoginCtrl",

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

@@ -64,8 +64,9 @@
64 64
 										<section class="col col-4">
65 65
 											<label class="label">部门名称<span style="color: red;">*</span></label>
66 66
 											<label class="input">
67
-												<input type="text" ng-model="user.bmmc" name="bmmc" maxlength="100" required />
67
+												<input id="verificationInput"  type="text" ng-model="user.bmmc" name="bmmc" maxlength="100" required ng-blur="bmmcBlur()"/>
68 68
 											</label>
69
+											<div style="color:#D56161;display:none;font-size:11px" id="verificationContainer">不能填写“无”、“暂无”、“空”</div>
69 70
 										</section>
70 71
 										<section class="col col-4">
71 72
 											<label class="label">身份证号码<span style="color: red;">*</span></label>
@@ -76,7 +77,8 @@
76 77
 										<section class="col col-4">
77 78
 											<label class="label">入职日期<span style="color: red;">*</span></label>
78 79
 											<label class="input">
79
-												<input type="text" ng-model="user.rzrq" name="rzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" required />
80
+												<input type="text" ng-model="user.rzrq" name="rzrq" id="rzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" 
81
+												 required ng-blur="rzrqChange()" />
80 82
 											</label>
81 83
 										</section>
82 84
 									</div>
@@ -144,7 +146,8 @@
144 146
 										<section class="col col-4">
145 147
 											<label class="label">离职日期</label>
146 148
 											<label class="input">
147
-												<input type="text" ng-model="user.lzrq" name="lzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" />
149
+												<input type="text" ng-model="user.lzrq" name="lzrq" class="form-control"  
150
+												onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'rzrq\')}'})"/>
148 151
 											</label>
149 152
 										</section>
150 153
 										<section class="col col-4">