Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
This commit is contained in:
commit
f7e895aaf0
|
|
@ -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({
|
||||
|
|
|
|||
Loading…
Reference in New Issue