用户需求修改

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

@@ -1,8 +1,7 @@
 "use strict";
 
-angular.module('app.system').controller("userCtrl",
-    function($scope, $state, $stateParams, $rootScope, userService, orgService,roleService, APP_CONFIG) {
-
+angular.module('app.system').controller("userCtrl", function($scope, $state, $stateParams, $rootScope, userService, $uibModal) {
+        console.log("MD5", md5("1qaz@WSX"))
 	    // 替换字符串首尾%
 	    $scope.replaceStr = function(str) {
 	    	var firstStr = str.substring(0);
@@ -44,6 +43,29 @@ angular.module('app.system').controller("userCtrl",
             });
         }
 
+        // 获取当前保管员所在粮库的所有仓房和当前保管员的权限
+        $scope.selected = []; //仓房数组
+        //$scope.orgId = ""; //当前保管员的单位
+        $scope.bgyId = ""; //当前保管员的ID
+        $scope.getUnitStoreList = function(id) {
+            var modalInstance = $uibModal.open({
+                size:'md',
+                templateUrl: 'app/system/views/userHousePower-edit.html',
+                controller: 'userHousePowerCtrl',
+                resolve: {
+                    id : id,
+                    orgId : $rootScope.orgInfo.orgId
+                }
+            });
+            modalInstance.result.then(function (result) {
+                $scope.selected = []; //仓房数组
+                $scope.orgId = ""; //当前保管员的单位
+                $scope.bgyId = ""; //当前保管员的ID
+            }, function (reason) {
+                console.log(reason);
+            });
+        }
+
         // 翻页
         $scope.goPage = function(pageNum) {
             $scope.pageInfo.pageNum = pageNum;
@@ -53,6 +75,7 @@ angular.module('app.system').controller("userCtrl",
         //获取用户信息
         $rootScope.user=null;
         $scope.update = function(userId) {
+            // $state.go("app.system.user.edit",{userId:userId});
             userService.editUser(userId).then(function(data) {
                 $rootScope.user = data;
                 if($rootScope.user.status == null || $rootScope.user.status == ""){
@@ -60,12 +83,12 @@ angular.module('app.system').controller("userCtrl",
                 }else{
                 	$rootScope.user.status = ""+$rootScope.user.status;
                 }
-                
+
                 $state.go("app.system.user.edit",{userId:userId});
             },function(data) {
                 console.log(data);
             });
-        }
+        };
 
         //重置密码
         $scope.resetPwd = function(userId) {
@@ -96,6 +119,19 @@ angular.module('app.system').controller("userEditCtrl",
 
         $rootScope.userRoleIds=[];
         $rootScope.crkRoleIds=[];
+
+        // 身份证号查询数据
+        $scope.keyUpFunction = function (sfzhm) {
+            if (sfzhm.length === 18) {
+                // 调用市平台数据查询员工信息
+                userService.getBySfzhmFunction(sfzhm, $rootScope.orgInfo.orgId).then(function(data) {
+                    $scope.user = data;
+                }, function(data) {
+                    console.log(data);
+                });
+            }
+        };
+
         // 提交表单
         var validator = $("#user-form").validate({
             rules: {
@@ -154,14 +190,18 @@ angular.module('app.system').controller("userEditCtrl",
                     }
                 });
                 userService.saveUser($scope.user,$scope.userRoleIds,$scope.crkRoleIds).then(function(data) {
-                    alert("保存成功！");
-                    // 跳转到列表页
-                    $state.go("app.system.user");
+                    if (data.status === 'success') {
+                        alert("保存成功！");
+                        // 跳转到列表页
+                        $state.go("app.system.user");
+                    } else {
+                        alert("保存成功！");
+                    }
                 }, function(data) {
                     console.log(data);
                 });
             }
-        }
+        };
 
         // 文件上传实例
         $scope.uploader = new FileUploader({

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

@@ -0,0 +1,55 @@
+"use strict";
+angular.module('app.system').controller("userHousePowerCtrl", function ($scope, $rootScope, $http, $location, $uibModalInstance, $stateParams, keeperService, id, orgId) {
+    $scope.selected = []; //仓房数组
+    // 获取当前保管员所在粮库的所有仓房和当前保管员的权限
+    $scope.edit = function () {
+        keeperService.getUnitStoreKeepList(id, orgId, "0").then(function (data) {
+            $scope.housePowerList = data.storeList;
+            //初始化选中仓房的数组
+            for (var i = 0; i < data.storeList.length; i++) {
+                if (data.storeList[i].delFlag == 5) {
+                    $scope.selected.push(data.storeList[i].storehouseId);
+                }
+            }
+        }, function (data) {
+            console.log(data);
+        });
+    };
+    $scope.edit();
+
+    // 更新仓房数组的值
+    $scope.updateSelection = function ($event, hid) {
+        var checkbox = $event.target;
+        var checked = checkbox.checked;
+        if (checked) {
+            $scope.selected.push(hid);
+        } else {
+            var idx = $scope.selected.indexOf(hid);
+            $scope.selected.splice(idx, 1);
+        }
+    };
+
+    // 提交保管员权限分配
+    $scope.save = function () {
+        var checkArray = angular.toJson($scope.selected);
+        keeperService.saveKeeperHouse(checkArray, $rootScope.userInfo, id).then(function (data) {
+            if (data.status === 'success') {
+                alert("保存成功！");
+            } else {
+                alert("保存失败！");
+            }
+        }, function (data) {
+            console.log(data);
+        });
+        //清空变量
+        $scope.selected = []; //仓房数组
+
+        $scope.cancel();
+    };
+
+    // 关闭模态窗口
+    $scope.cancel = function () {
+        $uibModalInstance.close();
+    }
+
+});

src/main/resources/static/app/system/service/userService.js

@@ -449,8 +449,24 @@ angular.module('app.system').service("userService", function($http, $q, $rootSco
 			d.reject("error");
 		});
 		return d.promise;
-	}
-})
+	};
+
+    // 身份证号带出员工信息
+    this.getBySfzhmFunction = function(sfzhm, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.systemUrl + '/userInfo/getBySfzhm/' + sfzhm + '/' + orgId
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+});
 
 angular.module('app.system').service("userRoleService", function($http, $q, APP_CONFIG) {
 	
@@ -495,6 +511,6 @@ angular.module('app.system').service("userRoleService", function($http, $q, APP_
 			d.reject("error");
 		});
 		return d.promise;
-	}
+	};
 
-})
+});

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

