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

types/src/interface/base.ts

@@ -49,6 +49,7 @@ export enum FromType {
 }
 
 export enum RationPrefix {
+  EMT = '',
   BOR = '借',
   CPT = '补',
   REP = '换',

types/src/interface/ration.ts

@@ -296,8 +296,6 @@ export interface IRation extends IBRBase {
   model?: number; // 机型
   adjCoe?: number;
   remark?: string; // 备注
-  bookmarkBackground?: string; // 书签背景色
-  bookmarkAnnotation?: string; // 批注
   overHeight?: string; // 超高降效
   referenceRationList?: any; // { type: Array; default: [] }; // 关联的定额ID列表，如超高子目关联的定额ID列表
   // 定额子项

types/src/interface/report.ts

@@ -1,3 +1,8 @@
+
+export interface ReportFlags{
+   constructSumType?: string | null, taxType?: string | null, auditType?: string | null 
+}
+
 export interface ReportSubTree {
   nodeType: number;
   refId: number;
@@ -5,6 +10,8 @@ export interface ReportSubTree {
   ID: number;
   released: boolean;
   items: ReportSubTree[] | null;
+  flags?:ReportFlags;
+
 }
 export interface ReportTree {
   compilationId: string;
@@ -13,4 +20,27 @@ export interface ReportTree {
   isDeleted: boolean;
   name: string;
   items: ReportSubTree[] | null;
+  flags?: { constructSumType?: string | null, taxType?: string | null, auditType?: string | null };
+}
+
+
+//汇总项目信息
+export interface Summary {
+  compilationIllustration: string;
+  name: string;
+}
+// 汇总项目明细
+export interface SummaryDetail {
+  buildingArea: string;
+  charge: number;
+  engineeringCost: number;
+  estimate: number;
+  measure: number;
+  name: string;
+  other: number;
+  perCost: string;
+  rate: number;
+  safetyConstruction: number;
+  subEngineering: number;
+  tax: number;
 }