Merge branch 'release/3.0.1.2504.01-合并业务线' into custom/路维光电(业务线)

This commit is contained in:
lys 2025-10-10 11:06:16 +08:00
commit 1e64d739a4
1 changed files with 13 additions and 12 deletions

View File

@ -125,17 +125,18 @@ class EditCalcTable extends Component {
}, 500);
});
const { routeParams: { salaryAcctRecordId } } = this.props;
updateLockStatus({ ...payload, salaryAcctRecordId }).then(({ status, errormsg }) => {
if (status) {
clearInterval(this.timerLock);
this.setState({
progressVisible: false,
progress: 0
}, () => this.queryCalcResultList());
} else {
message.error(errormsg);
}
});
updateLockStatus({ ...payload, salaryAcctRecordId, acctEmpIds: this.state.selectedRowKeys })
.then(({ status, errormsg }) => {
if (status) {
clearInterval(this.timerLock);
this.setState({
progressVisible: false,
progress: 0
}, () => this.queryCalcResultList());
} else {
message.error(errormsg);
}
});
}
});
};
@ -341,4 +342,4 @@ const traverse = (arr, calcDetail) => {
};
}
});
};
};