@@ -37,66 +37,61 @@
 								<fieldset>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label txt-bg-red">登录账号<span style="color: red;">*</span></label> 
-											<label class="input"> 
-												<i class="icon-prepend fa fa-user"></i>
-												<input type="text" name="username" ng-model="user.username" 
-													 minlength="2" maxlength="20" required validUsername="true" />
-												<b class="tooltip tooltip-bottom-right">2-20位字母、数字和下划线</b>
+											<label class="label">身份证号码<span style="color: red;">*</span></label>
+											<label class="input">
+												<!-- validCard=true validSfzhm="true"-->
+												<input type="text" ng-model="user.sfzhm" name="sfzhm" maxlength="18" ng-change="keyUpFunction(user.sfzhm)" required/>
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">用户姓名<span style="color: red;">*</span></label> 
-											<label class="input"> 
+											<label class="label">用户姓名<span style="color: red;">*</span></label>
+											<label class="input">
 												<i class="icon-prepend fa fa-user"></i>
 												<input type="text" name="realName" ng-model="user.realName" maxlength="20" required>
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">部门名称<span style="color: red;">*</span></label>
+											<label class="label txt-bg-red">登录账号<span style="color: red;">*</span></label> 
 											<label class="input">
-												<input id="verificationInput"  type="text" ng-model="user.bmmc" name="bmmc" maxlength="100" required ng-blur="bmmcBlur()"/>
+												<i class="icon-prepend fa fa-user"></i>
+												<input type="text" name="username" ng-model="user.username" 
+													 minlength="2" maxlength="20" required validUsername="true" />
+												<b class="tooltip tooltip-bottom-right">2-20位字母、数字和下划线</b>
 											</label>
-											<div style="color:#D56161;display:none;font-size:11px" id="verificationContainer">不能填写“无”、“暂无”、“空”</div>
 										</section>
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label">身份证号码<span style="color: red;">*</span></label>
+											<label class="label">部门名称<span style="color: red;">*</span></label>
 											<label class="input">
-												<input type="text" ng-model="user.sfzhm" name="sfzhm" maxlength="18" validSfzhm="true" required validCard=true/>
+												<input id="verificationInput"  type="text" ng-model="user.bmmc" name="bmmc" maxlength="100" required ng-blur="bmmcBlur()"/>
 											</label>
+											<div style="color:#D56161;display:none;font-size:11px" id="verificationContainer">不能填写“无”、“暂无”、“空”</div>
 										</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" id="rzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" 
-												 required ng-blur="rzrqChange()" />
-											</label>
+											<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"
+																data-callback="selectOnly(item, selectedItems)">
+											</multi-select-tree>
 										</section>
 										<section class="col col-4">
