Bladeren bron

feat(types): 存入指标库相关

zhangweicheng 3 jaren geleden
bovenliggende
commit
851131bf3e
2 gewijzigde bestanden met toevoegingen van 21 en 11 verwijderingen
  1. 12 8
      types/src/interface/bill.ts
  2. 9 3
      types/src/interface/project.ts

+ 12 - 8
types/src/interface/bill.ts

@@ -120,6 +120,17 @@ export interface IPriceScope {
   maxUnitPrice: number;
   maxUnitPrice: number;
 }
 }
 
 
+export interface ICheckOptions {
+  fileType: string;
+  year: string;
+  projLocation: string;
+  projectType: string;
+  engineerType: string;
+  classCode?: string;
+  indexType?: string;
+  unit?: string;
+}
+
 export interface IBill extends IBRBase {
 export interface IBill extends IBRBase {
   flag?: FixedFlag; // 清单固定类别
   flag?: FixedFlag; // 清单固定类别
   recharge?: string; // 补注
   recharge?: string; // 补注
@@ -150,6 +161,7 @@ export interface IBill extends IBRBase {
   groupCode?: string; // 类别组,当机器检测结果不正确时,纠正措施
   groupCode?: string; // 类别组,当机器检测结果不正确时,纠正措施
   checkRationResult?: string; // 机器检测结果(必套、选套、错套定额相关)
   checkRationResult?: string; // 机器检测结果(必套、选套、错套定额相关)
   checked?: boolean; // 是否已经进行清单检测过的清单,为true表式已经检测过了(用来计算通过率)
   checked?: boolean; // 是否已经进行清单检测过的清单,为true表式已经检测过了(用来计算通过率)
+  checkOptions?: ICheckOptions; // 清单检测时保存的筛选条件
   setParentQuantity?: boolean; // 是否打勾了填父量
   setParentQuantity?: boolean; // 是否打勾了填父量
   [key: string]: any; // 剩下的之后补充
   [key: string]: any; // 剩下的之后补充
 }
 }
@@ -304,11 +316,3 @@ export enum LibType {
 export interface IBillOption extends INumFileRef {
 export interface IBillOption extends INumFileRef {
   libType?: LibType;
   libType?: LibType;
 }
 }
-
-export interface IBillCheckOptions {
-  fileType: FileType[];
-  year: string;
-  projLocation: string;
-  projectType: string;
-  engineerType: string;
-}

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

@@ -3,9 +3,8 @@ import { ValuationType } from './compilation';
 import { IIncreaseSetting } from './increaseFee';
 import { IIncreaseSetting } from './increaseFee';
 import { ITreeScm, DeleteEnum, INumFileRef, IColumnMeta } from './base';
 import { ITreeScm, DeleteEnum, INumFileRef, IColumnMeta } from './base';
 import { ICalcOption, ITenderSetting, IDistributeSetting } from './calculation';
 import { ICalcOption, ITenderSetting, IDistributeSetting } from './calculation';
-import { ISharePermission } from './share';
 import { IOverHeight, IOverHeightSetting } from './overHeight';
 import { IOverHeight, IOverHeightSetting } from './overHeight';
-import { IProcessAccount } from './process';
+import { ICheckOptions, IPriceScope } from './bill';
 
 
 // 项目类型
 // 项目类型
 export enum ProjectType {
 export enum ProjectType {
@@ -247,6 +246,9 @@ export interface IProperty {
   saveLog?: boolean; // 记录项目编辑log
   saveLog?: boolean; // 记录项目编辑log
   indexType?: string; // 指标项目分类用于指标入库
   indexType?: string; // 指标项目分类用于指标入库
   normLib?: string;
   normLib?: string;
+  saveToIndex?: boolean; // 是否已经入库
+  checkOptions?: ICheckOptions; // 指标检测的选项
+  priceScope?: IPriceScope; // 价格区间
 }
 }
 
 
 // 原来的列设置太复杂了,没什么必要
 // 原来的列设置太复杂了,没什么必要
@@ -423,13 +425,15 @@ export interface ISaveProjectInfo {
   unitID?: string;
   unitID?: string;
   singleID?: string;
   singleID?: string;
   constructionID?: string;
   constructionID?: string;
-  indexTypes: string[];
+  indexType: string; // 工程分类
+  indexTypes: string[]; // 自身的工程分类以及祖先项的分类数组
   projLocation: string;
   projLocation: string;
   year: string;
   year: string;
   month: string;
   month: string;
   fileType: FileType;
   fileType: FileType;
   unit?: string;
   unit?: string;
   quantity?: string;
   quantity?: string;
+  sourceName: string;
 }
 }
 
 
 export interface ICommonIndex {
 export interface ICommonIndex {
@@ -437,8 +441,10 @@ export interface ICommonIndex {
   parentID: string;
   parentID: string;
   seq: number;
   seq: number;
   type: ProjectType;
   type: ProjectType;
+  sourceName: string;
   name?: string;
   name?: string;
   constructionID?: string;
   constructionID?: string;
+  indexType: string; // 工程分类
   indexTypes: string[];
   indexTypes: string[];
   projLocation: string;
   projLocation: string;
   year: string;
   year: string;