feat(types): 增加费、人工系数类型

types/src/interface/Compliation.ts

@@ -1,7 +1,7 @@
 /* eslint-disable camelcase */
 import { ELockInfo } from './User';
 import { TaxType, IGLJCol } from './project';
-import { IFileRef } from './base';
+import { IFileRef, INumFileRef } from './base';
 
 export interface ICptItem {
   ID: string;
@@ -43,10 +43,10 @@ export interface IEngineering {
   infoLib?: IFileRef[];
   featureLib?: IFileRef[];
   artificialLib?: IFileRef[];
-  billLib?: IFileRef[];
+  billLib?: INumFileRef[];
   billsGuidanceLib?: IFileRef[];
-  gljLib?: IFileRef[];
-  rationLib?: IFileRef[];
+  gljLib?: INumFileRef[];
+  rationLib?: INumFileRef[];
   progressiveLib?: IFileRef[];
   taxGroup: ITaxGroup[];
 }

types/src/interface/base.ts

@@ -13,6 +13,11 @@ export interface IFileRef {
   name: string;
 }
 
+export interface INumFileRef {
+  ID: number;
+  name: string;
+}
+
 export enum DeleteEnum {
   NORMAL = 1,
   DELETED,

types/src/interface/increaseFee.ts

@@ -0,0 +1,74 @@
+import { IAny } from './base';
+
+export interface IStdFeeRule {
+  ID: string;
+  code: string;
+  rule: string;
+  base: string;
+  feeRate?: number;
+  labour: number;
+  material: number;
+  machine: number;
+}
+
+export interface IStdInstallFeeItem {
+  rationRepId: number;
+  ID: string;
+  feeItem: string;
+  feeType: string;
+  position?: string;
+  section: { ID: string }[];
+}
+
+export interface IStdInstallSection {
+  rationRepId: number;
+  ID: string;
+  name: string;
+  feeItemId: string;
+  feeRule: IStdFeeRule[];
+}
+
+export interface IFeeRule extends IStdFeeRule {
+  sectionID: string;
+  feeItemID: string;
+  position?: string; // 记取位置
+  billID?: string; // 记取位置对应的清单ID
+}
+
+export interface IInstallSection {
+  ID: string;
+  feeItemID: string;
+  feeRuleID: string;
+  name: string;
+}
+
+export interface IInstallFeeItem {
+  ID: string;
+  feeItem: string; // 费用项
+  feeType: string; // 费用类型
+  isCalc?: boolean; // 是否记取
+  position?: string; // 记取位置
+  billID?: string; // 记取位置对应的清单ID
+}
+
+export interface IInstallFee {
+  ID?: string;
+  libID?: number;
+  libName?: string;
+  projectID?: string;
+  installFeeItem: IInstallFeeItem[];
+  installSection: IInstallSection[];
+  feeRule: IFeeRule[];
+}
+
+export interface IIncreaseSettngItem {
+  name: string;
+  base: string;
+  coe: number;
+  scope: IAny;
+}
+
+export interface IIncreaseSetting {
+  isCalc: boolean;
+  setting: IIncreaseSettngItem[];
+}

types/src/interface/index.ts

@@ -4,3 +4,5 @@ export * from './User';
 export * from './calculation';
 export * from './systemSetting';
 export * from './project';
+export * from './increaseFee';
+export * from './labourCoe';

types/src/interface/labourCoe.ts

@@ -0,0 +1,29 @@
+import { ITreeScm } from './base';
+
+export interface IStdLabourCoeItem {
+  ID: number;
+  ParentID: number;
+  name: string;
+  coe: number;
+}
+
+export interface IStdLabourCoe {
+  ID: number;
+  libName: string;
+  region: string;
+  coes: IStdLabourCoeItem[];
+}
+
+export interface ILabourCoeItem extends ITreeScm {
+  name: string;
+  coe: number;
+}
+
+export interface ILabourCoe {
+  ID: string;
+  projectID: string;
+  name: string;
+  libID: number;
+  libName: string;
+  coes: ILabourCoeItem[];
+}

types/src/interface/project.ts

@@ -1,3 +1,4 @@
+import { IIncreaseSetting } from './increaseFee';
 import { ITreeScm, IFileRef, DeleteEnum } from './base';
 import { ICalcOption, ITenderSetting } from './calculation';
 
@@ -127,6 +128,7 @@ export interface IProperty {
   region?: string;
   isInstall?: boolean; // 是否是安装工程
   isItemIncrease?: boolean; // 是否是子目增加
+  itemIncreaseSetting?: IIncreaseSetting;
   isAreaIncrease?: boolean; // 是否是面积增加
   featureLibID?: string; // 工程特征
   indexName?: string; // 指标名称
@@ -148,6 +150,7 @@ export interface IProperty {
   overHeightOption?: OverHeightOption; // 超高降效选项
   basicInfo?: IInfoItem[]; // 基本信息
   feature?: IInfoItem[]; // 工程特征
+  progressiveInterval?: IProgressiveInterval[]; // 累进区间
   gljAdjustType?: GLJAdjustType; // 承包人材料调整类型
   cptIllustration?: string; // 编制说明
 }