权限bug修改

src/main/webapp/resources/css/common.css

@@ -437,7 +437,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 
 .loading.in {
 	display: block;
-	z-index: 99999;
+	z-index: 999999999;
 }
 
 .loading.in>i {

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

@@ -129,6 +129,11 @@ define(['app/app'], function (app) {
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
+        $scope.onKeyUpSearch = function (keyword, filterRole, event) {
+            if (event && event.keyCode == 13) {
+                $scope.onSearch(keyword, filterRole);
+            }
+        }
 
         $scope.newUser = {};
 
@@ -192,17 +197,18 @@ define(['app/app'], function (app) {
          */
         $scope.removeUser = function (user) {
 
-            if (confirm('确定删除用户(' + user.userName + ')吗？')) {
-                Enterprise.removeUser({uu: user.userUU}, function () {
-                    toaster.pop('success', '提示', '用户删除成功。');
-                    $scope.tableParams.page(1);
-                    $scope.tableParams.reload();
-                    $scope.showDelUserFlag = false;
-                }, function (response) {
-                    toaster.pop('error', '删除失败', response.data);
-                    $scope.showDelUserFlag = false;
-                });
-            }
+            // if (confirm('确定删除用户(' + user.userName + ')吗？')) {
+            //    
+            // }
+            Enterprise.removeUser({uu: user.userUU}, function () {
+                toaster.pop('success', '提示', '用户删除成功。');
+                $scope.tableParams.page(1);
+                $scope.tableParams.reload();
+                $scope.showDelUserFlag = false;
+            }, function (response) {
+                toaster.pop('error', '删除失败', response.data);
+                $scope.showDelUserFlag = false;
+            });
         };
         //用户删除确认框
         $scope.showDelUserFlag = false;

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

@@ -324,6 +324,7 @@
     }
     .auth-info-area .role-info tr td.edit-btn-area a, .auth-info-area .role-info tr td.edit-btn-area span{
         color: #5078cb;
+        cursor: pointer;
     }
     .auth-info-header {
         height: 40px;
@@ -990,9 +991,9 @@
                     </div>
                 </div>
                 <div class="searchUser-group">
-                    <span ng-click="onSearch(keyword,filterRole)">搜索</span>
+                    <span ng-click="onSearch(keyword, filterRole)">搜索</span>
 
-                    <input type="text" ng-model="keyword" placeholder="输入人员姓名、电话号码、邮箱或UU号进行搜索"/>
+                    <input type="text" ng-keyup="onKeyUpSearch(keyword, filterRole, $event)" ng-model="keyword" placeholder="输入人员姓名、电话号码、邮箱或UU号进行搜索"/>
                     <!--<input type="text">-->
                     <div>
                         <select ng-model="filterRole" ng-change="onSearch(keyword,filterRole)">
@@ -1081,10 +1082,10 @@
                         <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) || users.length == 1">  <!--&& enterprise.enAdminuu != user.userUU-->
-                                <a ng-click="editUserRole(user)" ng-if="user.userUU != userInfo.userUU" title="编辑"><i></i>编辑 | </a>
-                                <a ng-click="setShowDelUserFlag(true, user)" ng-if="user.userUU != userInfo.userUU" title="删除"><i></i>删除</a>
-                                <a ng-if="user.userUU == userInfo.userUU" disabled="false" title="编辑" style="color: #606168"><i></i>编辑 | </a>
-                                <a ng-if="user.userUU == userInfo.userUU" disabled="false" title="删除" style="color: #606168"><i></i>删除</a>
+                                <span ng-click="editUserRole(user)" ng-show="user.userUU != userInfo.userUU" title="编辑"><i></i>编辑 | </span>
+                                <span ng-click="setShowDelUserFlag(true, user)" ng-show="user.userUU != userInfo.userUU" title="删除"><i></i>删除</span>
+                                <span ng-show="user.userUU == userInfo.userUU" disabled="false" title="编辑" style="color: #606168; cursor: not-allowed;"><i></i>编辑 | </span>
+                                <span ng-show="user.userUU == userInfo.userUU" disabled="false" title="删除" style="color: #606168; cursor: not-allowed;"><i></i>删除</span>
                             </div>
                         </td>
                     </tr>

src/main/webapp/resources/view/vendor/modal/role_detail.html

@@ -347,6 +347,10 @@
 	.role-tree-level3 >li >div{
 		padding-left: 20px;
 	}
+	.modal-dialog {
+		max-height: 500px;
+		overflow-y: auto;
+	}
 </style>
 
 <div class="modal-header">