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

tree/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/tree",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "a template for npm package coding",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

types/src/interface/base.ts

@@ -124,9 +124,8 @@ export enum CptModelName {
   labourCoeFile = 'labourCoeFile',
   importLogs = 'importLogs',
   cptRationSectionTpl = 'cptRationSectionTpl',
-  cptGljLib = 'cptGljLib',
-  cptGljSection = 'cptGljSection',
-  cptGljSectionTpl = 'cptGljSectionTpl',
+  cptGlj = 'cptGlj',
+  cptGljTree = 'cptGljTree',
   cptRationCoeList = 'cptRationCoeList',
   cptRationInstallation = 'cptRationInstallation',
   cptRationInstallationSection = 'cptRationInstallationSection',

types/src/interface/error.ts

@@ -85,6 +85,11 @@ export enum ErrNo {
   PROJECT_NOT_FOUND_TREE_DATA = 5026,
   CONSTRUCTION_ORG_NOT_FOUND = 5027,
   SINGLE_ORG_NOT_FOUND = 5028,
-
   GLJ_LIB_NOT_FOUND = 5029,
+
+  /* 数据配置错误(大多数为后台标准、模板数据配置问题)  6001 - 6999 */
+  // 补充人材机分类树模板 未配置
+  CPT_GLJ_TREE_TEMPLATE_EMPTY = 6001,
+  // 补充定额库章节树模板 未配置
+  CPT_RATION_TREE_TEMPLATE_EMPTY = 6002,
 }

types/src/interface/glj.ts

@@ -258,6 +258,29 @@ export interface IStdGljTree extends ITreeScm {
 /* 标准人材机相关 ↑ */
 
 /* 补充人材机相关 ↓ */
+// 补充人材机分类树-模板(后台设置)
+export interface IRawCptGljTreeTemplate {
+  compilationId: string;
+  Name: string;
+  ID: number;
+  ParentID: number;
+  NextSiblingID: number;
+}
+
+// 补充人材机分类树
+export interface ICptGljTree extends ITreeScm {
+  name: string;
+  from: FromType;
+}
+
+// 补充人材机分类树容器
+export interface ICptGljTreeData {
+  compilationID: string;
+  ownerID: string; // 企业或用户
+  treeData: ICptGljTree[];
+}
+
+// 补充人材机组成物
 export interface ICptComponent {
   ID: string; // 补充的ID改成了UUID ,标准的不变，但是这里
   consumeAmt: number;
@@ -265,6 +288,7 @@ export interface ICptComponent {
   from: FromType;
 }
 
+// 补充人材机
 export interface ICptGlj extends IBaseRationGlj {
   ID: string;
   ownerID: string;

types/src/interface/infoPrice.ts

@@ -24,7 +24,7 @@ export interface IInfoSearch {
 export interface IAreaClass {
   ID: string;
   parentID: string;
-  seq: string;
+  seq: number;
   name: string;
   areaID: string;
   libID: string;