需求优化2
This commit is contained in:
parent
38ceda8153
commit
39e60335ec
|
|
@ -65,7 +65,7 @@ class Home extends React.Component {
|
|||
//const isSingle = window.location.pathname.indexOf('/spa/hrm/engine') > -1;
|
||||
return (
|
||||
<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}/>
|
||||
{/* <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`}>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import {
|
|||
WeaNewScroll,
|
||||
WeaSearchGroup,
|
||||
WeaMoreButton,
|
||||
WeaPopoverHrm
|
||||
} from 'ecCom'
|
||||
|
||||
import {
|
||||
|
|
@ -56,16 +57,16 @@ export default class NewAndEditDialog extends React.Component {
|
|||
bindChangeEnvent,
|
||||
moduleName
|
||||
} = this.props;
|
||||
if(moduleName == 'jobGrade' && data.schemeId) {
|
||||
if (moduleName == 'jobGrade' && data.schemeId) {
|
||||
bindChangeEnvent(data.schemeId.value);
|
||||
}
|
||||
if(moduleName == 'staffScheme' && data.planYear){
|
||||
if (moduleName == 'staffScheme' && data.planYear) {
|
||||
bindChangeEnvent(data.planYear.value);
|
||||
}
|
||||
if(moduleName == 'department' && data.parent_comp ){
|
||||
if (moduleName == 'department' && data.parent_comp) {
|
||||
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);
|
||||
}
|
||||
};
|
||||
|
|
@ -149,10 +150,9 @@ export default class NewAndEditDialog extends React.Component {
|
|||
loading ? <div className='hrm-loading-center-small'>
|
||||
<Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={loading}></Spin>
|
||||
</div>
|
||||
: <div className={conditionLen > 1 ? '' : 'hrm-dialog-form'}>
|
||||
{conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()}
|
||||
</div>
|
||||
}
|
||||
: this.getSearchGroupForm()}
|
||||
|
||||
|
||||
</WeaDialog>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue