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

handsontable/src/3rdparty/walkontable/src/overlays.js

@@ -249,7 +249,6 @@ class Overlays {
           (overlay === 'left' && deltaX !== 0) ||
           (overlay === 'bottom' && deltaY !== 0) ||
           ((overlay === 'topLeft' || overlay === 'bottomLeft') && (deltaY !== 0 || deltaX !== 0))) {
-
           event.preventDefault();
         }
       }]);

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/types",
-  "version": "1.0.38",
+  "version": "1.0.41",
   "description": "共用类型文件",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

types/src/interface/base.ts

@@ -290,6 +290,13 @@ export interface IFees {
   [key: string]: IFee;
 }
 
+export enum BaseEXP {
+  QDL = 'QDL',
+  ZXGCLHJ = 'ZXGCLHJ', // 子项工程量合计
+  GCLMXHJ = 'GCLMXHJ',
+  MBGCL = 'MBGCL', // 模板工程量
+}
+
 // 定额和清单共有的属性，造价书中很多地方需要
 export interface IBRBase {
   ID: string;
@@ -302,7 +309,7 @@ export interface IBRBase {
   code?: string;
   name?: string;
   quantity?: number;
-  quantityEXP?: string;
+  quantityEXP?: BaseEXP | string;
   quantityDetails?: IQuantityDetail[]; // 工程量明细 -- 原先保存在另外的表中
   // 是否记取面积增加费
   areaIncreaseFee?: boolean | null; // { type: Schema.Types.Mixed; default: false }; // true 是，false否，null 不确定，三个状态

types/src/interface/executor.ts

@@ -0,0 +1,31 @@
+import { BusinessTypeKey } from './subjectUnit';
+
+// 执行者
+export interface IExecutor {
+    ID: string;
+    subjectID: string;
+    businessType: BusinessTypeKey;
+    setType: string;
+    name: string;
+    participantMode: string;
+    approvaledPermission: IExecutorApprovaledPermission[];
+    members: string[];
+}
+// 拷贝后的数据表
+export interface ISubjectExecutor {
+    ID: string;
+    subjectID: string;
+    businessID: string;
+    businessType: BusinessTypeKey;
+    setType: string;
+    name: string;
+    participantMode: string;
+    approvaledPermission: IExecutorApprovaledPermission[];
+    members: string[];
+}
+
+export interface IExecutorApprovaledPermission {
+    ID: string;
+    permission: string[];
+}
+

types/src/interface/index.ts

@@ -29,3 +29,5 @@ export * from './structure';
 export * from './editLog';
 export * from './institutionRole';
 export * from './subjectUnit';
+export * from './executor';
+export * from './matter';

types/src/interface/matter.ts

@@ -0,0 +1,72 @@
+import { BusinessTypeKey, MatterTypeKey } from './subjectUnit';
+// 事项
+export interface IMatter {
+    ID: string;
+    subjectID: string;
+    businessType: BusinessTypeKey;
+    matterType: MatterTypeKey;
+    parentID: string;
+    name: string;
+    sort: string;
+    formSchema: any;
+    assembly: string[];
+}
+
+export interface ISubjectMatter {
+    ID: string;
+    subjectID: string;
+    businessID: string;
+    businessType: BusinessTypeKey;
+    matterType: MatterTypeKey;
+    parentID: string;
+    name: string;
+    sort: string;
+    formSchema: any;
+    assembly: string[];
+}
+
+export interface IStepMatter {
+    ID: string;
+    stepID: string;
+    matterID: string;
+    formPermission: string[];
+    zjPermission: string[];
+    profilePermission: string[];
+}
+
+export interface ISubjectStepMatter {
+    ID: string;
+    businessID: string;
+    stepID: string;
+    matterID: string;
+    formPermission: string[];
+    zjPermission: string[];
+    profilePermission: string[];
+}
+
+export interface IYsProfileTemplate {
+    ID: string;
+    parentID: string;
+    subjectID: string;
+    businessType: BusinessTypeKey;
+    name: string;
+    sort: string;
+    enable: boolean;
+    required: boolean;
+    folder: boolean;
+    mode: string[];
+}
+
+export interface ISubjectYsProfileTemplate {
+    ID: string;
+    parentID: string;
+    subjectID: string;
+    businessType: BusinessTypeKey;
+    name: string;
+    sort: string;
+    enable: boolean;
+    required: boolean;
+    folder: boolean;
+    mode: string[];
+    businessID: string;
+}

types/src/interface/option.ts

@@ -4,6 +4,7 @@
 export interface IQtyOption {
   rationQtyFromBillQty: boolean; // 自动根据清单工程量填写定额工程量
   rationQtyFromRationUnit: boolean; // 自动根据定额单位转换定额工程量
+  calcRationQtyWhenBillQtyChange: boolean; // 修改清单工程量时，自动计算定额工程量
 }
 
 export interface IOption {

types/src/interface/process.ts

@@ -41,6 +41,7 @@ export enum RolePermission {
   ALL_SET_PROJECT = 'setProjects', // 全部项目-项目设置
   ALL_VIEW_ALL_PROJECTS = 'viewAllProjects', // 全部项目-查看项目
   ALL_SAVE_INDEX = 'saveIndexAll', // 全部项目-指标入库
+  ALL_EXPORT_PROJECTS = 'exportProjects', // 全部项目-导出项目
   ZBK_ENABLE = 'zbkEnable', // 指标库启用
   ZBK_EDIT = 'zbkEdit', // 指标库-编辑
   CJK_ENABLE = 'cjkEnable', // 材价库-启用

types/src/interface/project.ts

@@ -253,6 +253,7 @@ export interface IProperty {
   fileKind?: string; // 导入进来的属性，平台导出需要维持这个值不变
   infoPriceOption?: IInfoPriceOption; // 信息价选项 只用于搜索
   recommendPriceOption?: IInfoPriceOption; // 智能材价匹配时的选项
+  dynamicIndexDate?: { year: string; month: string }; // 动态指标使用的日期
   saveLog?: boolean; // 记录项目编辑log
   indexType?: string; // 指标项目分类用于指标入库
   normLib?: string;

types/src/interface/subjectUnit.ts

@@ -1,5 +1,15 @@
-
 export interface ISubjectUnit {
-    ID: string;
-    institutionIDs: string[];
-  }
+  ID: string;
+  institutionIDs: string[];
+}
+
+export enum BusinessTypeKey {
+  UNDO = 'undo',
+  DOING = 'doing',
+  DONE = 'done',
+}
+
+export enum MatterTypeKey {
+  CATEGORY = 'category',
+  MATTER = 'matter',
+}