From 7020f1ec2e35bb46898ee0c2ec8d3ec95b3d0eab 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, 7 Feb 2023 11:25:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E8=B5=84=E8=B4=A6=E5=A5=97=E4=B8=AD?=
 =?UTF-8?q?=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=20?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B9=E6=97=B6=E6=8E=92=E5=BA=8F=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ledgerPage/components/ledgerSalaryItemAddModal.js      | 7 ++++---
 .../pages/ledgerPage/components/ledgerSalaryItemNormal.js  | 1 +
 .../pages/ledgerPage/components/ledgerSalaryItemTable.js   | 3 +--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index 0fc95a18..84a8f199 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
@@ -81,15 +81,16 @@ export default class LedgerSalaryItemAddModal extends React.Component {
 
   handleAdd = () => {
     const { dataSource, selectedRowKeys } = this.state;
-    const { onAddSalaryItems, id, onCancel } = this.props;
+    const { onAddSalaryItems, id, onCancel, itemGroups } = this.props;
+    const arrItems = _.find(itemGroups, it => it.id === id).items || [];
     let selectItems = [];
     dataSource.map((item) => {
       item = { ...item };
-      selectedRowKeys.map(key => {
+      selectedRowKeys.map((key, keyIdx) => {
         if (item.id === key) {
           item.salaryItemId = item.id;
           item.key = item.id;
-          item.sortedIndex = dataSource.length + 1;
+          item.sortedIndex = arrItems.length + keyIdx + 1;
           selectItems.push(item);
         }
       });
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
index a02492f5..578d63a4 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
@@ -175,6 +175,7 @@ class LedgerSalaryItemNormal extends Component {
               >
                 <LedgerSalaryItemTable
                   dataSource={items}
+                  selectedRowKeys={field.selectedRowKeys || []}
                   onDropCategoryItem={(data) => onDropCategoryItem(field, data)}
                   onHandleItemhide={(data) => onHandleItemhide(field, data)}
                   onChangeSelectedRowKeys={(data) => onChangeSelectedRowKeys(field, data)}
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
index 4498a36d..74dedddc 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
@@ -48,8 +48,7 @@ class LedgerSalaryItemTable extends Component {
   };
 
   render() {
-    const { dataSource, onDropCategoryItem, onChangeSelectedRowKeys, onEditFormnul } = this.props;
-    const { selectedRowKeys } = this.state;
+    const { dataSource, onDropCategoryItem, onChangeSelectedRowKeys, onEditFormnul, selectedRowKeys } = this.props;
     const rowSelection = {
       selectedRowKeys,
       onChange: (selectedRowKeys) => this.setState({ selectedRowKeys }, () => {