From 3f26b8b6df5a1d42af1eb1c4f2262e12ec896bf3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 8 Jan 2025 16:00:05 +0800
Subject: [PATCH] =?UTF-8?q?refactor(AppRoleRightsManager):=20BUG=20526=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A7=92=E8=89=B2=E7=94=A8=E6=88=B7=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=92=8C=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD-=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=BE=E8=AE=A1=E8=A7=92=E8=89=B2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=9A=84=E5=B1=95=E7=A4=BA=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=A0=87=E7=AD=BE=E6=9B=BF?=
 =?UTF-8?q?=E4=BB=A3=E5=8E=9F=E6=9C=89=E6=A0=BC=E5=BC=8F=20-=20=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0=E5=88=97=E5=AE=BD?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E9=AB=98=E5=8F=AF=E8=AF=BB=E6=80=A7-=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=A7=92=E8=89=B2=E6=97=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=AF=E8=83=BD=E4=B8=BA=E5=90=8E=E7=BB=AD=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppRoleRightsManager.vue                  | 28 ++++++-------------
 .../xumu/AppRoleRightsManager/rightsAdd.vue   |  5 ++--
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/project/xumu/AppRoleRightsManager/AppRoleRightsManager.vue b/project/xumu/AppRoleRightsManager/AppRoleRightsManager.vue
index 16488693..ef827ae1 100644
--- a/project/xumu/AppRoleRightsManager/AppRoleRightsManager.vue
+++ b/project/xumu/AppRoleRightsManager/AppRoleRightsManager.vue
@@ -35,23 +35,12 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict"
                   @selection-change="v=>multipleSelection=v">
           <el-table-column label="角色用户" slot="users" align="center">
-            <template slot-scope="scope">
-              <el-tooltip
-                  effect="light"
-                  placement="top"
-                  :disabled="scope.row.users.length <= 2"
-                  content="更多角色用户请点击详情按钮">
-              <span v-if="scope.row.users.length">
-                {{
-                  scope.row.users
-                      .slice(0, 2)
-                      .map((e) => e.name + "(" + e.phone + ")")
-                      .join(";")
-                }}
-                <span v-if="scope.row.users.length > 2">...</span>
-              </span>
-                <span v-else>-</span>
-              </el-tooltip>
+            <template slot-scope="{row}">
+              <div class="font-12 flex wrap gap-6">
+                <el-tag size="mini" v-for="(item, i) in row.users" :key="i">{{ item.name }}
+                  <template v-if="item.phone">({{ item.phone }})</template>
+                </el-tag>
+              </div>
             </template>
           </el-table-column>
           <el-table-column slot="options" label="操作" fixed="right" align="center">
@@ -186,7 +175,7 @@ export default {
     colConfigs() {
       return [
         {type: "selection"},
-        {label: "角色名", prop: "name", width: '100px'},
+        {label: "角色名", prop: "name", width: 140},
         {label: "所属端", prop: "type", width: '100px', dict: "roleType"},
         {label: "用户数量", prop: "roleCount", align: 'center', width: '80px'},
         {slot: "users"},
@@ -248,7 +237,8 @@ export default {
         hash: "#add",
         query: {
           id: item.id,
-          name: item.name
+          name: item.name,
+          type: item.type,
         },
       });
     },
diff --git a/project/xumu/AppRoleRightsManager/rightsAdd.vue b/project/xumu/AppRoleRightsManager/rightsAdd.vue
index 1e22a792..7a74c43f 100644
--- a/project/xumu/AppRoleRightsManager/rightsAdd.vue
+++ b/project/xumu/AppRoleRightsManager/rightsAdd.vue
@@ -58,7 +58,6 @@ export default {
   data() {
     return {
       form: {},
-      roleName: '',
       id: '',
       appList: [],
       roleList: [],
@@ -73,8 +72,8 @@ export default {
   },
   created() {
     if (this.isEdit) {
-      let {id, name: roleName} = this.$route.query
-      this.form = {menus: [], id, roleName}
+      let {id, name: roleName, type} = this.$route.query
+      this.form = {menus: [], id, roleName, type}
       this.msgTitle = '编辑'
     }
     this.getPermissions()