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

Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线 

# Conflicts:
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
This commit is contained in:
lys 2025-03-27 13:50:03 +08:00
parent a0c1ab548c b443a56679
commit 10b45fdfb9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,7 +183,7 @@ class LedgerSalaryItemNormal extends Component {
<LedgerSalaryItemTable
tableData={items}
showOperateBtn={showOperateBtn}
dataSource={_.find(newDateSource, childItem => childItem.uuid === uuid).items}
dataSource={_.find(dataSource, childItem => childItem.uuid === uuid).items}
salarySobId={editId || saveSalarySobId}
selectedRowKeys={field.selectedRowKeys || []}
onDropCategoryItem={(data) => onDropCategoryItem(field, data)}