Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税

This commit is contained in:
黎永顺 2023-09-21 16:16:35 +08:00
commit f7e895aaf0
1 changed files with 2 additions and 2 deletions

View File

@ -330,7 +330,7 @@ class AdjustTable extends Component {
};
handleClick = (record) => {
const { status, id, paymentOrganization, billMonth, employeeId } = record;
const { status, id, paymentOrganization, billMonth, employeeId, target } = record;
const { targetOptions } = this.state;
if (status) {
Modal.confirm({
@ -339,7 +339,7 @@ class AdjustTable extends Component {
onOk: () => {
const payload = { id, paymentOrganization, billMonth };
compensationBack(payload).then(async ({ status, data, errormsg }) => {
const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => child.employeeId == employeeId).target });
const { data: categoryTypeOptions } = await compensationCategoryType({ id: _.find(targetOptions, child => (child.employeeId == employeeId || child.employeeId == target)).target });
if (status) {
message.success(data || "撤回成功");
this.setState({