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 { > 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 }, () => {