hotfix/2.9.42309.01
This commit is contained in:
parent
9030e22449
commit
5b43e43f4a
|
|
@ -410,7 +410,13 @@ class AdjustTable extends Component {
|
|||
this.setState({
|
||||
dataSource: _.map(this.state.dataSource, it => {
|
||||
if (record.target === it.target && record.uuid === it.uuid) {
|
||||
return { ...it, status: true, id: successIds[0] };
|
||||
return {
|
||||
...it, status: true, id: successIds[0],
|
||||
targetOptions: _.map([_.find(targetOptions, o => o.employeeId == target)], v => ({
|
||||
key: v.target.toString(),
|
||||
showname: v.username
|
||||
}))
|
||||
};
|
||||
}
|
||||
return { ...it };
|
||||
})
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ class AdjustmentDefaultSlide extends Component {
|
|||
dataIndex: "categoryType", title: "统计调差福利类型(单位)",
|
||||
render: (text, record) => {
|
||||
return (
|
||||
<span>{_.map(record.categoryTypeOptions, it => it.showname).join(",")}</span>
|
||||
<span>{_.map(_.filter(record.categoryTypeOptions, o => (record.categoryType.split(",").includes(o.key))), it => it.showname).join(",")}</span>
|
||||
);
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -83,6 +83,7 @@ class AdjustmentSlide extends Component {
|
|||
};
|
||||
handleSetasDefault = () => {
|
||||
const { adjustDefSlide } = this.state;
|
||||
console.log(this.adjustTableRef.state.dataSource);
|
||||
this.setState({
|
||||
adjustDefSlide: {
|
||||
...adjustDefSlide,
|
||||
|
|
|
|||
Loading…
Reference in New Issue