Merge remote-tracking branch 'origin/feature/authority-0918' into feature/authority-0918

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

@@ -16,7 +16,6 @@ define(['app/app'], function(app) {
 			$scope.enAdminuu = $scope.enterpriseInfo.enAdminuu;
 			User.getUserByUU({uu: $scope.enAdminuu}, {}, function(data){
 		        	$scope.adminInfo = data;
-		        	console.log($scope.adminInfo);
 		        }, function(){
 		        	toaster.pop('error', '获取管理员信息失败');
 		        });
@@ -24,6 +23,7 @@ define(['app/app'], function(app) {
 			toaster.pop('error', '获取企业信息失败');
 		});
 
+		$scope.pageParam = {};
 		$scope.tableParams = new ngTableParams({
 			page : 1, // show first page
 			count : 10 // count per page
@@ -35,6 +35,9 @@ define(['app/app'], function(app) {
 				if(!$scope.searchMthod) {
 					Enterprise.getAllUsersByEnuu(param, function (page) {
 						if (page) {
+							$scope.pageParam.start = (page.number-1)*page.size+1;
+							$scope.pageParam.end = $scope.pageParam.start + page.numberOfElements - 1;
+							$scope.pageParam.all = page.totalElements;
 							params.total(page.totalElements);
 							$defer.resolve(page.content);
 							$scope.users = page.content;
@@ -45,6 +48,9 @@ define(['app/app'], function(app) {
 					param.keyword = $scope.keyword;
 					Enterprise.findUsersByKeyword(param,function (page) {
 						if (page) {
+							$scope.pageParam.start = (page.number-1)*page.size+1;
+							$scope.pageParam.end = $scope.pageParam.start + page.numberOfElements - 1;
+							$scope.pageParam.all = page.totalElements;
 							params.total(page.totalElements);
 							$defer.resolve(page.content);
 							$scope.users = page.content;
@@ -72,7 +78,7 @@ define(['app/app'], function(app) {
 			var modalInstance = $modal.open({
 				animation: true,
 				templateUrl: $rootScope.rootPath +'/static/view/vendor/forstore/addExistUser.html',
-					controller: 'AddExistUserCtrl'
+				controller: 'AddExistUserCtrl'
 			});
 
 			modalInstance.result.then(function () {

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

@@ -128,14 +128,14 @@
     .member-list{
         margin-bottom: 20px;
     }
-    .user-list .search .form-control{
+    .user_right .search .form-control{
         height: 36px;
         border: #bfbfbf 1px solid;
         font-size: 14px;
         margin-left: 5px;
         margin-top: 10px;
     }
-    .user-list .search .input-group-addon{
+    .user_right .search .input-group-addon{
         width: 70px;
         height: 36px;
         display: inline-block;
@@ -218,7 +218,6 @@
 
     table.role-info{
         box-sizing: border-box;
-        border: #dae5fd 1px solid;
         border-bottom: none;
     }
     table.role-info thead{
@@ -253,15 +252,19 @@
         background: url("static/img/vendor/images/xiala.png") no-repeat;
         background-position: 30px 9px;
     }
-    table.role-info tbody>tr>td{
+    table.role-info tbody >tr>td{
         font-size: 14px;
         color: #666;
         border-bottom: 1px solid #dae5fd;
         border-right: 1px solid #dae5fd;
+        border-left: 1px solid #dae5fd;
         height: 40px;
         vertical-align: middle;
         text-align: center;
     }
+    table.role-info tbody:last-child >tr>td {
+        border: none;
+    }
     .auth-info-area {
         padding: 15px;
     }
@@ -315,6 +318,112 @@
     .auth-info-area .role-info tr td.edit-btn-area a, .auth-info-area .role-info tr td.edit-btn-area span{
         color: #5078cb;
     }
+    .auth-info-header {
+        height: 40px;
+        line-height: 40px;
+        background: #f5f8fe;
+        margin-top: 7px;
+        padding-right: 24px;
+    }
+    .auth-info-header >div {
+        display: inline-block;
+        float: right;
+    }
+    .auth-info-header .addUser-group {
+        position: relative;
+    }
+    .auth-info-header .addUser-group .addUser-btn {
+        cursor: pointer;
+    }
+    .auth-info-header .addUser-group .addUser-btn img {
+        position: relative;
+        top: -4px;
+        margin-right: 2px;
+    }
+    .auth-info-header .addUser-group .addUser-btn span {
+        font-size: 12px;
+    }
+    .auth-info-header .addUser-group .addUser-expand {
+        position: absolute;
+        height: 54px;
+        width: 121px;
+        box-shadow: 1.5px 2.598px 7px 0px rgb( 0, 0, 0 );
+        background: #fff;
+    }
+    .auth-info-header .addUser-group .addUser-expand >div {
+        height: 27px;
+        line-height: 27px;
+        font-size: 12px;
+        cursor: pointer;
+        margin-left: 5px;
+    }
+    .auth-info-header .addUser-group .addUser-expand >div:hover {
+        color: #5a7fce;
+    }
+    .auth-info-header .addUser-group .addUser-expand >div i {
+        color: #dfe0e1;
+        font-size: 14px;
+    }
+    .auth-info-header .addUser-group .addUser-expand >div:hover i {
+        color: #5a7fce;
+    }
+    .auth-info-header .searchUser-group {
+        margin-right: 50px;
+        margin-top: 4px;
+    }
+    .auth-info-header .searchUser-group span {
+        width: 58px;
+        height: 32px;
+        display: inline-block;
+        line-height: 32px;
+        text-align: center;
+        background: #5078cb;
+        color: #fff;
+        font-size: 14px;
+        float: right;
+        cursor: pointer;
+    }
+    .auth-info-header .searchUser-group input {
+        width: 330px;
+        height: 32px;
+        line-height: 32px;
+        float: right;
+    }
+    .auth-info-header .searchUser-group >div {
+        background: #fff;
+        display: inline-block;
+    }
+    .auth-info-header .searchUser-group >div >select {
+        width: 90px;
+        height: 32px;
+        font-size: 14px;
+        padding-left: 5px;
+        margin-right: 5px;
+        position: relative;
+        top: -2px;
+        border: 1px solid #5078cb;
+        background: url(static/img/vendor/images/xiala-blue.jpg) no-repeat;
+        background-position: 72px 11px;
+    }
+    .auth-info-area ul {
+        width: auto;
+        margin: 0 0 20px 0;
+    }
+    .auth-info-area ul li {
+        width: auto;
+        height: auto;
+        line-height: inherit;
+        margin: 0;
+        border-bottom: none;
+        font-size: 12px;
+    }
+    .auth-info-area ul li a {
+        width: auto;
+        float: left;
+    }
+    .auth-info-area .record-line {
+        margin-right: 22px;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -325,6 +434,7 @@
                 <li ng-class="{'active': tab=='base'}"><a ng-click="checkTab('base')">基本信息</a></li>
                 <li ng-class="{'active': tab=='safe'}"><a ng-click="checkTab('safe')">安全设置</a></li>
                 <li ng-class="{'active': tab=='auth'}"><a ng-click="checkTab('auth')">人员信息</a></li>
+                <li ng-class="{'active': tab=='role'}"><a ng-click="checkTab('role')">角色管理</a></li>
                 <!--<li ng-class="{'active': tab=='logistic'}"><a href="#" ng-click="checkTab('logistic')">收货地址</a></li>-->
             </ul>
         </div>
@@ -450,7 +560,7 @@
                                 <!-- 添加用户 end -->
                         </span>
                         </div>
-                     </div>
+                    </div>
                     <form name="newUserForm">
                         <div class="search col-xs-6" style="float: right;">
                             <div class="form-group form-group-sm has-feedback">
@@ -575,9 +685,37 @@
                     </li>
                 </ul>
             </div>
-            <!--权限管理-->
+            <!-- 人员信息 -->
             <div class="count01 clearfix" ng-if="tab=='auth'">
                 <!--<div class="power_title">员工账号及权限管理</div>-->
+                <div class="auth-info-header">
+                    <div class="addUser-group">
+                        <!--<i class="fa fa-user-plus fa-fw"></i>-->
+                        <div class="addUser-btn">
+                            <img src="static/img/vendor/images/addUser.jpg" alt="">
+                            <span>新增用户</span>
+                        </div>
+                        <div class="addUser-expand">
+                            <div>
+                                <i class="fa fa-plus-circle"></i>
+                                <span>添加未注册用户</span>
+                            </div>
+                            <div>
+                                <i class="fa fa-plus-circle"></i>
+                                <span>添加已注册用户</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="searchUser-group">
+                        <span>搜索</span>
+                        <input type="text">
+                        <div>
+                            <select>
+                                <option value="all">全部角色</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
                 <div class="auth-info-area">
                     <table class="role-info" ng-table="tableParams">
                         <thead>
@@ -611,7 +749,6 @@
                             </td>
                             <td>
                                 <select>
-                                    <option value=""></option>
                                     <option value="M">男</option>
                                     <option value="F">女</option>
                                 </select>
@@ -656,9 +793,22 @@
                             </td>
                         </tr>
                         </tbody>
+                        <tbody ng-if="users.length > 0">
+                        <tr style="height: 30px;">
+                            <td colspan="9" style="border-bottom: none; padding: 0;">
+                                <div class="record-line text-right">
+                                    显示<span ng-bind="pageParam.start || 0"></span>-<span ng-bind="pageParam.end || 0"></span>条，共 <span ng-bind="pageParam.all"></span> 条
+                                </div>
+                            </td>
+                        </tr>
+                        </tbody>
                     </table>
                 </div>
             </div>
+            <!-- 角色管理 -->
+            <div class="count01 clearfix" ng-if="tab=='role'">
+                hahah
+            </div>
         </div>
         <!--收货地址-->
         <div class="logistic-content" ng-if="tab=='logistic'">