From d7b1c173c22cdc45c887a1d670a1ca32a2320a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Fri, 13 Sep 2024 14:11:26 +0800
Subject: [PATCH] =?UTF-8?q?feature/2.15.1.2407.01-=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roleManagement/components/addRoleDialog/index.js      | 4 +++-
 .../components/roleDetailSetDialog/index.js               | 8 +++++++-
 pc4mobx/hrmSalary/pages/roleManagement/index.js           | 4 +++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js
index 4ab9f000..83c24cd1 100644
--- a/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/addRoleDialog/index.js
@@ -51,7 +51,9 @@ class Index extends Component {
           if (status) {
             message.success(getLabel(111, "操作成功！"));
             this.props.onCancel(() => this.props.onSearch());
-            isSetting && this.props.showRoleSetDialog({ id: data, name: payload.name });
+            isSetting && this.props.showRoleSetDialog({
+              id: data, name: payload.name, selectedKey: "auth.MemberTargetTypeEnum"
+            });
           } else {
             message.error(errormsg);
           }
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js
index 511d2ce8..d57c0dfd 100644
--- a/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js
+++ b/pc4mobx/hrmSalary/pages/roleManagement/components/roleDetailSetDialog/index.js
@@ -62,7 +62,13 @@ class Index extends Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visible && nextProps.visible) {
-      this.setState({ name: nextProps.name, selectedKey: "baseinfo" }, () => this.getRole(nextProps.roleId));
+      this.setState({
+        name: nextProps.name, selectedKey: nextProps.selectedKey || "baseinfo"
+      }, () => {
+        this.state.selectedKey === "auth.MemberTargetTypeEnum" && this.getEnumList();
+        this.state.selectedKey === "auth.MemberTargetTypeEnum" && this.getSettingRoler(nextProps.roleId);
+        this.state.selectedKey === "baseinfo" && this.getRole(nextProps.roleId);
+      });
     } else {
       this.setState({
         selectedRowKeys: [], replaceDatas: [], pageInfo: { current: 1, pageSize: 10, total: 0 },
diff --git a/pc4mobx/hrmSalary/pages/roleManagement/index.js b/pc4mobx/hrmSalary/pages/roleManagement/index.js
index b827825e..9d667ad7 100644
--- a/pc4mobx/hrmSalary/pages/roleManagement/index.js
+++ b/pc4mobx/hrmSalary/pages/roleManagement/index.js
@@ -59,7 +59,9 @@ class Index extends Component {
       }
     });
   };
-  showRoleSetDialog = (role) => this.setState({ roleSetDialog: { visible: true, roleId: role.id, name: role.name } });
+  showRoleSetDialog = (role) => this.setState({
+    roleSetDialog: { visible: true, roleId: role.id, name: role.name, selectedKey: role.selectedKey }
+  });
   deleteAuthRole = (payload) => {
     Modal.confirm({
       title: getLabel(111, "信息确认"),