release/2.18.1.2412.01-个税

This commit is contained in:
lys 2024-12-20 17:30:39 +08:00
parent 42048aa5a3
commit 1ece8f4ff2
1 changed files with 6 additions and 4 deletions

View File

@ -167,7 +167,7 @@ class LedgerSlide extends Component {
*/
taxRuleSave = () => {
const { editId } = this.props;
const { taxruleKeys, taxruleFields, saveSalarySobId, taxableItems } = this.state;
const { taxruleKeys, taxruleFields, saveSalarySobId, taxableItems, salaryApprovalStatus } = this.state;
const payload = {
salarySobId: editId || saveSalarySobId,
incomeCategoryParams: _.map(taxruleFields, it => {
@ -193,7 +193,7 @@ class LedgerSlide extends Component {
this.setState({ loading: false });
if (status) {
message.success(getLabel(22619, "保存成功!"));
!editId && (taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") && this.handleClose();
!editId && (taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") && !salaryApprovalStatus && this.handleClose();
} else {
message.error(errormsg || getLabel(22620, "保存失败!"));
}
@ -301,7 +301,7 @@ class LedgerSlide extends Component {
this.setState({ loading: false });
if (status) {
message.success(getLabel(22619, "保存成功!"));
!editId && !salaryApprovalStatus && this.handleClose();
(saveSalarySobId && !salaryApprovalStatus) && this.handleClose();
} else {
message.error(errormsg || getLabel(22620, "保存失败!"));
}
@ -454,7 +454,9 @@ class LedgerSlide extends Component {
{
key: 6, title: getLabel(111, "同步个税配置"),
createBtns:
!(taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") ?
(((taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") && salaryApprovalStatus) ||
(!(taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") && salaryApprovalStatus) ||
((taxableItems && taxableItems.toString() === "1" || taxableItems.toString() === "489") && !salaryApprovalStatus)) ?
[
<Button type="ghost" onClick={this.handleClose}>{getLabel(111, "完成,跳过所有步骤")}</Button>,
<Button type="ghost"