Merge branch 'master' of http://192.168.1.41:3000/SmartCost/SCCommon

types/src/interface/process.ts

@@ -118,11 +118,14 @@ export interface IProcessDataDoc {
 export enum SimpleProcessStatus {
   APPROVED = 'approved', // 审批通过
   FAILED = 'failed', // 失败
+  REPORTED = 'reported', // 上报
 }
 
+// 审批待办类型
 export enum ApprovalType {
   APPROVER = 'approver', // 审批
   COREVIEW = 'coreview', // 协审
+  REPORT = 'report', // 上报
 }
 
 // 流程环节待办列表项

wise-cost-util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/wise-cost-util",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "wise-cost项目前后端业务通用工具包",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

wise-cost-util/src/process.ts

@@ -63,12 +63,8 @@ export const getCurrentProcess = (processes: IProcess[]) => {
     const {
       participantInfo: { approvalWay, accounts },
     } = processes[i];
-    // 上报审批
-    // if (approvalWay === ApprovalWay.REPORT) {
-    //   continue;
-    // }
-    // 指定用户
-    if (approvalWay === ApprovalWay.ACCOUNT) {
+    // 指定用户 或 上报审批
+    if (approvalWay === ApprovalWay.ACCOUNT || approvalWay === ApprovalWay.REPORT) {
       const { status } = accounts[0];
       if (status === ProcessStatus.ACTIVATING) {
         return processes[i];