release/2.17.1.2411.01
This commit is contained in:
parent
b0a45c9bbe
commit
2261cf3104
|
|
@ -177,8 +177,9 @@ class SalaryDetails extends Component {
|
|||
}
|
||||
});
|
||||
converCheckedCol = (data) => {
|
||||
const { salaryDetailShowType } = this.props;
|
||||
return _.reduce(data.checked || [], (pre, cur) => {
|
||||
const item = _.find(data.setting, k => (k.id === cur) || (k.column === cur.column));
|
||||
const item = _.find(data.setting, k => (salaryDetailShowType !== "1" && k.id === cur) || (salaryDetailShowType === "1" && k.column === cur.column));
|
||||
if (!_.isEmpty(item)) return [...pre, { ...item, id: item.id || item.column, name: item.name || item.text }];
|
||||
return pre;
|
||||
}, []);
|
||||
|
|
|
|||
Loading…
Reference in New Issue