diff --git a/pc4mobx/organization/components/department/NewPopconfirm.js b/pc4mobx/organization/components/department/NewPopconfirm.js index 87c9407..43752a5 100644 --- a/pc4mobx/organization/components/department/NewPopconfirm.js +++ b/pc4mobx/organization/components/department/NewPopconfirm.js @@ -93,7 +93,7 @@ export default class NewPopconfirm extends React.Component { const buttons = [ (), - () + () ]; return ( @@ -104,7 +104,7 @@ export default class NewPopconfirm extends React.Component { visible={visible} closable={true} hasScroll={true} - onCancel={() => onCancel()} + onCancel={() => {this.setState({value:"0"});onCancel()}} buttons={buttons} style={{ width: width, height: height }} > diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js index 0afa088..25f0857 100644 --- a/pc4mobx/organization/components/department/department.js +++ b/pc4mobx/organization/components/department/department.js @@ -1,7 +1,7 @@ /** * @Author: 程亮 * @Date: 2022-06-02 09:19:37 - * @LastEditTime: 2022-09-01 15:06:53 + * @LastEditTime: 2022-09-02 15:22:00 * @Description: * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js */ @@ -91,7 +91,8 @@ export default class Department extends React.Component { } = this.props; const { topMenu, - selectedRowKeys + selectedRowKeys, + selectTreeNodeInfo } = department; let btns = []; @@ -102,7 +103,6 @@ export default class Department extends React.Component { btns.push(); } else { btns.push(); - } }); @@ -703,6 +703,7 @@ export default class Department extends React.Component { height={100} width={400} isMerge={isMerge} + defaultValue={"0"} save={() => this.PopconfirmSave()} onCancel={() => department.setConfirmVisible(false)} /> diff --git a/pc4mobx/organization/components/office/officeManage.js b/pc4mobx/organization/components/office/officeManage.js index ed5d73b..5f088b2 100644 --- a/pc4mobx/organization/components/office/officeManage.js +++ b/pc4mobx/organization/components/office/officeManage.js @@ -425,7 +425,7 @@ export default class OfficeManage extends Component { hasRight &&