fix: 多表导出一个PDF调整(名称、page大小)

app/public/report/js/rpt_jsexcel.js

@@ -1414,7 +1414,11 @@ const excelExportUtil = {
         if (!hasSignature) {
             createDummySignatureCell(pageData);
         }
-        if (isSinglePage) {
+        if (false && pageData.excelExportOptions) {
+            // 这个要单独处理，不用考虑是否单页输出（custSheetNames那个是为了多表导出到一个Excel用的）
+            // _setupPgBrks(pageData);
+            // sheets.push({ sheetName: '全部页' });
+        } else if (isSinglePage) {
             // 加分页符(分页符要在外部处理好)-------------------
             _setupPgBrks(pageData);
             // 加分页符结束-------------------

app/public/report/js/rpt_main.js

@@ -1184,14 +1184,12 @@ let rptControlObj = {
                                         break;
                                     default:
                                         // 计量期
-                                        if (current_stage_order > 0) {
-                                            allRptName = `${TENDER_NAME}-计量期-${current_stage_order}`;
-                                        } else {
-                                            allRptName = `${TENDER_NAME}-计量期`;
-                                        }
-                                        
+                                        allRptName = `${TENDER_NAME}-计量期`;
                                         break;
                                 }
+                                if (current_stage_order > 0) {
+                                    allRptName = `${allRptName}-${current_stage_order}`;
+                                }
                                 rpt_names[0] = allRptName;
                             }
                             downloadPDFReport(pageDataArr, pageSize, rpt_names, signatureRelArr, result.signatureRelInfo, refRptTplIds, STAGE_AUDIT, isWholeOne);

app/service/jpc_report.js

@@ -200,6 +200,7 @@ module.exports = app => {
                     for (const page of pageRst.items) {
                         page.orientation = orientation;
                     }
+                    pageRst[JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE];
                     if (tplData.splitArcPages) {
                         pageRst.splitArcPages = tplData.splitArcPages;
                         pageRst.splitArcPagesInfo = tplData.splitArcPagesInfo;