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 ( 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 });