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

types/src/interface/base.ts

@@ -6,6 +6,7 @@ import { IFeeRateFile } from './feeRate';
 import { ICalcProgramFile } from './calculation';
 import { IConfigMaterial } from './configMaterial';
 import { IQuantityDetail } from './quantityDetail';
+import { IInstallationFee } from './installation';
 
 export interface IAny {
   [prop: string]: any;
@@ -229,6 +230,7 @@ export interface ISubjectGetData {
   [CptModelName.feeRateFile]: IFeeRateFile;
   [CptModelName.calcProgramFile]: ICalcProgramFile;
   [CptModelName.configMaterials]: IConfigMaterial;
+  [CptModelName.installationFee]: IInstallationFee;
 }
 
 // getData数据接口

types/src/interface/increaseFee.ts

@@ -1,67 +1,6 @@
 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 {
+export interface IIncreaseSettingItem {
   name: string;
   base: string;
   coe: number;
@@ -70,5 +9,5 @@ export interface IIncreaseSettngItem {
 
 export interface IIncreaseSetting {
   isCalc: boolean;
-  setting: IIncreaseSettngItem[];
+  setting: IIncreaseSettingItem[];
 }

types/src/interface/index.ts

@@ -19,3 +19,4 @@ export * from './configMaterial';
 export * from './socket';
 export * from './enterprise';
 export * from './infoPrice';
+export * from './installation';

types/src/interface/installation.ts

@@ -0,0 +1,66 @@
+export interface IBaseFeeRule {
+  ID: string;
+  code: string;
+  rule: string;
+  base: string;
+  feeRate: number;
+  labour: number;
+  material: number;
+  machine: number;
+}
+
+// 费用章节
+export interface IStdInstallSection {
+  rationRepId: number;
+  ID: string;
+  feeItemId: string;
+  name: string;
+  feeRule: IBaseFeeRule[];
+  deleted: boolean;
+}
+// 费用项
+export interface IStdInstallFeeItem {
+  rationRepId: number;
+  ID: string;
+  feeItem: string; // 费用项
+  feeType: string; // 费用类型
+  position: string; // 记取位置
+  section: [];
+  deleted: boolean;
+}
+
+// 安装增加费-费用规则
+export interface IFeeRule extends IBaseFeeRule {
+  sectionID: string; // 分册章节id
+  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; // 费用类型
+  position: string; // 记取位置
+  billID?: string; // 记取位置对应的清单ID
+  isCalc: boolean; // 是否记取
+}
+
+export interface IInstallationFee {
+  ID: string;
+  libID: number;
+  libName: string;
+  projectID: string;
+  installFeeItems: IInstallFeeItem[];
+  installSections: IInstallSection[];
+  feeRules: IFeeRule[];
+}