Explorar o código

feat(types): 安装增加费调整

zhangweicheng %!s(int64=4) %!d(string=hai) anos
pai
achega
73e8118f83

+ 2 - 63
types/src/interface/increaseFee.ts

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

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

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

+ 1 - 1
types/src/interface/installation.ts

@@ -52,7 +52,7 @@ export interface IInstallFeeItem {
   feeType: string; // 费用类型
   feeType: string; // 费用类型
   position: string; // 记取位置
   position: string; // 记取位置
   billID: string; // 记取位置对应的清单ID
   billID: string; // 记取位置对应的清单ID
-  isCalc: { type: boolean; default: false }; // 是否记取
+  isCalc: boolean; // 是否记取
 }
 }
 
 
 export interface IInstallation {
 export interface IInstallation {