天津改造计划——用户基本信息改造

src/main/resources/static/app/basic/keeper/controller/keeperCtrl.js

@@ -223,8 +223,12 @@ angular.module('app.basic')
             $scope.keeper.name = data.realName; //姓名
             $scope.keeper.userAlias = data.userAlias; //别名
             $scope.keeper.sex = data.sex;  //性别
+			$scope.keeper.idCard = data.sfzhm; //身份证号码
             $scope.keeper.phone = data.mobile; //电话
+			$scope.keeper.employeeNature = data.rylb; //职员类别
+			$scope.keeper.entryTime = data.rzrq; //入职日期
             $scope.keeper.email = data.email;  //邮箱
+			$scope.keeper.political = data.zzmm; //政治面貌
             $scope.keeper.avatorUrl = data.imgUrl; //头像
         },function(data){
             console.log(data);

src/main/resources/static/app/system/controller/userCtrl.js

@@ -95,13 +95,13 @@ angular.module('app.system').controller("userCtrl",
     });
 
 angular.module('app.system').controller("userEditCtrl",
-    function($scope, $rootScope, $state, $stateParams, userService, userRoleService, orgService, roleService, FileUploader, APP_CONFIG) {
+    function($scope, $rootScope, $state, $stateParams, $filter, userService, userRoleService, orgService, roleService, FileUploader, APP_CONFIG) {
 		
 		if($stateParams.userId == null || $stateParams.userId == ""){//新增的时候默认为库主任
 			$scope.user = {status:"1"};
 		}else{
 			$("#userPwd").hide();//修改时隐藏密码框
-		}	
+		}
 
         $rootScope.userRoleIds=[];
         $rootScope.crkRoleIds=[];
@@ -145,6 +145,16 @@ angular.module('app.system').controller("userEditCtrl",
                 if($stateParams.userId == null || $stateParams.userId == ""){
                 	$scope.user.password = md5($scope.user.password);
                 }
+                $("input[name='rzrq']").each(function(j,item){
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                        $scope.user.rzrq = $filter('date')(item.value, "yyyy-MM-dd");
+                    }
+                });
+                $("input[name='lzrq']").each(function(j,item){
+                    if(item.value != '' && item.value != null && typeof item.value != 'undefined'){
+                        $scope.user.lzrq = $filter('date')(item.value, "yyyy-MM-dd");
+                    }
+                });
                 userService.saveUser($scope.user,$scope.userRoleIds,$scope.crkRoleIds).then(function(data) {
                     alert("保存成功！");
                     // 跳转到列表页

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

@@ -62,16 +62,61 @@
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label">性别</label> 
+											<label class="label">部门名称<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" ng-model="user.bmmc" name="bmmc" maxlength="100" required />
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">身份证号码<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" ng-model="user.sfzhm" name="sfzhm" maxlength="18" required />
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">入职日期<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" ng-model="user.rzrq" name="rzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" required />
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-4">
+											<label class="label">性别<span style="color: red;">*</span></label>
 											<label class="select"> 
-												<select ng-model="user.sex" ng-options="enum.enumid as enum.enumname for enum in dicDataList[5287]"
-													class="form-control">
+												<select ng-model="user.sex" name="sex" ng-options="enum.enumid as enum.enumname for enum in dicDataList[5287]"
+													class="form-control" required>
 														<option value="">--请选择--</option>
 												</select>
 												<i></i>
 											</label>
 										</section>
 										<section class="col col-4">
+											<label class="label">岗位性质<span style="color: red;">*</span></label>
+											<label class="select">
+												<select ng-model="user.gwxz" name="gwxz" class="form-control" required>
+													<option value="">--请选择--</option>
+													<option value="11">在岗职工(长期)</option>
+													<option value="12">在岗职工(临时)</option>
+													<option value="20">其它从业人员</option>
+												</select>
+												<i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">在岗状态<span style="color: red;">*</span></label>
+											<label class="select">
+												<select ng-model="user.zgzt" name="zgzt" class="form-control" required>
+													<option value="">--请选择--</option>
+													<option value="01">在岗</option>
+													<option value="02">已离职</option>
+												</select>
+												<i></i>
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-4">
 										   <label class="label">所属组织<span style="color: red;">*</span></label> 
 										    <multi-select-tree  data-input-model="data2" data-default-label="请选择"
 														multi-select="false" data-output-model="user.orgId" 
@@ -85,29 +130,35 @@
 													multi-select="true" data-output-model="userRole.roleIds"
 													data-callback="selectOnly1Or2(item, selectedItems)">
 											 </multi-select-tree>
-										</section> 
+										</section>
+										<section class="col col-4">
+											<label class="label">出入库角色（可多选）</label>
+											<multi-select-tree data-input-model="crkData4" data-default-label="请选择"
+															   select-only-leafs="true"
+															   multi-select="true" data-output-model="crkRole.crkRoleIds"
+															   data-callback="selectOnly1Or2(item, selectedItems)">
+											</multi-select-tree>
+										</section>
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label">出入库角色（可多选）</label> 
-											 <multi-select-tree data-input-model="crkData4" data-default-label="请选择"
-                                                    select-only-leafs="true"
-													multi-select="true" data-output-model="crkRole.crkRoleIds"
-													data-callback="selectOnly1Or2(item, selectedItems)">
-											 </multi-select-tree>
+											<label class="label">离职日期<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" ng-model="user.lzrq" name="lzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" required />
+											</label>
 										</section>
 										<section class="col col-4">
 											<label class="label">固定电话</label> 
-											<label class="input"> 
+											<label class="input">
 												<i class="icon-prepend fa fa-phone"></i>
 												<input type="tel" ng-model="user.telphone" maxlength="30">
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">手机号</label> 
+											<label class="label">手机号<span style="color: red;">*</span></label>
 											<label class="input"> 
 												<i class="icon-prepend fa fa-mobile-phone"></i>
-												<input type="text" ng-model="user.mobile" name="mobile" maxlength="20">
+												<input type="text" ng-model="user.mobile" name="mobile" maxlength="20" required />
 											</label>
 										</section>
 									</div>
@@ -145,10 +196,68 @@
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">电子邮箱</label> 
+											<label class="label">电子邮箱<span style="color: red;">*</span></label>
 											<label class="input"> 
 												<i class="icon-prepend fa fa-envelope-o"></i> 
-												<input type="email" ng-model="user.email" maxlength="60">
+												<input type="email" ng-model="user.email" name="email" maxlength="60" required />
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-4">
+											<label class="label">名族<span style="color: red;">*</span></label>
+											<label class="select">
+												<select ng-model="user.mz" name="mz" ng-options="enum.enumid as enum.enumname for enum in dicDataList[7176]"
+														class="form-control" required>
+													<option value="">--请选择--</option>
+												</select>
+												<i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">政治面貌<span style="color: red;">*</span></label>
+											<label class="select">
+												<select ng-model="user.zzmm" name="zzmm" ng-options="enum.enumid as enum.enumname for enum in dicDataList[1043]"
+														class="form-control" required>
+													<option value="">--请选择--</option>
+												</select>
+												<i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">人员类别<span style="color: red;">*</span></label>
+											<label class="select">
+												<select ng-model="user.rylb" name="rylb" ng-options="enum.enumid as enum.enumname for enum in dicDataList[6888]"
+														class="form-control" required>
+													<option value="">--请选择--</option>
+												</select>
+												<i></i>
+											</label>
+										</section>
+									</div>
+									<div class="row">
+										<section class="col col-4">
+											<label class="label">学历<span style="color: red;">*</span></label>
+											<label class="select">
+												<select ng-model="user.xl" name="xl" ng-options="enum.enumid as enum.enumname for enum in dicDataList[5294]"
+														class="form-control" required>
+													<option value="">--请选择--</option>
+												</select>
+												<i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">职务<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" ng-model="user.zw" name="zw" maxlength="30" required />
+												<i></i>
+											</label>
+										</section>
+										<section class="col col-4">
+											<label class="label">职称<span style="color: red;">*</span></label>
+											<label class="input">
+												<input type="text" ng-model="user.zc" name="zc" maxlength="30" required />
+												<i></i>
 											</label>
 										</section>
 									</div>
@@ -177,12 +286,13 @@
 											<label class="label">人员类型</label> 
 											<label class="select"> 
 												<select ng-model="user.status" class="form-control">
-														<option value="1">库级领导</option>
-														<option value="2">经营人员</option>
-														<option value="3">仓储人员</option>
-														<option value="4">质检人员</option>
-														<option value="5">保卫人员</option>
-														<option value="6">中转人员</option>
+													<option value="">--请选择--</option>
+													<option value="1">库级领导</option>
+													<option value="2">经营人员</option>
+													<option value="3">仓储人员</option>
+													<option value="4">质检人员</option>
+													<option value="5">保卫人员</option>
+													<option value="6">中转人员</option>
 												</select>
 												<i></i>
 											</label>