Browse Source

fix(types): 类型重复定义IProCptItem

vian 5 years ago
parent
commit
d4b4c6822c
3 changed files with 18 additions and 26 deletions
  1. 14 0
      types/src/interface/compilation.ts
  2. 2 13
      types/src/interface/enterprise.ts
  3. 2 13
      types/src/interface/user.ts

+ 14 - 0
types/src/interface/compilation.ts

@@ -87,3 +87,17 @@ export enum ValuationType {
   BILL = 'bill', // 清单计价
   RATION = 'ration', // 定额计价
 }
+
+// 专业版费用定额
+export interface IProCptItem {
+  // 编办 ID
+  compilationID: string;
+  // 开通时间
+  upgradeTime: number;
+  // 备注
+  remark: string;
+  // 截至时间,0 代表无限制
+  deadline: number;
+  // 锁信息 1:借出;2:销售
+  lock: number;
+}

+ 2 - 13
types/src/interface/enterprise.ts

@@ -1,3 +1,5 @@
+import { IProCptItem } from './compilation';
+
 export enum Relationship {
   ADMIN = 'admin',
   STAFF = 'staff',
@@ -17,19 +19,6 @@ export interface IMember {
   shareProject: 'disabled' | 'self' | 'all';
 }
 
-export interface IProCptItem {
-  // 编办 ID
-  compilationID: string;
-  // 开通时间
-  upgradeTime: number;
-  // 备注
-  remark: string;
-  // 截至时间,0 代表无限制
-  deadline: number;
-  // 锁信息 1:借出;2:销售
-  lock: number;
-}
-
 export interface IEnterprise {
   ID: string;
   adminID: string;

+ 2 - 13
types/src/interface/user.ts

@@ -1,3 +1,5 @@
+import { IProCptItem } from './compilation';
+
 /* eslint-disable camelcase */
 export enum ELockInfo {
   BORROW = 1, // 借用
@@ -45,19 +47,6 @@ export interface ISpecifyCptItem {
   cptID: string;
 }
 
-export interface IProCptItem {
-  // 编办 ID
-  compilationID: string;
-  // 开通时间
-  upgradeTime: number;
-  // 备注
-  remark: string;
-  // 截至时间,0 代表无限制
-  deadline: number;
-  // 锁信息 1:借出;2:销售
-  lock: number;
-}
-
 export interface IUsedCptItem {
   // 编办 ID
   compilationID: string;