Commit 90c2ff6e by chenshu

feat:完善各页面

parent a7dd6c88
...@@ -33,6 +33,7 @@ class ChooseMembersModal extends React.Component { ...@@ -33,6 +33,7 @@ class ChooseMembersModal extends React.Component {
visibleTypeEnum: props.type, visibleTypeEnum: props.type,
}, },
openSetModal: false, openSetModal: false,
selectObject: {},
} }
} }
...@@ -264,7 +265,15 @@ class ChooseMembersModal extends React.Component { ...@@ -264,7 +265,15 @@ class ChooseMembersModal extends React.Component {
render() { render() {
const { type } = this.props; const { type } = this.props;
const { selectUserList, allUserList, searchKey, selectedRowKeys, openSetModal, isOpen } = this.state; const {
selectUserList,
allUserList,
searchKey,
selectedRowKeys,
openSetModal,
isOpen,
selectObject,
} = this.state;
const title = type === 'USER' ? '添加员工' : '添加用户'; const title = type === 'USER' ? '添加员工' : '添加用户';
return ( return (
<div> <div>
...@@ -346,6 +355,11 @@ class ChooseMembersModal extends React.Component { ...@@ -346,6 +355,11 @@ class ChooseMembersModal extends React.Component {
{openSetModal && {openSetModal &&
<SetEmployeeModal <SetEmployeeModal
list={selectUserList} list={selectUserList}
selectObject={selectObject}
onChange={(key, value) => {
selectObject[key] = value;
this.setState({ selectObject });
}}
onClose={() => { onClose={() => {
this.setState({ openSetModal: false, isOpen: true }) this.setState({ openSetModal: false, isOpen: true })
}} }}
......
...@@ -12,7 +12,10 @@ const tagMap = { ...@@ -12,7 +12,10 @@ const tagMap = {
export default class SetEmployeeModal extends React.Component { export default class SetEmployeeModal extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
const list = props.list.map(item => ({ ...item, roleCode: item.enterpriseRole === 'ADMIN' ? 'Cloud_Manager' : 'Cloud_Lecturer' })) const list = props.list.map(item => {
item.roleCode = (props.selectObject || {})[item.enterpriseVisibleUserId] || (item.enterpriseRole === 'ADMIN' ? 'Cloud_Manager' : 'Cloud_Lecturer');
return item;
})
const selectedData = list[0] || {}; const selectedData = list[0] || {};
this.state = { this.state = {
list, list,
...@@ -28,6 +31,7 @@ export default class SetEmployeeModal extends React.Component { ...@@ -28,6 +31,7 @@ export default class SetEmployeeModal extends React.Component {
item.roleCode = value; item.roleCode = value;
} }
}) })
this.props.onChange(selected, value);
this.setState({ roleCode: value, list }); this.setState({ roleCode: value, list });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment