diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less index f24e52f2..f11be705 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/index.less @@ -93,6 +93,8 @@ flex-direction: column; .adjustSalaryFlex{ display: flex; + align-items: center; + margin-bottom: 10px; } } diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js index 81fc8739..ebe0e19d 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerAdjustRuleAddModal.js @@ -15,17 +15,17 @@ class LedgerAdjustRuleAddModal extends Component { constructor(props) { super(props); this.state = { - beforeAdjustmentType: "", - afterAdjustmentType: "", + beforeAdjustmentType: 4, + afterAdjustmentType: 1, salaryItemId: "", salaryItemName: "", - dayOfMonth: "", + dayOfMonth: "1", salaryItemOptions: [] }; } componentWillReceiveProps(nextProps, nextContext) { - if (nextProps.visible !== this.props.visible && !nextProps.salarySobId) this.listSalarySobItem(); + if (nextProps.visible !== this.props.visible && nextProps.salarySobId) this.listSalarySobItem(); } listSalarySobItem = () => { @@ -59,12 +59,12 @@ class LedgerAdjustRuleAddModal extends Component { className="adjustRuleModalWrapper" title={title} visible={visible} - style={{ width: 680 }} + style={{ width: 780 }} buttons={buttons} onCancel={onCancel} > - - + + this.setState({ salaryItemId, salaryItemName })} /> - } labelCol={{ span: 6 }} wrapperCol={{ span: 18 }}> + } labelCol={{ span: 8 }} wrapperCol={{ span: 16 }}>
如果:调薪生效日期在 this.setState({ dayOfMonth })} diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js index 47d2c529..9ab9f162 100644 --- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js +++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryAdjustmentRules.js @@ -48,7 +48,9 @@ class LedgerSalaryAdjustmentRules extends Component { }; render() { - const { taxAgentStore: { showOperateBtn }, editId, adjustRuleAddModal } = this.props; + const { taxAgentStore: { showOperateBtn }, editId } = this.props; + const { adjustRuleAddModal } = this.state; + const { dataSource, columns } = this.state; const btns = showOperateBtn ? [ ] : [];