From 1ece8f4ff22eb1b3ff2381f6b19073e96f06eeec Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Fri, 20 Dec 2024 17:30:39 +0800
Subject: [PATCH] =?UTF-8?q?release/2.18.1.2412.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         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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