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

report/src/core/formulasFun.ts

@@ -4,7 +4,8 @@ import formulasDataSetter from './formulasDataSetter';
 import * as stringUtil from '../public/stringUtil'
 import { ReportDate as useReportDate } from '../public/ReportDate'
 import { ICurrent_RPT, IRptTpl, IDataObj, Fields } from '../interface/basic'
-import { JV as $JV } from './jpc_value_define';
+import { JV  } from './jpc_value_define';
+
 
 export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURRENT_DATA: IDataObj, $CURRENT_RPT: ICurrent_RPT) => {
     formulasDataSetter.setupData($CURRENT_RPT, $CURRENT_DATA);
@@ -38,8 +39,9 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
         convertStrToBoolean,
         formatNumber,
     } = stringUtil;
+   
+    const $JV= JV;
     const $JE = JE;
-    const JV= $JV;
     const ReportDate = useReportDate;
     for (let execFmlIdx = 0; execFmlIdx < $CURRENT_RPT.formulas.length; execFmlIdx++) {
         if ($CURRENT_RPT.formulas[execFmlIdx].run_type === runType) {
@@ -63,6 +65,7 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
         }
     }
     formulasDataSetter.resetData();
+    return {$JE,$JV};
 }
 
 export const combinedGridFormula = ($RUN_TYPE: String, $TEXT: Fields, $TIMES: number, $CURRENT_RPT: ICurrent_RPT) => {

types/src/interface/infoPrice.ts

@@ -32,6 +32,14 @@ export interface IAreaClass {
   libID: string;
 }
 
+// 关键字
+export interface IInfoKeyword {
+  keyword: string; // 关键字
+  coe: string; // 系数（关键字效果）
+  group: string; // 组别
+  optionCode: string; // 选项号
+}
+
 export interface IInfoPriceItem {
   ID: string;
   libID: string;
@@ -42,6 +50,10 @@ export interface IInfoPriceItem {
   unit: string;
   taxPrice: string; // 含税价格
   noTaxPrice: string; // 不含税价格
+  classCode: string; // 别名编码
+  expString: string; // 计算式
+  dateRemark: string; // 月份备注
+  keywordList?: IInfoKeyword[]; // 关键字
   // 以下冗余数据为方便前台信息价功能处理
   period: string; // 期数 eg: 2020-05
   areaID: string; // 地区
@@ -49,3 +61,13 @@ export interface IInfoPriceItem {
   remark: string;
   matchString?: string; // 临时变量关键词匹配时用到
 }
+
+export interface IInfoPriceClass {
+  compilationID: string;
+  class: number; // 42
+  code: string;
+  name: string;
+  specs: string;
+  unit: string;
+  classCode: string; // 00030A01 (5位+3位+3位)
+}

types/src/interface/ration.ts

@@ -485,3 +485,8 @@ export interface ISelectRationLibItem extends IFileRef {
   enterpriseID?: string; // 库来自企业的ID（企业分享会有）
   enterpriseName?: string; // 库来自企业的名称（企业分享会有）
 }
+
+// 招投标接口要匹配的标准定额（额外组装子目换算数据）
+export interface IBiddingFileRation extends IStdRation {
+  newCoeList: IRationCoe[];
+}

types/src/interface/user.ts

@@ -75,6 +75,25 @@ export interface IUser {
   summaryInfo: ISummary;
 }
 
+export interface IAPInstitution {
+  ID: string;
+  name: string;
+}
+
+export interface IAPUser {
+  ID: string;
+  createdTime: number;
+  gender: string;
+  accountType: number;
+  account: string;
+  name: string;
+  phone: string;
+  institution: IAPInstitution;
+  dataID: string;
+  created: string;
+  createdID: string;
+}
+
 // 最近联系人
 export interface IRecentUser extends IUser {
   recentDate: number;