diff --git a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js index 6f638077..4efb90e9 100644 --- a/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js +++ b/pc4mobx/hrmSalary/pages/calculate/components/calculateDialog/index.js @@ -57,17 +57,18 @@ class Index extends Component { const { calculateStore: { calculateForm } } = this.props; calculateForm.validateForm().then(f => { if (f.isValid) { - const payload = calculateForm.getFormParams(); + const { salarySobIds, ...payload } = calculateForm.getFormParams(); this.setState({ loading: true }); - saveBasic({ ...payload }).then(({ status, data, errormsg }) => { - this.setState({ loading: false }); - if (status) { - message.success(getLabel(30700, "操作成功")); - this.props.onCancel("refresh", data); - } else { - message.error(errormsg); - } - }).catch(() => this.setState({ loading: false })); + saveBasic({ ...payload, salarySobIds: salarySobIds.split(",") }) + .then(({ status, data, errormsg }) => { + this.setState({ loading: false }); + if (status) { + message.success(getLabel(30700, "操作成功")); + this.props.onCancel("refresh", data); + } else { + message.error(errormsg); + } + }).catch(() => this.setState({ loading: false })); } else { f.showErrors(); } @@ -80,9 +81,7 @@ class Index extends Component { const itemRender = { salarySobIds: (field, textAreaProps, form, formParams) => { return ( v && form.updateFields({ freeAmount: { value: toDecimal_n(v, 2) } })} - />); + form={form} formParams={formParams}/>); } }; return ( diff --git a/pc4mobx/hrmSalary/style/index.less b/pc4mobx/hrmSalary/style/index.less index c10d1873..eedbf38d 100644 --- a/pc4mobx/hrmSalary/style/index.less +++ b/pc4mobx/hrmSalary/style/index.less @@ -40,7 +40,7 @@ background: #f6f6f6; .wea-form-item-wrapper { - display: block; + display: block !important; } .wea-form-item .wea-form-item-wrapper .wea-field-readonly {