验收修改。

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

@@ -137,18 +137,27 @@ 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();
-				}, function (response) {
-					toaster.pop('error', '删除失败', response.data);
-				});
-			}
+		$scope.removeUser = function () {
+			Enterprise.removeUser({uu: $scope.delUser.userUU}, function () {
+				$scope.setShowDelUserFlag(false);
+				toaster.pop('success', '提示', '用户删除成功。');
+				$scope.tableParams.page(1);
+				$scope.tableParams.reload();
+			}, function (response) {
+				toaster.pop('error', '删除失败', response.data);
+			});
 		};
+
+		//用户删除确认框
+		$scope.showDelUserFlag = false;
+
+		$scope.setShowDelUserFlag = function (flag, user) {
+			$scope.showDelUserFlag = flag;
+			if (flag) {
+				$scope.delUser = user;
+			}
+		}
+
 		/**
 		 * 验证手机号是否可用
 		 */
@@ -522,8 +531,8 @@ define(['app/app'], function(app) {
 
         AccountResource.query({}, function (data) {
             if (data && data.length > 0) {
+				var rs = [];// 已分配的资源的id
                 if (role && role.resourceItems) {
-                    var rs = [];// 已分配的资源的id
                     angular.forEach(role.resourceItems, function (item) {
                         rs.push(item.id);
                     });

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

@@ -234,8 +234,9 @@
         border-bottom: none;
         vertical-align: middle;
     }
-    table.role-info tbody tr:hover {
+    table.role-info tbody:first-of-type tr:hover {
         background: #f1f5ff;
+        cursor: default;
     }
     table.role-info tbody tr:nth-child(even){
         background: #f1f5ff;
@@ -902,7 +903,7 @@
                                 <!--<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">
                                     <a ng-click="editUserRole(user)" ng-if="user.userUU != userInfo.userUU" title="编辑"><i></i>编辑 | </a>
-                                    <a ng-click="removeUser(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>
                                 </div>
                             </td>
                         </tr>
@@ -918,6 +919,15 @@
                         </tbody>
                     </table>
                 </div>
+                <div class="com-del-box" ng-if="showDelUserFlag">
+                    <div class="title">
+                        <a @click="delFlag=false"><i class="fa fa-close fa-lg"></i></a>
+                    </div>
+                    <div class="content">
+                        <p><i class="fa fa-exclamation-circle"></i>确定删除该用户吗？</p>
+                        <div><a ng-click="setShowDelUserFlag(false)">取消</a><a ng-click="removeUser()">确认</a></div>
+                    </div>
+                </div>
             </div>
             <!-- 角色管理 -->
             <div class="count01 clearfix role-manage" ng-if="tab=='role'" ng-show="userInfo.sys">

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

@@ -195,7 +195,7 @@
                 <a ng-switch-when="next" ng-click="setPage(page.type, -1)">&raquo;</a>
             </li>
         </ul>
-        <div class="page-go-block">
+        <div class="page-go-block" ng-if="rolesData.length>6">
             <input class="page-number" type="text" ng-model="params.currentPage" ng-keydown="listenEnter()"/>
             <a class="page-a" ng-click="setPage('page', params.currentPage)">GO</a>
         </div>