权限：界面逻辑更新

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_account_management_ctrl.js

@@ -7,6 +7,10 @@ define(['app/app'], function(app) {
     app.register.controller('vendorAccountManagementCtrl', ['$scope', '$rootScope', 'Enterprise', 'User', 'toaster', '$modal','BaseService','ngTableParams','$http', function($scope, $rootScope, Enterprise, User, toaster, $modal, BaseService, ngTableParams, $http) {
         $rootScope.active = 'vendor_account_management';
 		$scope.tab = 'base';
+        $scope.addingUser = false;
+        $scope.setAddingUser = function (status) {
+            $scope.addingUser = status;
+        };
         $scope.userInfo = $rootScope.userInfo;
 		$scope.updateState = false;
         // 获取企业信息
@@ -95,17 +99,20 @@ define(['app/app'], function(app) {
 		 * 添加未注册用户
 		 */
 		$scope.addUser = function () {
+			if (!$scope.userEmailSuccess || !$scope.userTelSuccess){
+                toaster.pop('error', '未通过校验');
+                return;
+			}
 			$scope.adding = true;
 			$scope.loading = true;
 			Enterprise.saveUser({}, $scope.newUser, function () {
 				$scope.loading = false;
 				toaster.pop('success', '提示', '增加用户成功：' + $scope.newUser.userName);
+                $scope.setAddingUser(false);
 				$scope.newUser = {userSex: 'M'};
 				$scope.tableParams.page(1);
 				$scope.tableParams.reload();
 				$scope.adding = false;
-				$scope.newUserForm.newUserTel.$setValidity('available', false);
-				$scope.newUserForm.newUserEmail.$setValidity('available', false);
 				$scope.userTelSuccess = false;
 				$scope.userTelError = false;
 				$scope.userEmailSuccess = false;
@@ -143,11 +150,9 @@ define(['app/app'], function(app) {
 				}).success(function (data) {
 					data = eval(data);
 					if (data == true) {
-						$scope.newUserForm.newUserTel.$setValidity('available', true);
 						$scope.userTelSuccess = true;
 						$scope.userTelError = false;
 					} else {
-						$scope.newUserForm.newUserTel.$setValidity('available', false);
 						$scope.userTelError = true;
 						$scope.userTelSuccess = false;
 						if (tel.length == 11)
@@ -175,13 +180,12 @@ define(['app/app'], function(app) {
 				}).success(function (data) {
 					data = eval(data);
 					if (data == true) {
-						$scope.newUserForm.newUserEmail.$setValidity('available', true);
 						$scope.userEmailSuccess = true;
 						$scope.userEmailError = false;
 					} else {
-						$scope.newUserForm.newUserEmail.$setValidity('available', false);
 						$scope.userEmailError = true;
 						$scope.userEmailSuccess = false;
+                        toaster.pop('error', '错误', '邮箱 ' + email + ' 已被注册');
 					}
 				}).error(function () {
 					$scope.userEmailError = true;

src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -388,6 +388,7 @@
         height: 32px;
         line-height: 32px;
         float: right;
+        padding-left: 5px;
     }
     .auth-info-header .searchUser-group >div {
         background: #fff;
@@ -761,27 +762,30 @@
             <!-- 人员信息 -->
             <div class="count01 clearfix" ng-if="tab=='auth'">
                 <!--<div class="power_title">员工账号及权限管理</div>-->
-                <div class="auth-info-header">
+                <div class="auth-info-header" ng-show="userInfo.sys">
                     <div class="addUser-group">
                         <!--<i class="fa fa-user-plus fa-fw"></i>-->
-                        <div class="addUser-btn">
+                        <div class="addUser-btn" ng-click="adding = !adding">
                             <img src="static/img/vendor/images/addUser.jpg" alt="">
                             <span>新增用户</span>
                         </div>
-                        <div class="addUser-expand">
-                            <div>
+                        <div class="addUser-expand" ng-show="adding">
+                            <div ng-click="setAddingUser(true)">
                                 <i class="fa fa-plus-circle"></i>
                                 <span>添加未注册用户</span>
                             </div>
-                            <div>
+                            <div ng-click="addExistUser()">
                                 <i class="fa fa-plus-circle"></i>
                                 <span>添加已注册用户</span>
                             </div>
                         </div>
                     </div>
                     <div class="searchUser-group">
-                        <span>搜索</span>
-                        <input type="text">
+                        <span ng-click="onSearch(keyword)">搜索</span>
+
+                        <input type="text"  ng-model="keyword"
+                               ng-search="onSearch(keyword)" placeholder="输入人员姓名、电话号码、邮箱或UU号进行搜索"/>
+                        <!--<input type="text">-->
                         <div>
                             <select>
                                 <option value="all">全部角色</option>
@@ -790,6 +794,7 @@
                     </div>
                 </div>
                 <div class="auth-info-area">
+                    <form name="newUserForm"></form>
                     <table class="role-info" ng-table="tableParams">
                         <thead>
                         <tr>
@@ -809,7 +814,7 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr class="role-filter">
+                        <tr class="role-filter" ng-show="addingUser">
                             <td>
                                 <lable class="check-act">
                                     <input type="checkbox" id="check0"/>
@@ -818,19 +823,24 @@
                             </td>
                             <td>系统生成</td>
                             <td>
-                                <input type="text" placeholder="用户名">
+                                <input type="text" ng-model="newUser.userName" required placeholder="用户名">
                             </td>
                             <td>
-                                <select>
+                                <select ng-model="newUser.userSex" ng-init="newUser.userSex='M'" >
                                     <option value="M">男</option>
                                     <option value="F">女</option>
                                 </select>
                             </td>
-                            <td>
-                                <input type="text" placeholder="手机号">
+                            <td ng-class="{'has-error': userTelError, 'has-success': userTelSuccess}">
+                                <input ng-model="newUser.userTel"
+                                       ng-blur="telValid(newUser.userTel)" required name="newUserTel"
+                                       ng-pattern="/^1[3|4|5|7|8]\d{9}$/" type="text" placeholder="手机号">
                             </td>
-                            <td>
-                                <input type="text" placeholder="邮箱">
+                            <td ng-class="{'has-error': userEmailError, 'has-success': userEmailSuccess}">
+                                <input ng-model="newUser.userEmail" ng-pattern="/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/"
+                                       ng-blur="emailValid(newUser.userEmail)" required
+                                       name="newUserEmail" type="text"
+                                       placeholder="邮箱">
                             </td>
                             <td class="role-tag-area">
                                 <span class="role-tag bgcolor-1">管</span>
@@ -842,8 +852,8 @@
                                 <span class="role-tag bgcolor-7">'''</span>
                             </td>
                             <td class="submit-area">
-                                <span>取消</span>
-                                <span>确定</span>
+                                <span ng-click="setAddingUser(false)" >取消</span>
+                                <span ng-click="addUser(newUser)">确定</span>
                             </td>
                         </tr>
                         <tr ng-repeat="user in users track by $index">
@@ -861,8 +871,15 @@
                             <td class="role-tag-area">
                                 <span ng-repeat="role in user.roles" class="role-tag bgcolor-{{$index+1}}">{{role.desc.substring(0,1)}}</span>
                             </td>
-                            <td class="edit-btn-area">
+                            <!--<td class="edit-btn-area">
                                 <a>编辑 </a><span>|</span><a> 删除</a>
+                            </td>-->
+                            <td class="edit-btn-area">
+                                <!--<a class="operator-trigger" href="javascript:void(0);"><i class="fa fa-pencil fa-lg" ng-show="(userInfo.sys && enterprise.enAdminuu != user.userUU) || users.length == 1"></i></a>-->
+                                <div ng-show="(userInfo.sys && enterprise.enAdminuu != user.userUU) || users.length == 1">
+                                    <!--<li><a ng-click="editUserRole(u)"><i class="fa fa-fw fa-pencil-square-o" style="color: #fff"></i>编辑</a></li>-->
+                                    <a ng-click="removeUser(user)" ng-if="user.userUU != userInfo.userUU" title="删除"><i></i>删除</a>
+                                </div>
                             </td>
                         </tr>
                         </tbody>