فهرست منبع

fix(wise-cost-util): 流程部分方法的类型兼容处理

vian 3 سال پیش
والد
کامیت
542cf19400
1فایلهای تغییر یافته به همراه11 افزوده شده و 5 حذف شده
  1. 11 5
      wise-cost-util/src/process.ts

+ 11 - 5
wise-cost-util/src/process.ts

@@ -1,4 +1,4 @@
-import { ApprovalWay, ProcessStatus, IProcess, ApprovalStatus } from '@sc/types';
+import { ApprovalWay, ProcessStatus, IProcess, ApprovalStatus, IProcedureProcess } from '@sc/types';
 import { isEmpty } from 'lodash';
 import { isEmpty } from 'lodash';
 
 
 // 获取流程某个环节审批状态
 // 获取流程某个环节审批状态
@@ -86,7 +86,10 @@ export const getCurrentProcess = (processes: IProcess[]) => {
 };
 };
 
 
 // 获取某个环节的前一个环节
 // 获取某个环节的前一个环节
-export const getPrevProcess = (processes: IProcess[], curProcess: IProcess) => {
+export const getPrevProcess = (
+  processes: IProcess[] | IProcedureProcess[],
+  curProcess: IProcess | IProcedureProcess
+) => {
   if (isEmpty(processes)) {
   if (isEmpty(processes)) {
     return null;
     return null;
   }
   }
@@ -100,7 +103,10 @@ export const getPrevProcess = (processes: IProcess[], curProcess: IProcess) => {
 };
 };
 
 
 // 获取某个环节的下一个环节
 // 获取某个环节的下一个环节
-export const getNextProcess = (processes: IProcess[], curProcess: IProcess) => {
+export const getNextProcess = (
+  processes: IProcess[] | IProcedureProcess[],
+  curProcess: IProcess | IProcedureProcess
+) => {
   if (isEmpty(processes)) {
   if (isEmpty(processes)) {
     return null;
     return null;
   }
   }
@@ -114,7 +120,7 @@ export const getNextProcess = (processes: IProcess[], curProcess: IProcess) => {
 };
 };
 
 
 // 获取上报环节
 // 获取上报环节
-export const getReportProcess = (processes: IProcess[]) => {
+export const getReportProcess = (processes: IProcess[] | IProcedureProcess[]) => {
   if (isEmpty(processes)) {
   if (isEmpty(processes)) {
     return null;
     return null;
   }
   }
@@ -122,6 +128,6 @@ export const getReportProcess = (processes: IProcess[]) => {
 };
 };
 
 
 // 是否是上报环节
 // 是否是上报环节
-export const isReportProcess = (process: IProcess) => {
+export const isReportProcess = (process: IProcess | IProcedureProcess) => {
   return process.participantInfo && process.participantInfo.approvalWay === ApprovalWay.REPORT;
   return process.participantInfo && process.participantInfo.approvalWay === ApprovalWay.REPORT;
 };
 };