Просмотр исходного кода

feat(types): 修改配置材料类型

zhangweicheng 5 лет назад
Родитель
Сommit
4d35bfc469
2 измененных файлов с 23 добавлено и 6 удалено
  1. 2 0
      types/src/interface/base.ts
  2. 21 6
      types/src/interface/configMaterial.ts

+ 2 - 0
types/src/interface/base.ts

@@ -4,6 +4,7 @@ import { IProject, IProjectPermission } from './project';
 import { IRation } from './ration';
 import { IFeeRateFile } from './feeRate';
 import { ICalcProgramFile } from './calculation';
+import { IConfigMaterial } from './configMaterial';
 
 export interface IAny {
   [prop: string]: any;
@@ -183,6 +184,7 @@ export interface ISubjectGetData {
   [CptModelName.projectGljs]: IProjectGlj[];
   [CptModelName.feeRateFile]: IFeeRateFile;
   [CptModelName.calcProgramFile]: ICalcProgramFile;
+  [CptModelName.configMaterials]: IConfigMaterial;
 }
 
 // getData数据接口

+ 21 - 6
types/src/interface/configMaterial.ts

@@ -9,8 +9,8 @@ export interface IEvaluateMaterial {
   specs: string;
   unit: string;
   type: number;
-  marketPrice: string;
-  quantity: string;
+  marketPrice: number;
+  quantity: number;
   locked: boolean; // 锁定,true 锁,false 不锁 默认false
   remark: string;
   originPlace?: string; // 产地
@@ -28,8 +28,8 @@ export interface IBidEvaluationMaterial {
   specs: string;
   unit: string;
   type: number;
-  marketPrice: string;
-  quantity: string;
+  marketPrice: number;
+  quantity: number;
   remark: string;
   originPlace?: string; // 产地
   vender?: string; // 厂家
@@ -50,10 +50,25 @@ export interface IContractorMaterial {
   standardPrice: string; // 基准单价
   FO: string; // 基本价格指数
   FI: string; // 现行价格指数
-  marketPrice: string;
-  quantity: string;
+  marketPrice: number;
+  quantity: number;
   remark: string;
   supply: { type: number; default: 0 };
   originPlace?: string; // 产地
   vender?: string; // 厂家
 }
+
+// 配置材料的几个属性
+export enum ConfigMaterialKey {
+  EVALUATE = 'evaluateMaterials',
+  BID = 'bidEvaluateMaterials',
+  CONTRACTOR = 'contractorMaterials',
+}
+
+// 设置材料
+export interface IConfigMaterial {
+  projectID: string;
+  [ConfigMaterialKey.EVALUATE]: IEvaluateMaterial[];
+  [ConfigMaterialKey.BID]: IBidEvaluationMaterial[];
+  [ConfigMaterialKey.CONTRACTOR]: IContractorMaterial[];
+}