Sfoglia il codice sorgente

批量打印/Excel/PDF在某些非正常操作情况下报表方向出现错误

TonyKang 5 anni fa
parent
commit
ab1063a0b6
2 ha cambiato i file con 14 aggiunte e 1 eliminazioni
  1. 10 1
      app/public/report/js/rpt_main.js
  2. 4 0
      app/public/report/js/rpt_print.js

+ 10 - 1
app/public/report/js/rpt_main.js

@@ -466,6 +466,10 @@ let rptControlObj = {
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
             params.rpt_names = rpt_sheet_names;
             params.rptName = TENDER_NAME;
+            let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);
+            if (chkNodes.length > 0) {
+                delete params.orientation; // 打印时有勾选的话,不需要提供方向
+            }
             CommonAjax.postXsrfEx("/tender/report_api/createExcelFilesInOneBook", params, 60000, true, getCookie('csrfToken'), function(result){
                     if (result) {
                         let uuIdUrls = [];
@@ -489,6 +493,10 @@ let rptControlObj = {
             params.isOneSheet = true;
             params.rpt_names = rpt_names;
             params.rptName = 'All';
+            let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);
+            if (chkNodes.length > 0) {
+                delete params.orientation; // 打印时有勾选的话,不需要提供方向
+            }
             CommonAjax.postXsrfEx("/tender/report_api/createExcelFiles", params, 60000, true, getCookie('csrfToken'), function(result){
                     if (result) {
                         let uuIdUrls = [];
@@ -529,8 +537,9 @@ let rptControlObj = {
             let rpt_names = [];
             rptControlObj.getTplIdsCommon(refRptTplIds, rpt_names);
             const signatureRelArr = [];
-            if (refRptTplIds.length > 1) {
+            if (refRptTplIds.length > 0) {
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
+                delete params.orientation; // 打印时有勾选的话,不需要提供方向
                 CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken'),
                     function(result){
                         let pageSize = rptControlObj.getCurrentPageSize();

+ 4 - 0
app/public/report/js/rpt_print.js

@@ -8,6 +8,10 @@ let rptPrintHelper = {
             let refRptTplIds = [];
             rptControlObj.getTplIdsCommon(refRptTplIds, null);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
+            let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);
+            if (chkNodes.length > 0) {
+                delete params.orientation; // 打印时有勾选的话,不需要提供方向
+            }
             CommonAjax.postXsrfEx("/tender/report_api/getMultiReports", params, 60000, true, getCookie('csrfToken'),
                 function(result){
                     for (let idx = 0; idx < result.data.length; idx++) {