Tony Kang 1 rok temu
rodzic
commit
5f4c1689bc

+ 0 - 3
app/public/report/js/rpt_main.js

@@ -725,9 +725,6 @@ let rptControlObj = {
     getCurrentPageSize: function() {
     getCurrentPageSize: function() {
         // let rst = "A4";
         // let rst = "A4";
         let rst = document.getElementById("btnRptPageSize").innerHTML.trim();
         let rst = document.getElementById("btnRptPageSize").innerHTML.trim();
-        if (zTreeOprObj.currentRptPageRst) {
-            rst = (zTreeOprObj.currentRptPageRst[JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] === 'A3') ? 'A3' : rst;
-        }
         //btnRptPageSize
         //btnRptPageSize
         return rst;
         return rst;
     },
     },

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

@@ -25,6 +25,9 @@ let rptPrintHelper = {
             sessionStorage.current_stage_status = getStageStatus();
             sessionStorage.current_stage_status = getStageStatus();
             sessionStorage.closeWaterMark = getCloseWatermark();
             sessionStorage.closeWaterMark = getCloseWatermark();
             sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
             sessionStorage.pageSize = rptControlObj.getCurrentPageSize();
+            if (zTreeOprObj.currentRptPageRst) {
+                sessionStorage.pageSize = (zTreeOprObj.currentRptPageRst[JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] === 'A3') ? 'A3' : sessionStorage.pageSize;
+            }
             sessionStorage.waterMarkStr = COMMON_WATER_MARK_PIC_DATA;
             sessionStorage.waterMarkStr = COMMON_WATER_MARK_PIC_DATA;
             sessionStorage.refRptTplIds = JSON.stringify(refRptTplIds);
             sessionStorage.refRptTplIds = JSON.stringify(refRptTplIds);
             sessionStorage.STAGE_LIST = JSON.stringify(STAGE_LIST);
             sessionStorage.STAGE_LIST = JSON.stringify(STAGE_LIST);