|
|
@ -30,14 +30,17 @@ function Approve({ loading, clientHeight, actions, dispatch, user }) { |
|
|
|
const obj = { |
|
|
|
approveState: tabsKey == 'stay' ? "审批中" : '已审批', |
|
|
|
...formData, ...data, |
|
|
|
approveId: (tabsKey == 'stay' && user?.username != 'SuperAdmin') ? user?.id : null, |
|
|
|
// approveId: (tabsKey == 'stay' && user?.username != 'SuperAdmin') ? user?.id : null,
|
|
|
|
} |
|
|
|
if (tabsKey == 'stay') { |
|
|
|
obj.orgId = user?.orgId; |
|
|
|
} else { |
|
|
|
obj.applyById = user?.id; |
|
|
|
if (user?.username != 'SuperAdmin') { |
|
|
|
if (tabsKey == 'stay') { |
|
|
|
obj.orgId = user?.orgId; |
|
|
|
} else { |
|
|
|
obj.approveId = user?.id; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
dispatch(resourceConsumption.getApproveList(obj)).then(res => { |
|
|
|
if (res.success) { |
|
|
|
setProTableList(res.payload.data) |
|
|
|