(*)数据消费审批修改

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

@@ -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') {
+      if (user?.username != 'SuperAdmin') {
-         obj.orgId = user?.orgId;
+         if (tabsKey == 'stay') {
-      } else {
+            obj.orgId = user?.orgId;
-         obj.applyById = user?.id;
+         } else {
+            obj.approveId = user?.id;
+         }
       }
 
+
       dispatch(resourceConsumption.getApproveList(obj)).then(res => {
          if (res.success) {
             setProTableList(res.payload.data)