From 096e5454446a023c9e524e3f198c1bab86d83620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 16 Jul 2024 11:27:34 +0800
Subject: [PATCH] =?UTF-8?q?release/2.15.1.2407.01-=E4=B8=AA=E7=A8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ledgerPage/components/ledgerSlide.js      | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index 6f2c8379..9ceedb56 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -373,39 +373,21 @@ class LedgerSlide extends Component {
         children: <LedgerBackCalculatedSalaryItem {...this.props} saveSalarySobId={saveSalarySobId}/>
       },
       {
-        key: 4, title: getLabel(111, "累计字段对应"),
+        key: 7, title: getLabel(543469, "调薪计薪规则"),
         createBtns: [
-          <Button type="ghost" onClick={this.handleClose}>{getLabel(111, "完成，跳过所有步骤")}</Button>,
           <Button type="ghost"
                   onClick={() => this.setState({ current: current - 1 })}>{getLabel(111, "上一步")}</Button>,
-          <Button type="primary" loading={loading}
-                  onClick={() => this.setState({ current: current + 1 }, () => this.addupruleSave())}>{getLabel(111, "保存并进入下一步")}</Button>
+          <Button type="primary" loading={loading} onClick={this.saveLedgerAdjustRule}>{getLabel(111, "完成")}</Button>
         ],
-        editBtns: [<Button type="primary" loading={loading}
-                           onClick={this.addupruleSave}>{getLabel(111, "保存")}</Button>],
-        children: <CumulativeFields {...this.props} saveSalarySobId={saveSalarySobId}
-                                    onSetAdduprule={(addupruleFields, selectedKey) => this.setState({
-                                      addupruleFields, addupruleKeys: selectedKey
-                                    })}/>
+        editBtns: [
+          <Button type="primary" loading={loading}
+                  onClick={this.saveLedgerAdjustRule}>{getLabel(111, "保存")}</Button>
+        ],
+        children: <LedgerSalaryAdjustmentRules {...this.props} saveSalarySobId={saveSalarySobId}
+                                               onSaveParams={(adjustRules) => this.setState({ adjustRules })}/>
       },
       {
-        key: 5, title: getLabel(111, "个税字段对应"),
-        createBtns: [
-          <Button type="ghost" onClick={this.handleClose}>{getLabel(111, "完成，跳过所有步骤")}</Button>,
-          <Button type="ghost"
-                  onClick={() => this.setState({ current: current - 1 })}>{getLabel(111, "上一步")}</Button>,
-          <Button type="primary" loading={loading}
-                  onClick={() => this.setState({ current: current + 1 }, () => this.taxRuleSave())}>{getLabel(111, "保存并进入下一步")}</Button>
-        ],
-        editBtns: [<Button type="primary" loading={loading}
-                           onClick={this.taxRuleSave}>{getLabel(111, "保存")}</Button>],
-        children: <IncomeTaxFieldsCorresponding {...this.props} saveSalarySobId={saveSalarySobId}
-                                                onSetTaxreportrule={(taxruleFields, selectedKey) => this.setState({
-                                                  taxruleFields, taxruleKeys: selectedKey
-                                                })}/>
-      },
-      {
-        key: 6, title: getLabel(111, "个税申报字段对应"),
+        key: 6, title: getLabel(111, "个税申报配置"),
         createBtns: [
           <Button type="ghost" onClick={this.handleClose}>{getLabel(111, "完成，跳过所有步骤")}</Button>,
           <Button type="ghost"
@@ -422,18 +404,36 @@ class LedgerSlide extends Component {
                                    })}/>
       },
       {
-        key: 7, title: getLabel(543469, "调薪计薪规则"),
+        key: 5, title: getLabel(111, "同步个税配置"),
         createBtns: [
+          <Button type="ghost" onClick={this.handleClose}>{getLabel(111, "完成，跳过所有步骤")}</Button>,
           <Button type="ghost"
                   onClick={() => this.setState({ current: current - 1 })}>{getLabel(111, "上一步")}</Button>,
-          <Button type="primary" loading={loading} onClick={this.saveLedgerAdjustRule}>{getLabel(111, "完成")}</Button>
-        ],
-        editBtns: [
           <Button type="primary" loading={loading}
-                  onClick={this.saveLedgerAdjustRule}>{getLabel(111, "保存")}</Button>
+                  onClick={() => this.setState({ current: current + 1 }, () => this.taxRuleSave())}>{getLabel(111, "保存并进入下一步")}</Button>
         ],
-        children: <LedgerSalaryAdjustmentRules {...this.props} saveSalarySobId={saveSalarySobId}
-                                               onSaveParams={(adjustRules) => this.setState({ adjustRules })}/>
+        editBtns: [<Button type="primary" loading={loading}
+                           onClick={this.taxRuleSave}>{getLabel(111, "保存")}</Button>],
+        children: <IncomeTaxFieldsCorresponding {...this.props} saveSalarySobId={saveSalarySobId}
+                                                onSetTaxreportrule={(taxruleFields, selectedKey) => this.setState({
+                                                  taxruleFields, taxruleKeys: selectedKey
+                                                })}/>
+      },
+      {
+        key: 4, title: getLabel(111, "累计字段对应"),
+        createBtns: [
+          <Button type="ghost" onClick={this.handleClose}>{getLabel(111, "完成，跳过所有步骤")}</Button>,
+          <Button type="ghost"
+                  onClick={() => this.setState({ current: current - 1 })}>{getLabel(111, "上一步")}</Button>,
+          <Button type="primary" loading={loading}
+                  onClick={() => this.setState({ current: current + 1 }, () => this.addupruleSave())}>{getLabel(111, "保存并进入下一步")}</Button>
+        ],
+        editBtns: [<Button type="primary" loading={loading}
+                           onClick={this.addupruleSave}>{getLabel(111, "保存")}</Button>],
+        children: <CumulativeFields {...this.props} saveSalarySobId={saveSalarySobId}
+                                    onSetAdduprule={(addupruleFields, selectedKey) => this.setState({
+                                      addupruleFields, addupruleKeys: selectedKey
+                                    })}/>
       }
     ];
     (taxableItems && taxableItems.toString() !== "1" && taxableItems.toString() !== "489") &&