|
|
@@ -1,10 +1,7 @@
|
|
|
import { ReportTree } from './report';
|
|
|
import { CptModelName, SubModelName, ActionType } from './base';
|
|
|
import { BusinessTypeKey } from './gather';
|
|
|
-import {
|
|
|
- IExecutorApprovaledPermission,
|
|
|
- IGatherExecutor,
|
|
|
-} from './gatherExecutor';
|
|
|
+import { IExecutorApprovaledPermission } from './gatherExecutor';
|
|
|
import { executorMember } from './approvalStatus';
|
|
|
|
|
|
// 环节类型
|
|
|
@@ -124,7 +121,7 @@ export interface IProcess {
|
|
|
}
|
|
|
|
|
|
// 3合1执行者
|
|
|
-export interface IExecutor {
|
|
|
+export interface IProcessExecutor {
|
|
|
ID: string;
|
|
|
permission: string[];
|
|
|
configure: string[];
|
|
|
@@ -133,20 +130,18 @@ export interface IExecutor {
|
|
|
setType: string;
|
|
|
name: string;
|
|
|
approvaledPermission: IExecutorApprovaledPermission[];
|
|
|
- // 这里维持原本类型,在gatherExecutor使用对象数据
|
|
|
- members: string[];
|
|
|
- // members?: {
|
|
|
- // ID: string;
|
|
|
- // approvalStatus: string;
|
|
|
- // approvalTime: number | string;
|
|
|
- // approvalComment: string;
|
|
|
- // }[];
|
|
|
+ members?: {
|
|
|
+ ID: string;
|
|
|
+ approvalStatus: string;
|
|
|
+ approvalTime: number | string;
|
|
|
+ approvalComment: string;
|
|
|
+ }[];
|
|
|
}
|
|
|
|
|
|
// 3合1参与者信息
|
|
|
export interface IProcedureParticipantInfo {
|
|
|
approvalWay: string;
|
|
|
- executor: IGatherExecutor;
|
|
|
+ executor: IProcessExecutor;
|
|
|
}
|
|
|
|
|
|
// 3合1分支判断信息
|