Browse Source

变更打印预览问题

Tony Kang 1 year ago
parent
commit
350f8f2403
2 changed files with 5 additions and 5 deletions
  1. 4 4
      app/public/report/js/rpt_main.js
  2. 1 1
      app/public/report/js/rpt_print.js

+ 4 - 4
app/public/report/js/rpt_main.js

@@ -763,7 +763,7 @@ let rptControlObj = {
             rptControlObj.getTplIdsCommon(refRptTplIds, rpt_sheet_names, splitArchives);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
             params.closeWatermark = getCloseWatermarkForExcel();
-            if (![-100, -200, -300].includes(STAGE_ID)) {
+            if (STAGE_ID > 0) {
                 await rptCustomObj.getCustomSelect(params);
             }
             params.rpt_names = rpt_sheet_names;
@@ -807,7 +807,7 @@ let rptControlObj = {
             rptControlObj.getTplIdsCommon(refRptTplIds, rpt_names, splitArchives);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
             params.closeWatermark = getCloseWatermarkForExcel();
-            if (![-100, -200, -300].includes(STAGE_ID)) {
+            if (STAGE_ID > 0) {
                 await rptCustomObj.getCustomSelect(params);
             }
             params.isOneSheet = true;
@@ -968,7 +968,7 @@ let rptControlObj = {
                 params.splitArchives = splitArchives;
 
                 // params.getPicFlag = true; //专门针对草图项,只有此项为true,才需要把草图信息带过来,预览及打印动态加载草图 // 纠结:但这样还是解决不了效率问题,得另外想交互方式
-                if (![-100, -200, -300].includes(STAGE_ID)) {
+                if (STAGE_ID > 0) {
                     await rptCustomObj.getCustomSelect(params);
                 }
                 delete params.orientation; // 打印时有勾选的话,不需要提供方向
@@ -1134,7 +1134,7 @@ let rptControlObj = {
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
                 params.splitArchives = splitArchives;
                 // params.getPicFlag = true; //专门针对草图项,只有此项为true,才需要把草图信息带过来,预览及打印动态加载草图 // 纠结:但这样还是解决不了效率问题,得另外想交互方式
-                if (![-100, -200, -300].includes(STAGE_ID)) {
+                if (STAGE_ID > 0) {
                     await rptCustomObj.getCustomSelect(params);
                 }
                 delete params.orientation; // 打印时有勾选的话,不需要提供方向

+ 1 - 1
app/public/report/js/rpt_print.js

@@ -8,7 +8,7 @@ let rptPrintHelper = {
             let refRptTplIds = [];
             rptControlObj.getTplIdsCommon(refRptTplIds, null);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
-            if (![-100, -200, -300].includes(STAGE_ID)) {
+            if (STAGE_ID > 0) {
                 await rptCustomObj.getCustomSelect(params);
             }
             let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);