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

overwrite/src/base/base.ts

@@ -10,4 +10,7 @@ export class BaseOverwrite {
 
   // 获取自定义系数
   getCustomerCoe = getCustomerCoe;
+
+  // 默认取市场价费
+  fromMarket = true;
 }

types/src/interface/base.ts

@@ -124,10 +124,6 @@ export enum CptModelName {
   billCodeSeqs = 'billCodeSeqs',
   rations = 'rations',
   rationGljs = 'rationGljs',
-  shareList = 'shareList',
-  shareProject = 'shareProject',
-  shareLib = 'shareLib',
-  shareLink = 'shareLink',
   unitPriceFile = 'unitPriceFile',
   feeRateFile = 'feeRateFile',
   labourCoeFile = 'labourCoeFile',
@@ -226,6 +222,7 @@ export interface ISetData<T = any, F = any, R = any> {
 }
 
 export interface IColumnMeta {
+  ID:string;
   title: string;
   data: string;
   renderer?: string;

types/src/interface/message.ts

@@ -15,14 +15,20 @@ export enum MessageName {
   REMOVE_FROM_ENTERPRISE = 'removeFromEnterprise',
   ALL_RESET_PASSWORD = 'allResetPassword',
   TRANSFER_DATA = 'transferData',
+  ACCEPT_TRANSFER_DATA = 'acceptTransferData',
   TRANSFER_ADMIN = 'transferAdmin',
+  SHARE_PROJECT = 'shareProject',
+  SHARE_LIB = 'shareLib',
+  UPDATE_SHARE_PROJECT = 'updateShareProject',
+  CANCEL_SHARE_PROJECT = 'cancelShareProject',
+  CANCEL_SHARE_LIB = 'cancelShareLib',
 }
 
 export interface ISocketDataType {
   title: string;
   message: string;
 
-  [key: string]: string;
+  [key: string]: any;
 }
 
 export interface ISocketData {

types/src/interface/project.ts

@@ -39,7 +39,7 @@ export interface IDecimal {
 export interface IBillsQuantityDecimal {
   unit: string;
   decimal: number;
-  ID:string;
+  ID: string;
 }
 
 // 呈现选项
@@ -56,6 +56,7 @@ export interface IProgression {
 }
 
 export interface IProgressiveInterval {
+  ID: string;
   name: string;
   progression: IProgression[];
   generalRate?: number;
@@ -114,6 +115,7 @@ export const FileTypeMap = {
 
 // 工程特征、基本信息
 export interface IInfoItem {
+  ID: string;
   key: string;
   dispName: string;
   value?: string;
@@ -125,11 +127,11 @@ export interface IInfoItem {
   items?: IInfoItem[];
 }
 
-//基本信息类型
-export interface IBasicInfo extends IInfoItem{
-  ID:string, 
-  parentID:string,
-  seq:number
+// 基本信息类型
+export interface IBasicInfo extends IInfoItem {
+  ID: string;
+  parentID: string;
+  seq: number;
 }
 // 工程特征指标
 interface IBaseEngineerFeature {
@@ -148,6 +150,7 @@ export interface IEngineerFeature extends ITreeScm, IBaseEngineerFeature {}
 
 // 主要工料指标
 export interface IMaterialIndex {
+  ID: string;
   name: string;
   unit: string;
   coe: number;
@@ -155,6 +158,7 @@ export interface IMaterialIndex {
 
 // 主要工程量指标
 export interface IMainQtyIndex {
+  ID: string;
   name: string;
   unit: string;
   coe: number;
@@ -162,6 +166,7 @@ export interface IMainQtyIndex {
 
 // 主要经济指标
 export interface IEconomicIndex {
+  ID: string;
   name: string;
   value: string;
 }
@@ -228,6 +233,8 @@ export interface IProperty {
   economics?: IEconomicIndex[];
   overHeightSpecificID?: string; // 超高子目指定清单ID
   distributeSetting?: IDistributeSetting; // 强制修改叶子清单的综合单价，分摊计算定额工程量 或 分摊计算定额下的工料机消耗量。
+  colMetas?: IColumnMeta[];
+  valuationName?: string; // 计价规则名称
 }
 
 // 原来的列设置太复杂了，没什么必要
@@ -269,7 +276,7 @@ export interface IProject extends ITreeScm {
   code?: string;
   createDate: number;
   property?: IProperty;
-  colMetas?: IColumnMeta[];
+
   changeMark?: string;
   remark?: string;
   fileVer?: string;
@@ -304,7 +311,7 @@ export interface IConstructionDefaultSetting {
   billsCalcMode: IProperty['billsCalcMode'];
   zanguCalcMode: IProperty['zanguCalcMode'];
   calcOption: IProperty['calcOption'];
-  colMetas: IProject['colMetas'];
+  colMetas: IProperty['colMetas'];
 }
 
 // 项目权限
@@ -353,6 +360,8 @@ export interface IProjectLog {
   activityDate: number;
   // 活动者ID
   activityUserID: string;
+  // 协作
+  cooperationCount?: number;
 }
 
 // 导入状态