Explorar el Código

feat(types): 项目属性相关types更新

lishihao hace 4 años
padre
commit
95eb651e64
Se han modificado 2 ficheros con 10 adiciones y 2 borrados
  1. 1 0
      types/src/interface/base.ts
  2. 9 2
      types/src/interface/project.ts

+ 1 - 0
types/src/interface/base.ts

@@ -225,6 +225,7 @@ export interface ISetData<T = any, F = any, R = any> {
 }
 
 export interface IColumnMeta {
+  ID:string;
   title: string;
   data: string;
   renderer?: string;

+ 9 - 2
types/src/interface/project.ts

@@ -56,6 +56,7 @@ export interface IProgression {
 }
 
 export interface IProgressiveInterval {
+  ID:string;
   name: string;
   progression: IProgression[];
   generalRate?: number;
@@ -114,6 +115,7 @@ export const FileTypeMap = {
 
 // 工程特征、基本信息
 export interface IInfoItem {
+  ID:string;
   key: string;
   dispName: string;
   value?: string;
@@ -148,6 +150,7 @@ export interface IEngineerFeature extends ITreeScm, IBaseEngineerFeature {}
 
 // 主要工料指标
 export interface IMaterialIndex {
+  ID:string;
   name: string;
   unit: string;
   coe: number;
@@ -155,6 +158,7 @@ export interface IMaterialIndex {
 
 // 主要工程量指标
 export interface IMainQtyIndex {
+  ID:string;
   name: string;
   unit: string;
   coe: number;
@@ -162,6 +166,7 @@ export interface IMainQtyIndex {
 
 // 主要经济指标
 export interface IEconomicIndex {
+  ID:string;
   name: string;
   value: string;
 }
@@ -228,6 +233,8 @@ export interface IProperty {
   economics?: IEconomicIndex[];
   overHeightSpecificID?: string; // 超高子目指定清单ID
   distributeSetting?: IDistributeSetting; // 强制修改叶子清单的综合单价,分摊计算定额工程量 或 分摊计算定额下的工料机消耗量。
+  colMetas?: IColumnMeta[];
+  valuationName?:string;//计价规则名称
 }
 
 // 原来的列设置太复杂了,没什么必要
@@ -269,7 +276,7 @@ export interface IProject extends ITreeScm {
   code?: string;
   createDate: number;
   property?: IProperty;
-  colMetas?: IColumnMeta[];
+ 
   changeMark?: string;
   remark?: string;
   fileVer?: string;
@@ -304,7 +311,7 @@ export interface IConstructionDefaultSetting {
   billsCalcMode: IProperty['billsCalcMode'];
   zanguCalcMode: IProperty['zanguCalcMode'];
   calcOption: IProperty['calcOption'];
-  colMetas: IProject['colMetas'];
+  colMetas: IProperty['colMetas'];
 }
 
 // 项目权限