liang.cheng
/
trunk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

需求优化2

This commit is contained in:
Chengliang 2022-07-11 10:06:45 +08:00
parent 38ceda8153
commit 39e60335ec
3 changed files with 631 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/organization/components/Home.js
View File

@ -65,7 +65,7 @@ class Home extends React.Component {
//const isSingle = window.location.pathname.indexOf('/spa/hrm/engine') > -1; //const isSingle = window.location.pathname.indexOf('/spa/hrm/engine') > -1;
return ( return (
<div style={{height:"100%"}}> <div style={{height:"100%"}}>
<WeaPopoverHrm ecId={`${this && this.props && this.props.ecId || ''}_WeaPopoverHrm@jp3tsb`} /> <WeaPopoverHrm inDialog={true} ecId={`${this && this.props && this.props.ecId || ''}_WeaPopoverHrm@jp3tsb`} />
<LogView ecId={`${this && this.props && this.props.ecId || ''}_LogView@mc1954`} {...this.state} onCancel={this.onCancel}/> <LogView ecId={`${this && this.props && this.props.ecId || ''}_LogView@mc1954`} {...this.state} onCancel={this.onCancel}/>
{/* <WeaLogViewComp ecId={`${this && this.props && this.props.ecId || ''}_WeaLogViewComp@mc1954`} {...this.state} onCancel={this.onCancel}/> */} {/* <WeaLogViewComp ecId={`${this && this.props && this.props.ecId || ''}_WeaLogViewComp@mc1954`} {...this.state} onCancel={this.onCancel}/> */}
<WeaLocaleProvider ecId={`${this && this.props && this.props.ecId || ''}_WeaLocaleProvider@3on3aj`}> <WeaLocaleProvider ecId={`${this && this.props && this.props.ecId || ''}_WeaLocaleProvider@3on3aj`}>

16
pc4mobx/organization/components/NewAndEditDialog.js
View File

@ -4,6 +4,7 @@ import {
WeaNewScroll, WeaNewScroll,
WeaSearchGroup, WeaSearchGroup,
WeaMoreButton, WeaMoreButton,
WeaPopoverHrm
} from 'ecCom' } from 'ecCom'
import { import {
@ -56,16 +57,16 @@ export default class NewAndEditDialog extends React.Component {
bindChangeEnvent, bindChangeEnvent,
moduleName moduleName
} = this.props; } = this.props;
if(moduleName == 'jobGrade' && data.schemeId) { if (moduleName == 'jobGrade' && data.schemeId) {
bindChangeEnvent(data.schemeId.value); bindChangeEnvent(data.schemeId.value);
} }
if(moduleName == 'staffScheme' && data.planYear){ if (moduleName == 'staffScheme' && data.planYear) {
bindChangeEnvent(data.planYear.value); bindChangeEnvent(data.planYear.value);
} }
if(moduleName == 'department' && data.parent_comp ){ if (moduleName == 'department' && data.parent_comp) {
bindChangeEnvent(data.parent_comp.value); bindChangeEnvent(data.parent_comp.value);
} }
if(moduleName == 'job' && (data.sequence_id || data.level_id)){ if (moduleName == 'job' && (data.sequence_id || data.level_id)) {
bindChangeEnvent(data); bindChangeEnvent(data);
} }
}; };
@ -149,10 +150,9 @@ export default class NewAndEditDialog extends React.Component {
loading ? <div className='hrm-loading-center-small'> loading ? <div className='hrm-loading-center-small'>
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={loading}></Spin> <Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={loading}></Spin>
</div> </div>
: <div className={conditionLen > 1 ? '' : 'hrm-dialog-form'}> : this.getSearchGroupForm()}
{conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()}
</div>
}
</WeaDialog> </WeaDialog>
) )
} }

1115
pc4mobx/organization/components/department/department.js
View File

File diff suppressed because it is too large Load Diff