diff --git a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js index df581337..b1b07677 100644 --- a/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js +++ b/pc4mobx/hrmSalary/pages/employeedeclareDetail/components/employeeDeclareDetailSchemaEditDialog.js @@ -33,7 +33,7 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { componentWillReceiveProps(nextProps, nextContext) { if (nextProps.visible !== this.props.visible && nextProps.visible) this.employeedeclareGetForm(nextProps); if (nextProps.visible !== this.props.visible && !nextProps.visible) { - this.props.employeeDeclareStore.initDeclareForm() + this.props.employeeDeclareStore.initDeclareForm(); this.employeeChangeInfo = {}; } } @@ -169,7 +169,9 @@ class EmployeeDeclareDetailSchemaEditDialog extends Component { }, () => { declareForm.initFormFields(this.state.eConditions); const [employeeData] = this.state.employeeInfo["employee"] || this.employeeChangeInfo["employee"] || []; + const { employmentStatus } = declareForm.getFormParams(), { dismissDate } = this.state.employeeInfo; !_.isEmpty(employeeData) && declareForm.updateFields({ + dismissDate: (employmentStatus === "ABNORMAL" && !dismissDate) ? employeeData.dismissDate : (dismissDate || ""), employeeType: { value: [employeeData._entityType, [employeeData.id, employeeData.name, [{ id: employeeData.id,