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

release/2.10.1.2401.01

This commit is contained in:
黎永顺 2024-01-29 10:39:12 +08:00
parent 240cb316a1
commit 095a833084
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pc4mobx/hrmSalary/pages/payrollFiles/components/salaryFileList/index.js
View File

@ -172,7 +172,7 @@ class Index extends Component {
const columns = _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true"), (it, idx) => ({
dataIndex: it.dataIndex, title: it.title, align: "left",
width: (it.dataIndex === "taxAgentName" || it.dataIndex === "operate") ? 185 : 150,
fixed: it.dataIndex === "username" ? "left" : it.dataIndex === "operate" ? "right" : "",
fixed: it.dataIndex === "username" ? "left" : it.dataIndex === "operate" ? "right" : it.fixed ? it.fixed : false,
ellipsis: true
}));
if (!_.isEmpty(columns)) {

4
pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/components/welfareTableList/index.js
View File

@ -167,14 +167,14 @@ class Index extends Component {
this.setState({
pageInfo: { ...pageInfo, current, pageSize, total }, dataSource,
columns: _.map(columns, o => {
const { column: dataIndex, text: title, width } = o;
const { column: dataIndex, text: title, width, fixed } = o;
if (dataIndex === "employeeName") {
return {
dataIndex, title, width, fixed: "left", ellipsis: true
};
}
return {
dataIndex, title, width, ellipsis: true
dataIndex, title, width, ellipsis: true, fixed: fixed || false
};
})
}, () => {