Просмотр исходного кода

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

zhangweicheng 3 лет назад
Родитель
Сommit
e7d31f61c5

+ 1 - 0
types/src/interface/matter.ts

@@ -133,4 +133,5 @@ export const ComponentNameMap: Record<string, string> = {
   auditAmountSummary: '审核金额汇总',
   auditComments: '审核意见',
   settlement: '造价文件',
+  budgetCompare: '概算-预算阶段造价对比',
 };

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

@@ -648,7 +648,7 @@ export interface IBudgetEstimateTableItem {
   // 原报金额
   reportFee: string;
   // 审核金额
-  curFee: string;
+  auditFee: string;
   // 增减金额
   incFee?: string;
   decFee?: string;

+ 1 - 0
types/src/interface/processLog.ts

@@ -18,6 +18,7 @@ export enum OperateType {
   RETURN = '审批退回',
   CREATE = '创建',
   IMPORT = '导入',
+  OPEN = '打开',
 }
 export interface IModifyUser {
   ID: string;

+ 11 - 0
types/src/interface/user.ts

@@ -113,6 +113,7 @@ export interface IAPUser {
   projectLimit?: number; // 创建项目数量的限制
   failLoginCount?: number; // 登陆失败的次数
   lastTryLoginTime?: number; // 上次尝试登陆的时间
+  passwordModifyTime?: number; // 密码修改时间
 }
 
 // 最近联系人
@@ -129,3 +130,13 @@ export interface IViewingProjectUser {
   enterpriseID: string;
   enterpriseName: string;
 }
+
+// 安全策略配置
+export interface ISecurityConfiguration {
+  ID: string;
+  loginTimes: number;
+  accountLockTimes: number;
+  passwordVerification: number;
+  passwordValidity: number;
+  logReserveDay: number;
+}