-											<label class="label">性别<span style="color: red;">*</span></label>
-											<label class="select"> 
-												<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>
+											<label class="label">库级角色（可多选）</label>
+											<multi-select-tree data-input-model="data4" data-default-label="请选择"
+															   select-only-leafs="true"
+															   multi-select="true" data-output-model="userRole.roleIds"
+															   data-callback="selectOnly1Or2(item, selectedItems)">
+											</multi-select-tree>
 										</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.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>
+											<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>
 										<section class="col col-4">
 											<label class="label">在岗状态<span style="color: red;">*</span></label>
@@ -110,41 +105,15 @@
 											</label>
 										</section>
 										<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" 
-														data-callback="selectOnly(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="data4" data-default-label="请选择"
-                                                    select-only-leafs="true"
-													multi-select="true" data-output-model="userRole.roleIds"
-													data-callback="selectOnly1Or2(item, selectedItems)">
-											 </multi-select-tree>
-										</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>
-										<section class="col col-4">
 											<label class="label">离职日期</label>
 											<label class="input">
-												<input type="text" ng-model="user.lzrq" name="lzrq" class="form-control"  
-												onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'rzrq\')}'})"/>
+												<input type="text" ng-model="user.lzrq" name="lzrq" class="form-control" onClick="WdatePicker({lang:'zh-cn'})"/>
 											</label>
 										</section>
 									</div>
 									<div class="row">
 										<section class="col col-4">
-											<label class="label">固定电话</label> 
+											<label class="label">固定电话</label>
 											<label class="input">
 												<i class="icon-prepend fa fa-phone"></i>
 												<input type="tel" ng-model="user.telphone" name="telphone" maxlength="30" validZjh=true />
@@ -152,154 +121,65 @@
 										</section>
 										<section class="col col-4">
 											<label class="label">手机号<span style="color: red;">*</span></label>
-											<label class="input"> 
+											<label class="input">
 												<i class="icon-prepend fa fa-mobile-phone"></i>
 												<input type="text" ng-model="user.mobile" name="mobile" validSjh=true required />
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">地址</label> 
-											<label class="input"> 
-												<i class="icon-prepend fa fa-map-marker"></i> 
+											<label class="label">地址</label>
+											<label class="input">
+												<i class="icon-prepend fa fa-map-marker"></i>
 												<input type="text" ng-model="user.address" name="address" maxlength="100" />
 											</label>
 										</section>
 									</div>
-									<div class="row" id="userPwd">
-										<section class="col col-6">
-											<label class="label">密码<span style="color: red;">*</span></label> 
-											<label class="input"> 
-												<i class="icon-prepend fa fa-key"></i> 
-												<input type="password" id="newPassword" name="newPassword" 
-													ng-model="user.password" minlength="12" maxlength="18" required  validUsePwd="true" />
-											</label>
-										</section>
-										<section class="col col-6">
-											<label class="label">确认密码<span style="color: red;">*</span></label> 
-											<label class="input"> 
-												<i class="icon-prepend fa fa-key"></i> 
-												<input type="password" name="newPassword1" ng-model="newPassword1" 
-													 minlength="12" maxlength="18" required  />
-											</label>
-										</section>
-									</div>
 									<div class="row">
 										<section class="col col-4">
 											<label class="label">电子邮箱</label>
-											<label class="input"> 
-												<i class="icon-prepend fa fa-envelope-o"></i> 
-												<input type="input" ng-model="user.email" name="email" maxlength="60" validEmail=true />
-											</label>
-										</section>
-										<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>
-									</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.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>
-										<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.zy" name="zy" maxlength="30"  required />
-											</label>
-										</section>
-									</div>
-									<div class="row">
-										<section class="col col-4">
-											<label class="label">岗位类别</label> 
-											<label class="select"> 
-												<select ng-model="user.status" class="form-control">
-													<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>
-													<option value="7">管理</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>
-									<div class="row">
-										<section class="col col-4">
-											<label class="label">取得最高职称或职业资格时间</label>
-											<label class="input">
-												<input type="text" ng-model="user.qdzgzchzyzgsj" name="qdzgzchzyzgsj" class="form-control" onClick="WdatePicker({lang:'zh-cn'})" />
+												<i class="icon-prepend fa fa-envelope-o"></i>
+												<input type="input" ng-model="user.email" name="email" maxlength="60" validEmail=true />
 											</label>
 										</section>
 										<section class="col col-4">
-											<label class="label">用户头像</label> 
+											<label class="label">电子签名</label>
 											<div class="input input-file">
 									            <span class="button">
 									            	<input type="file" nv-file-select="" uploader="uploader" accept="image/*">
 									                	浏览
-									            </span><input type="text" name="imgUrl" ng-model="user.imgUrl" placeholder="" readonly="">
-									        </div>
+									            </span><input type="text" name="sigature" ng-model="user.sigature" placeholder="" readonly="">
+											</div>
 										</section>
 										<section class="col col-4">
