qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

This commit is contained in:
黎永顺 2023-02-28 18:16:17 +08:00
parent cf1f12451e
commit ef7e7d4ae5
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
View File

@ -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,

4
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
View File

@ -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}

2
pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
View File

@ -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