From 2daea4a7d107d0ed6e4c2e85c7533cdc39f34a00 Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Sat, 2 Nov 2024 00:20:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=A7=92=E8=89=B2=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=88=86=E9=85=8D=E5=BC=B9=E7=AA=97=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=90=8D=E7=A7=B0=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/system/RoleList.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue
index 99e3ed2f8..81cabb916 100644
--- a/jshERP-web/src/views/system/RoleList.vue
+++ b/jshERP-web/src/views/system/RoleList.vue
@@ -50,7 +50,7 @@
             <span slot="action" slot-scope="text, record">
               <a @click="handleSetFunction(record)">分配功能</a>
               <a-divider type="vertical" />
-              <a @click="handleSetPushBtn(record.id)">分配按钮</a>
+              <a @click="handleSetPushBtn(record.id, record.name)">分配按钮</a>
               <a-divider type="vertical" />
               <a @click="handleEdit(record)">编辑</a>
               <a-divider v-if="btnEnableList.indexOf(1)>-1" type="vertical" />
@@ -181,12 +181,12 @@
     methods: {
       handleSetFunction(record) {
         this.$refs.roleFunctionModal.edit(record);
-        this.$refs.roleFunctionModal.title = "分配功能【分配之后请继续分配按钮】";
+        this.$refs.roleFunctionModal.title = record.name + "-分配功能【分配之后请继续分配按钮】";
         this.$refs.roleFunctionModal.disableSubmit = false;
       },
-      handleSetPushBtn(roleId) {
+      handleSetPushBtn(roleId, roleName) {
         this.$refs.rolePushBtnModal.edit(roleId);
-        this.$refs.rolePushBtnModal.title = "分配按钮";
+        this.$refs.rolePushBtnModal.title = roleName + "-分配按钮";
         this.$refs.rolePushBtnModal.disableSubmit = false;
       },
       roleModalFormOk() {
@@ -209,7 +209,13 @@
       handleRoleFunctionTip() {
         if(this.currentRoleId) {
           this.roleFunctionModalVisible = false
-          this.handleSetPushBtn(this.currentRoleId)
+          let roleName = ''
+          for (let i = 0; i < this.dataSource.length; i++) {
+            if(this.dataSource[i].id == this.currentRoleId) {
+              roleName = this.dataSource[i].name
+            }
+          }
+          this.handleSetPushBtn(this.currentRoleId, roleName)
         }
       },
       handleAdd: function () {