BUG #2927

web/building_saas/report/js/rpt_main.js

@@ -1060,6 +1060,7 @@ let rptControlObj = {
             let refRptTplIds = [], refBillSumPrjsIds = [], refGljSumPrjsIds = [];
             let rpt_names = [], bill_rpt_names = [], glj_rpt_names = [];
             rptControlObj.getTplIdsCommon(refRptTplIds, refBillSumPrjsIds, refGljSumPrjsIds, rpt_names, bill_rpt_names, glj_rpt_names);
+            // refRptTplIds获取的是
             if (zTreeOprObj.selectedPrjIDs.length > 0 && (glj_rpt_names.length > 0 || bill_rpt_names.length > 0)) {
                 let params = rptControlObj.creatCommonExportParam();
                 params.prj_id = projectObj.project.projectInfo.ID;
@@ -1105,44 +1106,44 @@ let rptControlObj = {
                     $("#divReqCommonSummaryPDF")[0].style.display = "";
                     zTreeOprObj.requestPrjFolderCommon(); //先处理需要汇总的报表，走另外一个分支
                 } else if (refRptTplIds.length > 0) {
-                    if (refRptTplIds.length > 1) {
-                        let params = {};
-                        params.prj_id = projectObj.project.projectInfo.ID;
-                        params.rpt_ids = refRptTplIds;
-                        params.rpt_names = rpt_names;
-                        params.pageSize = me.getCurrentPageSize();
-                        params.orientation = ((zTreeOprObj.checkedRptTplNodes.length > 1)?null:me.getCurrentOrientation());
-                        params.custCfg = zTreeOprObj.reportPageCfg;
-                        params.option = "normal";
-                        CommonAjax.postEx("report_api/getMultiReports", params, WAIT_TIME_EXPORT, true,
-                            function(result){
-                                $.bootstrapLoading.end();
-                                me._hidePdfIniPage();
-                                let pageSize = rptControlObj.getCurrentPageSize();
-                                downloadPDFReport(result, pageSize, rpt_names);
-                                // for (let idx = 0; idx < result.length; idx++) {
-                                //     let pageData = result[idx];
-                                //     JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx]);
-                                // }
-                            },
-                            function(failRst){
-                                $.bootstrapLoading.end();
-                                me._hidePdfIniPage();
-                                console.log(failRst);
-                            },
-                            function(exceptionRst){
-                                $.bootstrapLoading.end();
-                                me._hidePdfIniPage();
-                                console.log(exceptionRst);
-                            }
-                        );
-                    } else {
-                        //这个分支是为了减少请求，用户已经点过的表，又没有勾选，那么就直接导出成PDF
-                        let pageSize = rptControlObj.getCurrentPageSize();
-                        let pageData = zTreeOprObj.currentRptPageRst;
-                        $.bootstrapLoading.end();
-                        me._hidePdfIniPage();
-                        JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[0]);
+                    let params = {};
+                    params.prj_id = projectObj.project.projectInfo.ID;
+                    params.rpt_ids = refRptTplIds;
+                    params.rpt_names = rpt_names;
+                    params.pageSize = me.getCurrentPageSize();
+                    params.orientation = ((zTreeOprObj.checkedRptTplNodes.length > 1)?null:me.getCurrentOrientation());
+                    params.custCfg = zTreeOprObj.reportPageCfg;
+                    params.option = "normal";
+                    CommonAjax.postEx("report_api/getMultiReports", params, WAIT_TIME_EXPORT, true,
+                        function(result){
+                            $.bootstrapLoading.end();
+                            me._hidePdfIniPage();
+                            let pageSize = rptControlObj.getCurrentPageSize();
+                            downloadPDFReport(result, pageSize, rpt_names);
+                            // for (let idx = 0; idx < result.length; idx++) {
+                            //     let pageData = result[idx];
+                            //     JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx]);
+                            // }
+                        },
+                        function(failRst){
+                            $.bootstrapLoading.end();
+                            me._hidePdfIniPage();
+                            console.log(failRst);
+                        },
+                        function(exceptionRst){
+                            $.bootstrapLoading.end();
+                            me._hidePdfIniPage();
+                            console.log(exceptionRst);
+                        }
+                    );
+                } else {
+                    //这个分支是为了减少请求，用户已经点过的表，又没有勾选，那么就直接导出成PDF，不过貌似已经走不到这里了
+                    let pageSize = rptControlObj.getCurrentPageSize();
+                    let pageData = zTreeOprObj.currentRptPageRst;
+                    $.bootstrapLoading.end();
+                    me._hidePdfIniPage();
+                    if (pageData) {
+                        JpcJsPDFHelper.outputAsPdf(pageData, pageSize, zTreeOprObj.currentNode.name);
                     }
                 }
             }