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

types/src/interface/generalSetting.ts

@@ -1,6 +1,7 @@
 export interface IWorkbench {
   earlyWarningDays: number;
   emergencyDays: number;
+  profile?: Array<{ matterListID: string; matterID: string }>;
 }
 
 export interface IDowntimeAnnouncement {
@@ -24,5 +25,4 @@ export interface IGeneralSetting {
     secondaryCertification: boolean;
   };
   downtimeAnnouncement?: IDowntimeAnnouncement;
-  profile?: { matterListID: string; matterID: string }[];
 }

types/src/interface/process.ts

@@ -373,6 +373,13 @@ export interface IScopeType {
   value: string;
 }
 
+export enum ECodeRule {
+  currentYear = 'currentYear', // 当前年份
+  currentMonth = 'currentMont', // 当前月份
+  fixedText = 'fixedText', // 固定文本
+  autoCode = 'autoCode', // 自动编号
+}
+
 export interface IApproval {
   ID: string;
   name: string;
@@ -390,6 +397,10 @@ export interface IApproval {
     approvalLog: IScopeType[];
     approvalProgress: IScopeType[];
   };
+  code?: {
+    rules: [{ type: ECodeRule; value?: string; digit?: string }];
+    connector: string;
+  };
 }
 
 export enum ApprovalStatus {