-											<label class="label">电子签名</label> 
+											<label class="label">用户头像</label>
 											<div class="input input-file">
 									            <span class="button">
 									            	<input type="file" nv-file-select="" uploader="uploader" accept="image/*">
 									                	浏览
-									            </span><input type="text" name="sigature" ng-model="user.sigature" placeholder="" readonly="">
-									        </div>
+									            </span><input type="text" name="imgUrl" ng-model="user.imgUrl" placeholder="" readonly="">
+											</div>
+										</section>
+									</div>
+									<div class="row" id="userPwd">
+										<section class="col col-6">
+											<label class="label">密码<span style="color: red;">*</span></label> 
+											<label class="input"> 
+												<i class="icon-prepend fa fa-key"></i> 
+												<input type="password" id="newPassword" name="newPassword" 
+													ng-model="user.password" minlength="12" maxlength="18" required  validUsePwd="true" />
+											</label>
+										</section>
+										<section class="col col-6">
+											<label class="label">确认密码<span style="color: red;">*</span></label> 
+											<label class="input"> 
+												<i class="icon-prepend fa fa-key"></i> 
+												<input type="password" name="newPassword1" ng-model="newPassword1" 
+													 minlength="12" maxlength="18" required  />
+											</label>
 										</section>
 									</div>
 								</fieldset>
-								
 					            <footer class="text-align-center">
 					                <button type="button" class="btn btn-primary" ng-click="save()">提交</button>
 					                <button type="button" class="btn btn-default" ng-click="back()">取消</button>

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

@@ -52,6 +52,7 @@
 				                            <th data-hide="phone">电话</th>
 				                            <th data-hide="phone,tablet">所属组织</th>
 				                            <th data-hide="phone,tablet">在岗状态</th>
+				                            <th data-hide="phone,tablet">状态</th>
 				                            <th data-hide="phone,tablet">角色</th>
 				                            <th data-hide="phone">操作</th>
 				                        </tr>
@@ -65,9 +66,15 @@
 			                        		<td>{{user.telphone}}</td>
 			                        		<td>{{user.orgName}}</td>
 			                        		<td>{{user.zgzt=='01'?'在岗':'已离职'}}</td>
+			                        		<td>{{user.zgzt=='01'?'启用':'禁用'}}</td>
 			                        		<td>{{user.roleNames}}</td>
 			                        		<td>
 			                        			<a has-permission="171" ng-click="update(user.userId)"><i class="fa fa-edit"></i> 修改</a>
+												<span ng-if="user.roleNames=='保管员'||user.roleNames=='仓储人员'">
+													<a href-void ng-click="getUnitStoreList(user.userId)">
+														<i class="fa fa-cogs"></i>分配仓房
+													</a>
+												</span>
 <!-- 												<a has-permission="298" href-void ng-click="remove(user.userId)"><i class="fa fa-trash-o"></i> 删除</a> -->
 												<!-- <a has-permission="525" href-void ng-click="resetPwd(user.userId)"><i class="fa fa-edit"></i> 重置密码</a> -->
 											</td>

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

@@ -0,0 +1,47 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;</button>
+        <h4 class="modal-title" id="myModalLabel">保管员仓房权限信息</h4>
+    </div>
+    <div class="modal-body">
+        <form id="basicEnum-form" name='basicEnum-form'
+              class="smart-form ng-pristine ng-valid"
+              ng-submit='basicEnum-form.$valid&&save(basicEnum)'
+              novalidate="novalidate">
+
+            <fieldset>
+                <section>
+                    <label class="label">复选框勾上的便是当前保管员所管理的仓房</label><br />
+                    <br />
+
+                    <div class="row">
+                        <div class="col col-4" ng-repeat="store in housePowerList">
+                            <label class="checkbox">
+								<span ng-if="store.delFlag==5">
+									<input type="checkbox" name="checkbox" ng-click="updateSelection($event,store.storehouseId)"
+                                           checked="checked" />
+									<i></i>{{store.storehouseName}}
+								</span>
+                                <span ng-if="store.delFlag!=5">
+									<input type="checkbox" name="checkbox" ng-click="updateSelection($event,store.storehouseId)" />
+									<i></i>{{store.storehouseName}}
+								</span>
+                            </label>
+                        </div>
+                        <br />
+                        <br />
+
+                    </div>
+                </section>
+
+            </fieldset>
+        </form>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-primary" ng-click="save()">
+                提交</button>
+            <button type="button" class="btn btn-default" ng-click="cancel()">
+                取消</button>
+        </div>
+    </div>
+</div>