浏览代码

人员信息分页

yangc 8 年之前
父节点
当前提交
db1dd6ce5b

+ 1 - 1
src/main/java/com/uas/platform/b2c/common/account/controller/SecurityController.java

@@ -152,7 +152,7 @@ public class SecurityController {
 		} else {
 			loginUrl = SSOHelper.getRedirectLoginUrl(request, String.valueOf(request.getSession().getAttribute("SSOReferer")));
 		}
-		model.addAttribute("loginUrl", loginUrl);
+		model.addAttribute("loginUrl", loginUrl) ;
 		return model;
 	}
 

+ 77 - 44
src/main/webapp/resources/view/vendor/forstore/vendor_account_management.html

@@ -238,7 +238,7 @@
     table.role-info tbody tr:nth-child(even){
         background: #f1f5ff;
     }
-    table.role-info tbody tr.role-filter {
+    table.role-info tbody tr {
         height: 50px;
         line-height: 50px;
     }
@@ -265,6 +265,56 @@
     .auth-info-area {
         padding: 15px;
     }
+    .auth-info-area .role-info .role-tag-area {
+        padding-left: 13px;
+        text-align: left!important;
+    }
+    .auth-info-area .role-info .role-tag-area .role-tag {
+        color: #fff;
+        width: 25px;
+        height: 25px;
+        display: inline-block;
+        line-height: 25px;
+        border-radius: 2px;
+        text-align: center;
+    }
+    .auth-info-area .role-info .role-tag-area .bgcolor-1 {
+        background: #ff8050;
+    }
+    .auth-info-area .role-info .role-tag-area .bgcolor-2 {
+        background: #01d9ce;
+    }
+    .auth-info-area .role-info .role-tag-area .bgcolor-3 {
+        background: #f7b73c;
+    }
+    .auth-info-area .role-info .role-tag-area .bgcolor-4 {
+        background: #89aefa;
+    }
+    .auth-info-area .role-info .role-tag-area .bgcolor-5 {
+        background: #ff6769;
+    }
+    .auth-info-area .role-info .role-tag-area  .bgcolor-6 {
+        background: #64bfe9;
+    }
+    .auth-info-area .role-info .role-tag-area .bgcolor-7 {
+        background: #4bc701;
+    }
+    .auth-info-area .role-info .submit-area span {
+        font-size: 12px;
+        display: inline-block;
+        cursor: pointer;
+    }
+    .auth-info-area .role-info .submit-area span:last-child {
+        width: 50px;
+        height: 24px;
+        background: #5078cb;
+        line-height: 24px;
+        color: #fff;
+        margin-left: 5px;
+    }
+    .auth-info-area .role-info tr td.edit-btn-area a, .auth-info-area .role-info tr td.edit-btn-area span{
+        color: #5078cb;
+    }
 </style>
 <!--右侧主体部分-->
 <div class="count user_right fr">
@@ -529,7 +579,7 @@
             <div class="count01 clearfix" ng-if="tab=='auth'">
                 <!--<div class="power_title">员工账号及权限管理</div>-->
                 <div class="auth-info-area">
-                    <table class="role-info">
+                    <table class="role-info" ng-table="tableParams">
                         <thead>
                         <tr>
                             <th width="64">
@@ -544,7 +594,7 @@
                             <th width="124">手机号</th>
                             <th width="198">邮箱</th>
                             <th width="224">角色</th>
-                            <th width="98">角色</th>
+                            <th width="98">操作</th>
                         </tr>
                         </thead>
                         <tbody>
@@ -572,55 +622,38 @@
                             <td>
                                 <input type="text" placeholder="邮箱">
                             </td>
-                            <td>
-                                <span class="role-flag">管</span>
+                            <td class="role-tag-area">
+                                <span class="role-tag bgcolor-1">管</span>
+                                <span class="role-tag bgcolor-2">管</span>
+                                <span class="role-tag bgcolor-3">管</span>
+                                <span class="role-tag bgcolor-4">管</span>
+                                <span class="role-tag bgcolor-5">管</span>
+                                <span class="role-tag bgcolor-6">管</span>
+                                <span class="role-tag bgcolor-7">'''</span>
                             </td>
-                            <td>s</td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <lable class="check-act">
-                                    <input type="checkbox" id="check1"/>
-                                    <label for="check1"></label>
-                                </lable>
+                            <td class="submit-area">
+                                <span>取消</span>
+                                <span>确定</span>
                             </td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
                         </tr>
-                        <tr>
+                        <tr ng-repeat="user in users track by $index">
                             <td>
                                 <lable class="check-act">
-                                    <input type="checkbox" id="check2"/>
-                                    <label for="check2"></label>
+                                    <input type="checkbox" id="{{'check1'+$index+1}}"/>
+                                    <label for="{{'check1'+$index+1}}"></label>
                                 </lable>
                             </td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                        </tr>
-                        <tr>
-                            <td>
-                                <lable class="check-act">
-                                    <input type="checkbox" id="check3"/>
-                                    <label for="check3"></label>
-                                </lable>
+                            <td>{{user.userUU}}</td>
+                            <td>{{user.userName}}</td>
+                            <td>{{user.userSex == 'M'?'男':'女'}}</td>
+                            <td>{{user.userTel}}</td>
+                            <td>{{user.userEmail}}</td>
+                            <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">
+                                <a>编辑 </a><span>|</span><a> 删除</a>
                             </td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
-                            <td>s</td>
                         </tr>
                         </tbody>
                     </table>