fixed

pc4mobx/organization/components/department/NewPopconfirm.js

@@ -93,7 +93,7 @@ export default class NewPopconfirm extends React.Component {
 
         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={() => 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 (
@@ -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 }}
             >

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(<Button type='primary' onClick={() => this.handleClick(item)} disabled={selectedRowKeys.length > 0 ? false : true} >{item.menuName}</Button>);
             } else {
                 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}
                     width={400}
                     isMerge={isMerge}
+                    defaultValue={"0"}
                     save={() => this.PopconfirmSave()}
                     onCancel={() => department.setConfirmVisible(false)}
                 />

pc4mobx/organization/components/office/officeManage.js

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

pc4mobx/organization/components/sequence/Sequence.js

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

pc4mobx/organization/stores/jobgrade.js

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

pc4mobx/organization/stores/joblevel.js

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