Merge branch 'master' of http://192.168.1.41:3000/SmartCost/SCCommon

types/src/interface/base.ts

@@ -79,6 +79,10 @@ export enum BRType { // 1 :大项费用 2：分部 3分项 4清单;5补项   6
   GLJ = 23, // 工料机
   OH = 24, // 超高子目
   ITEM = 25, // 子目增加
+
+  // 虚拟节点，主材、设备，只是显示
+  MAIN = 50, // 主材
+  EQUIP = 51, // 设备
 }
 
 export enum supplyType {

types/src/interface/bill.ts

@@ -1,6 +1,85 @@
 import { BRType, ITreeScm } from './base';
 import { IQuantityDetail } from './quantityDetail';
 
+// 清单固定类别
+export enum FixedFlag {
+  // 分部分项工程
+  SUB_ENGINERRING = 1,
+  // 措施项目
+  MEASURE = 2,
+  // 施工技术措施项目
+  CONSTRUCTION_TECH = 3,
+  // 安全文明施工按实计算费用
+  SAFETY_CONSTRUCTION_ACTUAL = 4,
+  // 施工组织措施专项费用
+  CONSTRUCTION_ORGANIZATION = 5,
+  // 安全文明施工专项费用
+  SAFETY_CONSTRUCTION = 6,
+  // 其他项目
+  OTHER = 7,
+  // 暂列金额
+  PROVISIONAL = 8,
+  // 暂估价
+  ESTIMATE = 9,
+  // 材料（工程设备）暂估价
+  MATERIAL_PROVISIONAL = 10,
+  // 专业工程暂估价
+  ENGINEERING_ESITIMATE = 11,
+  // 计日工
+  DAYWORK = 12,
+  // 总承包服务费
+  TURN_KEY_CONTRACT = 13,
+  // 索赔与现场签证
+  CLAIM_VISA = 14,
+  // 规费
+  CHARGE = 15,
+  // 社会保险费及住房公积金 Social insurance fee and housing accumulation fund
+  SOCIAL_INSURANCE_HOUSING_FUND = 16,
+  // 工程排污费 charges for disposing pollutants
+  POLLUTANTS = 17,
+  // 税金
+  TAX = 18,
+  // 工程造价
+  ENGINEERINGCOST = 19,
+  // 增值税
+  ADDED_VALUE_TAX = 20,
+  // 专项技术措施暂估价
+  SPECIAL_TECH_PROVISIONAL = 21,
+  // 专业发包工程管理费
+  LET_CONTRACT_MANAGEMENT = 22,
+  // 人工
+  LABOUR = 23,
+  // 材料
+  MATERIAL = 24,
+  // 施工机械
+  MACHINE = 25,
+  // 索赔
+  CLAIM = 26,
+  // 现场签证
+  VISA = 27,
+  // 附加税
+  ADDITIONAL_TAX = 28,
+  // 环境保护税
+  ENVIRONMENTAL_PROTECTION_TAX = 29,
+  // 建设工程竣工档案编制费
+  PROJECT_COMPLETE_ARCH_FEE = 30,
+  // 住宅工程质量分户验收费
+  HOUSE_QUALITY_ACCEPT_FEE = 31,
+  // 组织措施费
+  ORGANIZATION = 32,
+  // 其他措施费
+  OTHER_MEASURE_FEE = 33,
+  // 绿色施工安全防护措施费
+  GREEN_MEASURE_FEE = 34,
+  // 预算包干费
+  BUDGET_INCLUDE_WORK_FEE = 35,
+  // 工程优质费
+  PROJECT_HIGH_QUALITY_FEE = 36,
+  // 概算幅度差
+  BUDGET_ESTIMATE_DIFF = 37,
+  // 其他费用（与其他项目不同，参考广东的用法）
+  OTHER_FEE = 38,
+}
 export interface IJobContent {
   seq: number;
   content: string;
@@ -41,7 +120,7 @@ export interface IBill {
   unit?: string;
   code?: string;
   name?: string;
-  flag?: number; // 清单固定类别
+  flag?: FixedFlag; // 清单固定类别
   quantity?: number;
   quantityDetails?: IQuantityDetail[]; // 工程量明细 -- 原先保存在另外的表中
   recharge?: string; // 补注
@@ -54,6 +133,7 @@ export interface IBill {
   formulaValue?: number; // 基数计算的值
   tenderFormulaValue?: number; // 调价基数计算的值
   bookMark?: IBookmark; // 书签批注
+  isAdd?: boolean; // 是否用户新增的清单
   [key: string]: any; // 剩下的之后补充
 }
 
@@ -127,83 +207,3 @@ export interface IStdBill extends ITreeScm {
   quantityIndexUnit: string; // 工程量指标单位
   quantityIndexCoe: number; // 单位转换系数
 }
-
-// 清单固定类别
-export enum FixedFlag {
-  // 分部分项工程
-  SUB_ENGINERRING = 1,
-  // 措施项目
-  MEASURE = 2,
-  // 施工技术措施项目
-  CONSTRUCTION_TECH = 3,
-  // 安全文明施工按实计算费用
-  SAFETY_CONSTRUCTION_ACTUAL = 4,
-  // 施工组织措施专项费用
-  CONSTRUCTION_ORGANIZATION = 5,
-  // 安全文明施工专项费用
-  SAFETY_CONSTRUCTION = 6,
-  // 其他项目
-  OTHER = 7,
-  // 暂列金额
-  PROVISIONAL = 8,
-  // 暂估价
-  ESTIMATE = 9,
-  // 材料（工程设备）暂估价
-  MATERIAL_PROVISIONAL = 10,
-  // 专业工程暂估价
-  ENGINEERING_ESITIMATE = 11,
-  // 计日工
-  DAYWORK = 12,
-  // 总承包服务费
-  TURN_KEY_CONTRACT = 13,
-  // 索赔与现场签证
-  CLAIM_VISA = 14,
-  // 规费
-  CHARGE = 15,
-  // 社会保险费及住房公积金 Social insurance fee and housing accumulation fund
-  SOCIAL_INSURANCE_HOUSING_FUND = 16,
-  // 工程排污费 charges for disposing pollutants
-  POLLUTANTS = 17,
-  // 税金
-  TAX = 18,
-  // 工程造价
-  ENGINEERINGCOST = 19,
-  // 增值税
-  ADDED_VALUE_TAX = 20,
-  // 专项技术措施暂估价
-  SPECIAL_TECH_PROVISIONAL = 21,
-  // 专业发包工程管理费
-  LET_CONTRACT_MANAGEMENT = 22,
-  // 人工
-  LABOUR = 23,
-  // 材料
-  MATERIAL = 24,
-  // 施工机械
-  MACHINE = 25,
-  // 索赔
-  CLAIM = 26,
-  // 现场签证
-  VISA = 27,
-  // 附加税
-  ADDITIONAL_TAX = 28,
-  // 环境保护税
-  ENVIRONMENTAL_PROTECTION_TAX = 29,
-  // 建设工程竣工档案编制费
-  PROJECT_COMPLETE_ARCH_FEE = 30,
-  // 住宅工程质量分户验收费
-  HOUSE_QUALITY_ACCEPT_FEE = 31,
-  // 组织措施费
-  ORGANIZATION = 32,
-  // 其他措施费
-  OTHER_MEASURE_FEE = 33,
-  // 绿色施工安全防护措施费
-  GREEN_MEASURE_FEE = 34,
-  // 预算包干费
-  BUDGET_INCLUDE_WORK_FEE = 35,
-  // 工程优质费
-  PROJECT_HIGH_QUALITY_FEE = 36,
-  // 概算幅度差
-  BUDGET_ESTIMATE_DIFF = 37,
-  // 其他费用（与其他项目不同，参考广东的用法）
-  OTHER_FEE = 38,
-}

types/src/interface/enterprise.ts

@@ -0,0 +1,26 @@
+export interface IMember {
+  userID: string;
+  cptList: string[];
+  createProject: 'yes' | 'no';
+  projectView: 'self' | 'all';
+  editProject: 'self' | 'all';
+  exportProject: 'disabled' | 'self' | 'all';
+  importProject: 'disabled' | 'self' | 'all';
+  shareProject: 'disabled' | 'self' | 'all';
+}
+
+export interface IEnterprise {
+  ID: string;
+  cldID: string;
+  adminID: string;
+  members: IMember[];
+  companyName: string;
+  logo: string;
+  companyLocation: [string, string, string];
+  companyType: string;
+  companyScale: string;
+  createTime: number;
+  passwordCheck: 'no' | 'weak' | 'normal' | 'strong' | 'super';
+  ip: string;
+  logoutRule: string;
+}

types/src/interface/error.ts

@@ -0,0 +1,63 @@
+// 错误类型
+// eslint-disable-next-line import/prefer-default-export
+export enum ErrNo {
+  // 没捕获到的通用错误
+  ERROR = 1,
+
+  /* 用户相关错误（包含登录） 1001 - 1999 */
+  ONLY_MOBILE_MESSAGE = 1001,
+  MESSAGE_ERROR = 1002,
+  MESSAGE_OVERDUE = 1003,
+  IP_EMPTY = 1004,
+  MOBILE_ERROR = 1005,
+  NOT_REGISTERED = 1006,
+  SSO_CHECK_ERROR = 1007,
+  EMAIL_NOT_VERIFIED = 1008,
+  PASSWORD_ERROR = 1009,
+  SSO_ERROR = 1010,
+  SEND_MESSAGE_ERROR = 1011,
+  // 登录参数错误
+  LOGIN_PARAM_ERROR = 1012,
+  // 未登录
+  NOT_LOGIN = 1013,
+
+  /* 费用定额相关 2001 - 2999 */
+  COMPILATION_NOT_FOUND = 2001,
+  // 编办已设置
+  COMPILATION_ALREADY_SET = 2002,
+  /* 权限相关 3001 - 3999 */
+  SET_DATA_PERMISSION = 3001, // 可以再细分setData
+  /* 分享相关 4001 - 4999 */
+  ERROR_HISTORY_PARAMS = 4001,
+  /* 项目相关 5001 - 5999 */
+  PROJECT_EXISTS = 5001,
+  PROJECT_NOT_FOUND = 5002,
+  FOLD_HAS_CHILD = 5003,
+  INVALID_PROJECT_TYPE = 5004,
+  CONSTRUCTION_NOT_FOUND = 5005,
+  COLMETAS_NOT_FOUND = 5006,
+  ENGINEERING_NOT_FOUND = 5007,
+  TAX_ITEM_NOT_FOUND = 5008,
+  ORG_CONSTRUCTION_NOT_FOUND = 509,
+  ORG_SINGLE_NOT_FOUND = 5010,
+  RECOVER_PROJECT_NOT_FOUND = 5011,
+  INVALID_RECOVER_PROJECT = 5012,
+  CANT_RECOVER_TO_PROJECT = 5013,
+  PROJECT_IS_COMPLETED_DELETED = 5014,
+  PROJECT_IS_NOT_DELETED = 5015,
+  CANT_DELETE_FOLDER = 5016,
+  CALC_PROGRAM_NOT_FOUND = 5017,
+  FEE_RATE_NOT_FOUND = 5018,
+  RATION_TEMPLATE_NOT_FOUND = 5019,
+  RATION_COE_NOT_FOUND = 5020,
+  RATION_GLJ_NOT_FOUND = 5021,
+  GLJ_COMPONENT_FOUND = 5022,
+  PROJECT_EXISTS_UPDATE = 5023,
+  PROJECT_EXISTS_LEVEL = 5024,
+  PROJECT_NOT_FOUND_REMOVE = 5025,
+  PROJECT_NOT_FOUND_TREE_DATA = 5026,
+  CONSTRUCTION_ORG_NOT_FOUND = 5027,
+  SINGLE_ORG_NOT_FOUND = 5028,
+
+  GLJ_LIB_NOT_FOUND = 5029,
+}

types/src/interface/glj.ts

@@ -140,7 +140,6 @@ export interface IProjectGlj {
   tenderQuantity?: number; // 调整后消耗量
   techQuantity?: number; // 技术措施项目消耗量
   subdivisionQuantity?: number; // 分部分项消耗量
-  tenderPrice?: number; // 调整后价格
   materialType?: MaterialType; // 三材类别
   materialCoe?: number; // 三材系数
   materialQuantity?: number; // 三材量

types/src/interface/index.ts

@@ -17,3 +17,5 @@ export * from './quantityDetail';
 export * from './report';
 export * from './configMaterial';
 export * from './socket';
+export * from './error';
+export * from './enterprise';

types/src/interface/ration.ts

@@ -203,8 +203,6 @@ export interface IRationGlj {
   customQuantity?: number;
   rationQuantity?: number;
   tenderQuantity?: number; // 调整后消耗量
-  marketPrice?: number; // 市场价 - 不保存至数据库
-  basePrice?: number; // 定额价 - 不保存至数据库
   createType: gljCreateType; // normal、add、replace  正常、添加工料机、替换工料机
   from: fromType; // std, cpt  来自标准工料机库、补充工料机库
 }

types/src/interface/user.ts

@@ -77,7 +77,6 @@ export interface IRawUser {
 
 // 返回给前端的字段
 export interface IUser {
-  enterpriseID?: string;
   ID?: string;
   qq?: string;
   realName?: string;