|
@@ -2,7 +2,7 @@ import { ApprovalWay, ProcessStatus, IProcess, ApprovalStatus, IProcedureProcess
|
|
|
import { isEmpty } from 'lodash';
|
|
import { isEmpty } from 'lodash';
|
|
|
|
|
|
|
|
// 获取流程某个环节审批状态
|
|
// 获取流程某个环节审批状态
|
|
|
-export const getProcedureProcessStatus = (process: IProcedureProcess) => {
|
|
|
|
|
|
|
+export const getProcedureProcessStatus = (process: IProcedureProcess): ProcessStatus => {
|
|
|
if (!process.participantInfo) {
|
|
if (!process.participantInfo) {
|
|
|
return ProcessStatus.WAITING;
|
|
return ProcessStatus.WAITING;
|
|
|
}
|
|
}
|
|
@@ -15,7 +15,7 @@ export const getProcedureProcessStatus = (process: IProcedureProcess) => {
|
|
|
// 指定用户 退回上一环节为上报审批时,判断流程状态和指定用户一样
|
|
// 指定用户 退回上一环节为上报审批时,判断流程状态和指定用户一样
|
|
|
if (approvalWay === ApprovalWay.ACCOUNT || approvalWay === ApprovalWay.REPORT) {
|
|
if (approvalWay === ApprovalWay.ACCOUNT || approvalWay === ApprovalWay.REPORT) {
|
|
|
const { approvalStatus } = members[0];
|
|
const { approvalStatus } = members[0];
|
|
|
- return approvalStatus;
|
|
|
|
|
|
|
+ return approvalStatus as ProcessStatus;
|
|
|
}
|
|
}
|
|
|
// 会签 或者 依次审批
|
|
// 会签 或者 依次审批
|
|
|
if (approvalWay === ApprovalWay.JOINTLYSIGN || approvalWay === ApprovalWay.ORDERAPPROVAL) {
|
|
if (approvalWay === ApprovalWay.JOINTLYSIGN || approvalWay === ApprovalWay.ORDERAPPROVAL) {
|
|
@@ -44,7 +44,7 @@ export const getProcedureProcessStatus = (process: IProcedureProcess) => {
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
// 获取流程的状态
|
|
// 获取流程的状态
|
|
|
-export const getProcedureApprovalStatus = (processes: IProcedureProcess[]) => {
|
|
|
|
|
|
|
+export const getProcedureApprovalStatus = (processes: IProcedureProcess[]): ApprovalStatus | undefined => {
|
|
|
if (isEmpty(processes)) {
|
|
if (isEmpty(processes)) {
|
|
|
return undefined;
|
|
return undefined;
|
|
|
}
|
|
}
|