Browse Source

(*)数据消费审批修改

master
peng.peng 1 year ago
parent
commit
c1b283775b
  1. 7
      web/client/src/sections/resourceConsumption/containers/approve.js

7
web/client/src/sections/resourceConsumption/containers/approve.js

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

Loading…
Cancel
Save