Merge branch 'master' of 192.168.1.41:SmartCost/SCCommon

report/src/core/jpc_ex.ts

@@ -223,7 +223,7 @@ export class JpcExClass {
           mergeRst.Top = parseInt(mergedBand.Top.toFixed(0));
           mergeRst.Bottom = parseInt(mergedBand.Bottom.toFixed(0));
         }
-        return null;
+        return mergeRst;
       }
       //1.
       let rstPage: IRstPage = {
@@ -243,7 +243,7 @@ export class JpcExClass {
           bands,
           rst.control_collection,
           me,
-          null as unknown as ICustomizeCfg
+          (null as unknown) as ICustomizeCfg
         ); //方法中定义了5个参数，这里只传进去了4个参数，故加一个参数，by lish
       } else if (me.billTab) {
         rstPage.cells = me.billTab.outputAsPreviewPage(

types/src/interface/reviewRecord.ts

@@ -17,7 +17,8 @@ export interface IReviewRecordFormInfo {
   issues: Record<string, string>;
   pass: Record<string, boolean>;
   opinion: string;
-  date: number;
+  date: number; // 填写的预算复核表复核日期
+  modifyDate?: number; // 修改预算复核表的日期
 }
 export interface IReviewRecordForm {
   ID: string;