diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js index 1a0caae7..8d0561b3 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js @@ -174,8 +174,7 @@ class SalaryDetails extends Component { columns: _.map(columns, (it, idx) => ({ dataIndex: it.column || it.dataIndex, title: it.text || it.title, calcDetail: true, showSee: false, width: (it.dataIndex === "taxAgent" || it.dataIndex === "salarySob") ? 176 : (it.width || it.oldWidth), - fixed: (idx === 1 || idx === 0 || idx === 2) ? "left" : "", - ellipsis: true + fixed: it.fixed, ellipsis: true })) }); } diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js index c6e01540..67b98bd6 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js @@ -33,7 +33,7 @@ class Index extends Component { conditions: [], convertConditions: [], reportConditions: [], - selectedKey: "statistics", + selectedKey: "salaryDetail", reportName: "", keyword: "", year: moment().format("YYYY"),