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

fixed

This commit is contained in:
Chengliang 2022-09-02 16:17:54 +08:00
parent a578e4e3ab
commit 64cfbffaf0
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pc4mobx/organization/components/department/NewPopconfirm.js
View File

@ -93,7 +93,7 @@ export default class NewPopconfirm extends React.Component {
const buttons = [ const buttons = [
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => save()} disabled={loading}>{i18n.button.ok()}</Button>), (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => save()} disabled={loading}>{i18n.button.ok()}</Button>),
(<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => onCancel()} disabled={loading}>{i18n.button.cancel()}</Button>) (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@jd6baw`} type="primary" onClick={() => {this.setState({value:"0"});onCancel()}} disabled={loading}>{i18n.button.cancel()}</Button>)
]; ];
return ( return (
@ -104,7 +104,7 @@ export default class NewPopconfirm extends React.Component {
visible={visible} visible={visible}
closable={true} closable={true}
hasScroll={true} hasScroll={true}
onCancel={() => onCancel()} onCancel={() => {this.setState({value:"0"});onCancel()}}
buttons={buttons} buttons={buttons}
style={{ width: width, height: height }} style={{ width: width, height: height }}
> >

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

@ -1,7 +1,7 @@
/** /**
* @Author: 程亮 * @Author: 程亮
* @Date: 2022-06-02 09:19:37 * @Date: 2022-06-02 09:19:37
* @LastEditTime: 2022-09-01 15:06:53 * @LastEditTime: 2022-09-02 15:22:00
* @Description: * @Description:
* @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js
*/ */
@ -91,7 +91,8 @@ export default class Department extends React.Component {
} = this.props; } = this.props;
const { const {
topMenu, topMenu,
selectedRowKeys selectedRowKeys,
selectTreeNodeInfo
} = department; } = department;
let btns = []; let btns = [];
@ -102,7 +103,6 @@ export default class Department extends React.Component {
btns.push(<Button type='primary' onClick={() => this.handleClick(item)} disabled={selectedRowKeys.length > 0 ? false : true} >{item.menuName}</Button>); btns.push(<Button type='primary' onClick={() => this.handleClick(item)} disabled={selectedRowKeys.length > 0 ? false : true} >{item.menuName}</Button>);
} else { } else {
btns.push(<Button type='primary' onClick={() => this.handleClick(item)}>{item.menuName}</Button>); btns.push(<Button type='primary' onClick={() => this.handleClick(item)}>{item.menuName}</Button>);
} }
}); });
@ -703,6 +703,7 @@ export default class Department extends React.Component {
height={100} height={100}
width={400} width={400}
isMerge={isMerge} isMerge={isMerge}
defaultValue={"0"}
save={() => this.PopconfirmSave()} save={() => this.PopconfirmSave()}
onCancel={() => department.setConfirmVisible(false)} onCancel={() => department.setConfirmVisible(false)}
/> />

2
pc4mobx/organization/components/office/officeManage.js
View File

@ -425,7 +425,7 @@ export default class OfficeManage extends Component {
hasRight && <div className="office-wapper"> hasRight && <div className="office-wapper">
<WeaLeftRightLayout <WeaLeftRightLayout
isNew={true} isNew={true}
leftWidth={310} leftWidth={260}
leftCom={ leftCom={
<LeftTree deleteOfficeClassifyFlag={deleteOfficeClassifyFlag}/> <LeftTree deleteOfficeClassifyFlag={deleteOfficeClassifyFlag}/>
} }

2
pc4mobx/organization/components/sequence/Sequence.js
View File

@ -435,7 +435,7 @@ export default class Sequence extends React.Component {
isFormInit={form.isFormInit} isFormInit={form.isFormInit}
loading={dialogLoading} loading={dialogLoading}
isEdit={isEdit} isEdit={isEdit}
height={250} height={300}
conditionLen={3} conditionLen={3}
save={() => this.handleSave()} save={() => this.handleSave()}
onCancel={() => sequence.setVisible(false)} onCancel={() => sequence.setVisible(false)}

5
pc4mobx/organization/stores/jobgrade.js
View File

@ -219,7 +219,9 @@ export class JobGradeStore {
} }
getForm() { getForm() {
let params = this.isNew ? {} : { let params = this.isNew ? {
schemeId:this.selectedTreeNodeInfo.domid
} : {
id: this.gradeId id: this.gradeId
} }
this.setDialogLoadingStatus(true); this.setDialogLoadingStatus(true);
@ -228,6 +230,7 @@ export class JobGradeStore {
this.setDialogLoadingStatus(false); this.setDialogLoadingStatus(false);
res.data.condition && this.setCondition(res.data.condition); res.data.condition && this.setCondition(res.data.condition);
res.data.condition && this.form.initFormFields(res.data.condition); res.data.condition && this.form.initFormFields(res.data.condition);
this.updateConditions(this.selectedTreeNodeInfo.domid);
} else { } else {
message.warning(res.msg); message.warning(res.msg);
} }

4
pc4mobx/organization/stores/joblevel.js
View File

@ -211,7 +211,9 @@ export class JobLevelStore {
} }
getForm() { getForm() {
let params = this.isNew ? {} : { let params = this.isNew ? {
schemeId:this.selectedTreeNodeInfo.domid
} : {
id: this.levelId id: this.levelId
} }
this.setDialogLoadingStatus(true); this.setDialogLoadingStatus(true);