|
|
@@ -56,7 +56,7 @@ export interface IStdRationGljRef extends IBaseRationGljRef {
|
|
|
}
|
|
|
|
|
|
export interface ICptRationGljRef extends IBaseRationGljRef {
|
|
|
- gljId: string; // 原std库已经是这样,不能改成ID
|
|
|
+ gljId: string | number; // 原std库已经是这样,不能改成ID
|
|
|
}
|
|
|
export interface IStdRationAss {
|
|
|
name: string;
|
|
|
@@ -151,22 +151,22 @@ export interface IRationCoe {
|
|
|
}
|
|
|
|
|
|
export interface IBaseRation {
|
|
|
- code: string;
|
|
|
- name: string;
|
|
|
- unit: string;
|
|
|
+ code?: string;
|
|
|
+ name?: string;
|
|
|
+ unit?: string;
|
|
|
basePrice: number;
|
|
|
labourPrice: number;
|
|
|
materialPrice: number;
|
|
|
machinePrice: number;
|
|
|
- caption: string;
|
|
|
- feeType: number;
|
|
|
- jobContent: string;
|
|
|
- annotation: string;
|
|
|
- manageFeeRate: string; // 管理费费率
|
|
|
- rationCoeList: ICoeList[];
|
|
|
- rationAssList: IStdRationAss[];
|
|
|
- rationInstList: IStdRationInstall[];
|
|
|
- rationTemplateList: IStdRationTemp[];
|
|
|
+ caption?: string;
|
|
|
+ feeType?: number;
|
|
|
+ jobContent?: string;
|
|
|
+ annotation?: string;
|
|
|
+ manageFeeRate?: string; // 管理费费率
|
|
|
+ rationCoeList?: ICoeList[];
|
|
|
+ rationAssList?: IStdRationAss[];
|
|
|
+ rationInstList?: IStdRationInstall[];
|
|
|
+ rationTemplateList?: IStdRationTemp[];
|
|
|
fromType?: FromType; // 单条查找结果时用到
|
|
|
}
|
|
|
export interface IStdRation extends IBaseRation {
|
|
|
@@ -179,7 +179,8 @@ export interface IStdRation extends IBaseRation {
|
|
|
}
|
|
|
|
|
|
export interface ICptRation extends IBaseRation {
|
|
|
- userID: string;
|
|
|
+ code: string;
|
|
|
+ ownerID: string;
|
|
|
compilationID: string;
|
|
|
ID: string;
|
|
|
sectionId: string;
|