Browse Source

refactor(types): 人材机类型变更

vian 4 years ago
parent
commit
651df87db9
1 changed files with 14 additions and 1 deletions
  1. 14 1
      types/src/interface/glj.ts

+ 14 - 1
types/src/interface/glj.ts

@@ -218,7 +218,6 @@ export interface IBaseRationGlj {
   specs?: string;
   basePrice: number;
   priceProperty?: any; // 多单价的情况
-  gljClass: number;
   model?: number; // 机型
   shortName: string;
   unit: string;
@@ -243,6 +242,7 @@ export interface IStdComponent {
 export interface IRawStdGlj extends IBaseRationGlj {
   ID: number;
   repositoryId: number;
+  gljClass: number;
   gljType: number;
   component: IStdComponent[];
 }
@@ -252,6 +252,7 @@ export interface IStdGlj extends IBaseRationGlj {
   ID: number;
   repositoryID: number;
   type: number;
+  gljClass: number;
   components: IStdComponent[];
   from: FromType;
 }
@@ -304,15 +305,27 @@ export interface ICptComponent {
   from: FromType;
 }
 
+// 补充人材机组成物的组合数据(增加一些字段用于显示)
+export interface ICptDisplayComponent extends ICptComponent {
+  code: string;
+  name: string;
+  unit: string;
+  basePrice: number;
+}
+
 // 补充人材机
 export interface ICptGlj extends IBaseRationGlj {
   ID: string;
   ownerID: string;
   type: number;
+  gljClass: string;
   compilationID: string;
   components: ICptComponent[];
+  displayComponents?: ICptDisplayComponent[];
   from: FromType;
 }
+
+// 补充人材机
 /* 补充人材机相关 ↑ */
 
 /* 选择人材机相关 ↓ */