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

types/src/interface/calculation.ts

@@ -83,3 +83,23 @@ export interface ICalcProgramFile {
   libName: string;
   programs: ICalcTemplate[];
 }
+
+// 子目增加费计算选项
+export interface IItemIncreaseCalcOption {
+  // 是否计算管理费
+  calcManage: boolean;
+  // 是否计算利润
+  calcProfit: boolean;
+}
+
+// 安装增加费计算选项
+export interface IInstallIncreaseCalcOption {
+  // 分部分项是否计算管理费
+  calcManageFBFX: boolean;
+  // 措施项目是否计算管理费
+  calcManageCSXM: boolean;
+  // 分部分项是否计算利润
+  calcProfitFBFX: boolean;
+  // 措施项目是否计算利润
+  calcProfitCSXM: boolean;
+}

types/src/interface/loginLog.ts

@@ -0,0 +1,6 @@
+enum PlatForm {
+  FRONT_END = 'frontEnd',
+  BACK_END = 'backEnd',
+}
+
+export default PlatForm;

types/src/interface/project.ts

@@ -2,7 +2,13 @@
 import { ValuationType } from './compilation';
 import { IIncreaseSetting } from './increaseFee';
 import { ITreeScm, DeleteEnum, INumFileRef, IColumnMeta } from './base';
-import { ICalcOption, ITenderSetting, IDistributeSetting } from './calculation';
+import {
+  ICalcOption,
+  ITenderSetting,
+  IDistributeSetting,
+  IItemIncreaseCalcOption,
+  IInstallIncreaseCalcOption,
+} from './calculation';
 import { IOverHeight, IOverHeightSetting } from './overHeight';
 import { ICheckOptions, IPriceScope } from './bill';
 
@@ -255,6 +261,8 @@ export interface IProperty {
   checkOptions?: ICheckOptions; // 指标检测的选项
   priceScope?: IPriceScope; // 价格区间
   checkOptionSetting?: ICheckOptions; // 检测清单、设置指标弹窗确定共用的保存设置的位置
+  itemIncreaseCalcOption?: IItemIncreaseCalcOption; // 子目增加费计算选项
+  installIncreaseCalcOption?: IInstallIncreaseCalcOption; // 安装增加费计算选项
 }
 
 // 原来的列设置太复杂了，没什么必要