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, "信息确认"),