diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js index aeafccb6..ef85c253 100644 --- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js +++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js @@ -30,8 +30,7 @@ class SalaryDetails extends Component { showTotalCell: false, updateSum: true, transferDialog: { visible: false, searchParamsKey: "name", dataParams: { page: "salary_details_report" }, - completeURL: "/api/bs/hrmsalary/common/pageList/get/setting" - // convertDatasource: null + completeURL: "/api/bs/hrmsalary/common/pageList/get/setting", convertDatasource: null } }; } @@ -137,7 +136,12 @@ class SalaryDetails extends Component { return []; }; handleSetDefCols = () => { - this.setState({ transferDialog: { ...this.state.transferDialog, visible: true } }); + this.setState({ + transferDialog: { + ...this.state.transferDialog, visible: true, + convertDatasource: datas => _.map(datas.setting, o => ({ id: o.id, name: o.name })) + } + }); }; render() {