From ef7e7d4ae52a3649bff2f5d5aa1c8396beda889d 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, 28 Feb 2023 18:16:17 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js | 2 +-
 .../pages/ledgerPage/components/ledgerSalaryItemAddModal.js   | 4 ++--
 pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
index 4079441c..acd3ed34 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
@@ -49,7 +49,7 @@ class Index extends Component {
       importPayload: {
         visible: false,
         importOpts: {
-          declareMonth: moment(new Date()).format("YYYY-MM")
+          taxYearMonth: moment(new Date()).format("YYYY-MM")
         },
         importFormComponent: null,
         step: 0,
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index 785c96b2..b2bb071b 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
@@ -90,7 +90,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
         if (item.id === key) {
           item.salaryItemId = item.id;
           item.key = item.id;
-          item.sortedIndex = (!_.isEmpty(_.maxBy(arrItems, it => it.sortedIndex)) ? _.maxBy(arrItems, it => it.sortedIndex).sortedIndex : 0) + keyIdx + 1 ;
+          item.sortedIndex = (!_.isEmpty(_.maxBy(arrItems, it => it.sortedIndex)) ? _.maxBy(arrItems, it => it.sortedIndex).sortedIndex : 0) + keyIdx + 1;
           selectItems.push(item);
         }
       });
@@ -139,7 +139,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
           />
         </div>
         <WeaTable
-          rowKey="id"
+          rowKey={record => record.id || record.key}
           rowSelection={rowSelection}
           dataSource={dataSource}
           pagination={pagination}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index e7a7757d..0b777d7f 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -125,7 +125,7 @@ class LedgerSlide extends Component {
         };
       }),
       items: _.map(_.find(itemGroups, it => it.name === "未分类").items, child => {
-        if (child.id && child.id.length > 4) delete child.id;
+        // if (child.id && child.id.length > 4) delete child.id;
         return { ...child };
       }) || [],
       salarySobId: salarySobId || saveSalarySobId