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

types/src/interface/compilation.ts

@@ -89,23 +89,43 @@ export interface ISubPrice {
   };
 }
 
-interface ISubStructuralSegment {
+interface ISubStructuralSegmentProperty {
+  valuationID: string;
+  normLib: string;
+  taxType: number;
+  fileType: number;
+  calcProgramLib: {
+    ID: string;
+    name: string;
+    displayName: string;
+  };
+  engineeringID: string;
+}
+
+export interface ISubStructuralSegment {
   dispName: string;
   key: string;
   type: string;
   subItems?: ISubStructuralSegment[];
-  property?: any;
+  engineering?: string;
+  feeType?: string;
+  calcProgram?: string;
+  IndicatorSegment?: string;
+  property?: ISubStructuralSegmentProperty;
 }
 
 // 结构分布
 export interface IStructuralSegmentData {
   monomerType: string;
+  valuationName: string;
   items: ISubStructuralSegment[];
 }
 
 export interface IStructuralSegment {
   compilationID: string;
-  data: IStructuralSegmentData;
+  ID: string;
+  name: string;
+  data: IStructuralSegmentData[];
 }
 
 // 单体模板

types/src/interface/editLog.ts

@@ -15,13 +15,13 @@ export interface ILogDetail<T = any> {
   newValue?: string; // 新值
   oldValue?: string; // 旧值
   field?: string; // 修改的field
+  processID?: string; // 流程ID
 }
 
 export interface IEditLog {
   projectID: string;
   billID: string;
   constructionID: string;
-  processID?: string; // 流程ID
   updateTime: number; // 最后修改时间
   code?: string;
   name?: string;