From 8fe520e84282204a656ff367d0d39ae8f4989aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 9 Feb 2023 15:36:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ledgerPage/components/ledgerSalaryItem.js     |  2 +-
 .../components/ledgerSalaryItemAddModal.js        |  2 +-
 .../components/ledgerSalaryItemTable.js           |  2 +-
 .../pages/ledgerPage/components/ledgerSlide.js    | 15 +++++++++++++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
index 1819a321..09ef33ea 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItem.js
@@ -136,7 +136,7 @@ class LedgerSalaryItem extends Component {
         if (item.uuid === id) {
           return {
             ...item,
-            items: _.filter(item.items, it => !selectedRowKeys.includes(it.id)),
+            items: _.filter(item.items, it => !selectedRowKeys.includes(it.id || it.key)),
             selectedRowKeys: []
           };
         }
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index 0403e365..785c96b2 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 = arrItems.length + keyIdx + 1;
+          item.sortedIndex = (!_.isEmpty(_.maxBy(arrItems, it => it.sortedIndex)) ? _.maxBy(arrItems, it => it.sortedIndex).sortedIndex : 0) + keyIdx + 1 ;
           selectItems.push(item);
         }
       });
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 74dedddc..2ca2ed78 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -107,7 +107,7 @@ class LedgerSalaryItemTable extends Component {
     ];
     return (
       <WeaTable
-        rowKey="id"
+        rowKey={record => record.id || record.key}
         rowSelection={rowSelection}
         dataSource={dataSource}
         columns={columns}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
index 09b1f1cc..8ea71c01 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
@@ -112,8 +112,19 @@ class LedgerSlide extends Component {
     const { editId: salarySobId } = this.props;
     const payload = {
       empFields,
-      itemGroups: _.filter(itemGroups, it => it.name !== "未分类"),
-      items: _.find(itemGroups, it => it.name === "未分类").items || [],
+      itemGroups: _.map(_.filter(itemGroups, it => it.name !== "未分类"), item => {
+        return {
+          ...item,
+          items: _.map(item.items, it => {
+            if (it.id && it.id.length > 4) delete it.id;
+            return { ...it };
+          })
+        };
+      }),
+      items: _.map(_.find(itemGroups, it => it.name === "未分类").items, child => {
+        if (child.id && child.id.length > 4) delete child.id;
+        return { ...child };
+      }) || [],
       salarySobId: salarySobId || saveSalarySobId
     };
     this.setState({ loading: true });