用户管理页多角色显示效果优化

Signed-off-by: TanYibin <5491541@qq.com>

用户管理页多角色显示效果优化
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent 580609fa
Showing 3 changed files with 30 additions and 24 deletions
ant-design-vue-jeecg/src/views/system/UserList.vue
ant-design-vue-jeecg/src/views/system/config/AddressList.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@@ -113,8 +113,8 @@
           </a-tag>
         </span>
  
-        <span slot="selectedRoles" slot-scope="selectedRoles" >
-          <a-tag v-for="selectedRole in selectedRoles" :key="selectedRole" color=pink>
+        <span slot="selectedRoleList" slot-scope="selectedRoleList" >
+          <a-tag v-for="selectedRole in selectedRoleList" :key="selectedRole" color=pink>
             {{ solutionRole(selectedRole) }}
           </a-tag>
         </span>
@@ -132,19 +132,12 @@
         </template>
  
         <span slot="action" slot-scope="text, record">
-          <a v-has="'user:edit'" @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
+          <a v-has="'user:edit'" @click="handleEdit(record)">编辑</a><a-divider type="vertical"/>
+          <a-dropdown><a class="ant-dropdown-link">更多<a-icon type="down"/></a>
             <a-menu slot="overlay">
               <a-menu-item>
                 <a href="javascript:;" @click="handleDetail(record)">详情</a>
               </a-menu-item>
-
               <a-menu-item>
                 <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
               </a-menu-item>
@@ -266,9 +259,10 @@ export default {
         {
           title: '角色',
           align: "center",
-          dataIndex: 'selectedRoles',
-          key: 'selectedRoles',
-          scopedSlots: {customRender: 'selectedRoles'}
+          dataIndex: 'selectedRoleList',
+          key: 'selectedRoleList',
+          scopedSlots: {customRender: 'selectedRoleList'},
+          width: 200
         },
         // {
         //   title: '生日',
@@ -5,16 +5,6 @@
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="任务名称">
-              <j-input placeholder="请输入任务名称" v-model="queryParam.remark"></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="编码">
-              <j-input placeholder="请输入编码" v-model="queryParam.param"></j-input>
-            </a-form-item>
-          </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="库区">
               <a-select show-search placeholder="请选择库区" option-filter-prop="children" v-model="queryParam.zoneCode" >
                 <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">
@@ -24,6 +14,16 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="接口名称">
+              <j-input placeholder="请输入接口名称" v-model="queryParam.remark"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="编码">
+              <j-input placeholder="请输入编码" v-model="queryParam.param"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
@@ -190,6 +190,18 @@ public class SysUser implements Serializable {
      * 多角色id，编辑用户的时候设置
      */
     private String selectedRoles;
+    
+    @TableField(exist = false)
+    private List<String> selectedRoleList;
+
+    public void setSelectedRoles(String selectedRoles) {
+        if (!StringUtils.isEmpty(selectedRoles)) {
+            this.selectedRoles = selectedRoles;
+            this.selectedRoleList = Arrays.asList(selectedRoles.split(","));
+        } else {
+            this.selectedRoles = selectedRoles;
+        }
+    }
  
     /** 设备id uniapp推送用 */
     private String clientId;