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

hotfix/2.9.42310.02

This commit is contained in:
黎永顺 2023-10-30 08:55:15 +08:00
parent 32e01016c1
commit 4acdff060c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/editCalcTable.js
View File

@ -152,7 +152,10 @@ class EditCalcTable extends Component {
const sumRowlistUrl = this.props.showTotalCell ? "/api/bs/hrmsalary/salaryacct/acctresult/sum" : "";
this.postMessageToChild({
dataSource, pageInfo, selectedRowKeys, showTotalCell: this.props.showTotalCell, sumRowlistUrl, payload,
columns: _.map(traverse(columns), (it, idx) => ({ ...it, fixed: idx < 2 ? "left" : false }))
columns: _.every(traverse(columns), (it, idx) => !it.fixed) ? _.map(traverse(columns), (it, idx) => ({
...it,
fixed: idx < 2 ? "left" : false
})) : traverse(columns)
});
});
}
@ -201,11 +204,12 @@ const traverse = (arr) => {
if (!_.isEmpty(item.children)) {
return {
title: item.text, width: item.width + "px", ellipsis: true,
dataIndex: item.column, children: traverse(item.children)
dataIndex: item.column, children: traverse(item.children),
fixed: item.fixed || false
};
} else {
return {
title: item.text, width: item.width + "px",
title: item.text, width: item.width + "px", fixed: item.fixed || false,
dataIndex: item.column, ellipsis: true, lockStatus: item.lockStatus
};
}