Kaynağa Gözat

feat(types): 类型调整

zhangweicheng 5 yıl önce
ebeveyn
işleme
319aec068c

+ 2 - 2
types/src/interface/bill.ts

@@ -1,6 +1,6 @@
 import { BRType } from './base';
 
-export interface IBillsItem {
+export interface IBill {
   ID: string;
   parentID: string;
   seq: number;
@@ -14,7 +14,7 @@ export interface IBillsItem {
 
 export interface IBills {
   projectID: string;
-  bills: IBillsItem[];
+  bills: IBill[];
 }
 
 export interface IJobContent {

+ 1 - 1
types/src/interface/calculation.ts

@@ -51,7 +51,7 @@ export interface IStdCalcProgram {
   templates: ICalcTemplate[];
 }
 
-export interface ICalcProgram {
+export interface ICalcProgramFile {
   ID: string;
   projectID: string;
   name: string;

+ 1 - 1
types/src/interface/labourCoe.ts

@@ -19,7 +19,7 @@ export interface ILabourCoeItem extends ITreeScm {
   coe: number;
 }
 
-export interface ILabourCoe {
+export interface ILabourCoeFile {
   ID: string;
   projectID: string;
   name: string;

+ 2 - 2
types/src/interface/project.ts

@@ -1,4 +1,4 @@
-import { ILabourCoe } from './labourCoe';
+import { ILabourCoeFile } from './labourCoe';
 import { IIncreaseSetting } from './increaseFee';
 import { ITreeScm, IFileRef, DeleteEnum, INumFileRef } from './base';
 import { ICalcOption, ITenderSetting } from './calculation';
@@ -191,7 +191,7 @@ export interface IProperty {
   progressiveInterval?: IProgressiveInterval[]; // 累进区间
   gljAdjustType?: GLJAdjustType; // 承包人材料调整类型
   cptIllustration?: string; // 编制说明
-  labourCoeFile?: ILabourCoe; // 人工系数文件
+  labourCoeFile?: ILabourCoeFile; // 人工系数文件
   engineerInfos?: IInfoItem[];
   engineerFeatures?: IEngineerFeature[];
   materials?: IMaterialIndex[];

+ 5 - 5
types/src/interface/ration.ts

@@ -10,8 +10,8 @@ import {
 
 export interface IStdRationChapter {
   rationRepId: number; // 标准库的属性
-  ID: number; // 补充库的直接用新结构,所以有两种类型
-  parentID: number;
+  ID: string; // 补充库的直接用新结构,所以有两种类型
+  parentID: string;
   seq: number;
   name: string;
   explanation?: string; // 说明
@@ -22,7 +22,7 @@ export interface IStdRationChapter {
 
 export interface ICptRationChapter {
   name: string;
-  ID: { type: string; index: true };
+  ID: string;
   seq: number;
   parentID: string;
   // 以下预留数据,以后开放可用
@@ -317,7 +317,7 @@ export interface IRationInstall {
   unifiedSetting: boolean; // 0:false 1:true  按统一设置
 }
 
-export interface IRationItem {
+export interface IRation {
   ID: string;
   parentID: string;
   seq: number;
@@ -382,5 +382,5 @@ export interface IRationItem {
 export interface IRations {
   projectID: string;
   index: number;
-  rations: IRationItem[];
+  rations: IRation[];
 }