release/2.17.1.2411.01-个税
This commit is contained in:
parent
d5ecc6ae74
commit
f6471f881e
|
|
@ -20,8 +20,8 @@ import CumulativeFields from "./cumulativeFields";
|
|||
import WeaTopTitle from "../../../components/custom-title/weaTopTitle";
|
||||
import WeaReqTitle from "../../../components/custom-title/weaReqTitle";
|
||||
import {
|
||||
salaryApprovalSaveForm,
|
||||
addupruleSave,
|
||||
salaryApprovalSaveForm,
|
||||
saveAdjustmentRule,
|
||||
saveLedgerBasic,
|
||||
saveLedgerItem,
|
||||
|
|
@ -250,7 +250,7 @@ class LedgerSlide extends Component {
|
|||
addupruleSave = () => {
|
||||
const {
|
||||
taxableItems, incomeTaxFields, incomeTaxKeys, addupruleFields,
|
||||
addupruleKeys, saveSalarySobId
|
||||
addupruleKeys, saveSalarySobId, salaryApprovalStatus
|
||||
} = this.state;
|
||||
const { editId } = this.props;
|
||||
if ((!editId && taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489")) {
|
||||
|
|
@ -301,7 +301,7 @@ class LedgerSlide extends Component {
|
|||
this.setState({ loading: false });
|
||||
if (status) {
|
||||
message.success(getLabel(22619, "保存成功!"));
|
||||
!editId && this.handleClose();
|
||||
!editId && !salaryApprovalStatus && this.handleClose();
|
||||
} else {
|
||||
message.error(errormsg || getLabel(22620, "保存失败!"));
|
||||
}
|
||||
|
|
@ -478,7 +478,10 @@ class LedgerSlide extends Component {
|
|||
createBtns: [
|
||||
<Button type="ghost"
|
||||
onClick={() => this.setState({ current: current - 1 })}>{getLabel(111, "上一步")}</Button>,
|
||||
<Button type="primary" loading={loading} onClick={this.addupruleSave}>{getLabel(111, "完成")}</Button>
|
||||
<Button type="primary" loading={loading}
|
||||
onClick={() => this.setState({ current: !salaryApprovalStatus ? current : current + 1 }, () => this.addupruleSave())}>
|
||||
{!salaryApprovalStatus ? getLabel(111, "完成") : getLabel(111, "保存并进入下一步")}
|
||||
</Button>
|
||||
],
|
||||
editBtns: [<Button type="primary" loading={loading}
|
||||
onClick={this.addupruleSave}>{getLabel(111, "保存")}</Button>],
|
||||
|
|
|
|||
Loading…
Reference in New Issue