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

types/src/interface/budgetData.ts

@@ -32,4 +32,6 @@ export interface IBudgetData {
   reportingInstructions?: string;
   approvalType?: string;
   conditions: [condition];
+  delegateApprovalUnit: string;
+  delegateApprovalUnitReceiver: string;
 }

types/src/interface/business.ts

@@ -6,6 +6,7 @@ export interface ICostInfo {
   conclusionFee: string; // 报审金额
   billCheckPercentOfPass: string; // 清单检测合格率
   isBillCheckPassed: boolean; // 清单检测是否通过（可能是多项目）
+  minPassRate: number; // 合格率线
 }
 
 export enum ShowBusinessType {

types/src/interface/matter.ts

@@ -31,6 +31,7 @@ export interface IMatter {
   auditAmountConfig?: IAuditSummaryConfig[];
   // 审核意见组件配置
   auditCommentsConfig?: IAuditCommentConfig;
+  settlementPassingRate?: number;
 }
 
 export interface IGatherMatter extends IMatter {
@@ -107,6 +108,8 @@ export interface IProcessComponent<T = any> {
   permission: IProcessComponentPermission;
   // 组件数据
   data?: T | null;
+  // 组件标题
+  componentTitle?: string;
 }
 
 // 步骤里的事项

types/src/interface/platformSwitch.ts

@@ -2,4 +2,7 @@ export interface IPlatformSwitch {// 项目功能开关
     ID: string;
     type: string;// 开关类型
     enable: boolean;// 开关结果
+    fileFormat: string;// 文件格式
+    uploadNumber: number;// 上传数量
+    uploadSize: number;// 上传大小
 }

types/src/interface/process.ts

@@ -51,6 +51,7 @@ export enum RolePermission {
   CJK_ENABLE = 'cjkEnable', // 材价库-启用
   CJK_EDIT = 'cjkEdit', // 材价库-编辑
   BACK_STAGE_ENABLE = 'backstageEnable', // 小后台权限
+  ENABLE_NOTICE = 'enableNotice', // 管理员发布通知
   // TODO 指标库 区间对数
 }
 
@@ -144,6 +145,7 @@ export interface IProcessExecutor {
   setType: string;
   participantMode: string;
   name: string;
+  dataID: string;
   reportTime?: string; // 三合一审批流程第一位的上报时间
   scope?: string;
   members?: Members[];
@@ -170,9 +172,14 @@ export interface SimpleDynamicStep {
 // 3合1协审人信息
 export interface ICollaborator {
   ID: string; // 用户ID
+  executorInfo?: {
+    executorID: string;
+    executorName: string;
+  }; // 执行者
+  fixCollaborator?: boolean;
   institutionID?: string; // 机构ID，只在协审角色为审批单位的时候存在
   name?: string; // 用户姓名
-  deadline: string; //  截至时间
+  deadline: string | number; //  截至时间
   // 事项中组件及其权限
   inProcessMatters?: IProcessMatter[];
   // 事项后组件及其权限
@@ -196,9 +203,9 @@ export interface ICollaboratorScope {
 // 3合1参与者信息
 export interface IProcedureParticipantInfo {
   approvalWay: string;
+  configure?: any[];
   executor: {
     ID: string;
-    configure: string[];
     members?: Members[];
     reportTime?: string;
     approvaledPermission?: string[]; // 事项后原始数据
@@ -263,7 +270,7 @@ export interface IProcedureItem {
   conclusion?: string;
   addition?: string;
   reduction?: string;
-  configure?: [];
+  configure?: any[];
 }
 
 export interface IApproval {