From f6471f881e7921ba2c9bcdf985d489345c7150c3 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Tue, 19 Nov 2024 14:27:53 +0800
Subject: [PATCH] =?UTF-8?q?release/2.17.1.2411.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/ledgerPage/components/ledgerSlide.js        | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index e5514082..6c42c179 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -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>],