|
|
@@ -264,11 +264,11 @@ export interface IBaseRationGlj {
|
|
|
taxRate?: string; // 税率
|
|
|
}
|
|
|
|
|
|
-// 标准人材机组成物
|
|
|
-export interface IStdComponent {
|
|
|
- ID: number;
|
|
|
+// 人材机组成物
|
|
|
+export interface ILibComponent {
|
|
|
+ ID: number | string; // 可为补充、标准
|
|
|
consumeAmt: number;
|
|
|
- consumeAmtProperty: any; // 多消耗量的情况
|
|
|
+ consumeAmtProperty?: any; // 多消耗量的情况
|
|
|
}
|
|
|
|
|
|
// 标准人材机（原始数据）
|
|
|
@@ -277,7 +277,7 @@ export interface IRawStdGlj extends IBaseRationGlj {
|
|
|
repositoryId: number;
|
|
|
gljClass: number;
|
|
|
gljType: number;
|
|
|
- component: IStdComponent[];
|
|
|
+ component: ILibComponent[];
|
|
|
}
|
|
|
|
|
|
// 标准人材机
|
|
|
@@ -286,7 +286,7 @@ export interface IStdGlj extends IBaseRationGlj {
|
|
|
repositoryID: number;
|
|
|
type: number;
|
|
|
gljClass: number;
|
|
|
- components: IStdComponent[];
|
|
|
+ components: ILibComponent[];
|
|
|
from: FromType;
|
|
|
}
|
|
|
|
|
|
@@ -332,10 +332,7 @@ export interface ICptGljTreeData {
|
|
|
}
|
|
|
|
|
|
// 补充人材机组成物
|
|
|
-export interface ICptComponent {
|
|
|
- ID: number | string; // 可为补充、标准
|
|
|
- consumeAmt: number;
|
|
|
- consumeAmtProperty?: any; // 多消耗量的情况
|
|
|
+export interface ICptComponent extends ILibComponent {
|
|
|
from: FromType;
|
|
|
}
|
|
|
|
