功能设置补漏

app/controller/report_controller.js

@@ -362,6 +362,12 @@ module.exports = app => {
         async getMultiReportsEx(ctx) {
             // 原则说明：把所有报表模板集中获取，统一filter，只读一次数据！
             const params = JSON.parse(ctx.request.body.params);
+            const pageShow = ctx.session.sessionProject.page_show;
+            if (pageShow !== null && pageShow !== undefined && parseInt(pageShow.closeExportPdf) === 1) {
+                ctx.body = { data: [], signatureRelInfo: [], stageAudit: [] };
+                ctx.status = 201;
+                return;
+            }
             await this._saveCustomSelects(params);
             const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir);
             for (const pageRst of pageRstArr) {
@@ -402,6 +408,12 @@ module.exports = app => {
 
         async createExcelFilesEx(ctx) {
             const params = JSON.parse(ctx.request.body.params);
+            const pageShow = ctx.session.sessionProject.page_show;
+            if (pageShow !== null && pageShow !== undefined && parseInt(pageShow.closeExportExcel) === 1) {
+                ctx.body = { data: [] };
+                ctx.status = 201;
+                return;
+            }
             await this._saveCustomSelects(params);
             const baseDir = this.app.baseDir;
             function getExcelByPageData(pageRst, rpt_name, innerRoleRel) {

app/public/report/js/jpc_output.js

@@ -459,7 +459,7 @@ let JpcCanvasOutput = {
                 }
             }
             //水印
-            if (PAGE_SHOW['rptwatermark'] === 0) {
+            if (PAGE_SHOW['closeWatermark'] === 0) {
                 if (page.watermark_cells && page.watermark_cells.length > 0) {
                     for (let k = 0; k < page.watermark_cells.length; k++) {
                         let cell = page.watermark_cells[k];

app/public/report/js/rpt_main.js

@@ -659,7 +659,7 @@ let rptControlObj = {
     },
     getPDFEx: async function () {
         let me = rptControlObj;
-        if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0) {
+        if (zTreeOprObj.checkedRptTplNodes && zTreeOprObj.checkedRptTplNodes.length > 0 && PAGE_SHOW['closeExportPdf'] !== 1) {
             let refRptTplIds = [];
             let rpt_names = [];
             rptControlObj.getTplIdsCommon(refRptTplIds, rpt_names);

app/view/report/index.ejs

@@ -56,9 +56,9 @@
                             <div class="panel">
                                 <div class="panel-body" id="export_div">
                                     <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
-                                        <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.checkAndGetExcel()" <% if (pageShow !== null && pageShow.rptexportexcel === "1") { %> disabled <% } %> ><i class="fa fa-file-excel-o"></i> Excel <span class="badge badge-secondary">0</span></button>
+                                        <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.checkAndGetExcel()" <% if (pageShow !== null && parseInt(pageShow.closeExportExcel) === 1) { %> disabled <% } %> ><i class="fa fa-file-excel-o"></i> Excel <span class="badge badge-secondary">0</span></button>
                                         <button type="button" class="btn btn-outline-primary btn-sm" id="show_excel_output_cfg" data-toggle="modal" data-target="#export_excel" style="display:none"></button>
-                                        <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFPre()" <% if (pageShow !== null && pageShow.rptexportpdf === "1") { %> disabled <% } %> ><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-primary">0</span></button>
+                                        <button type="button" class="btn btn-outline-primary btn-sm" onclick="rptControlObj.getPDFPre()" <% if (pageShow !== null && parseInt(pageShow.closeExportPdf) === 1) { %> disabled <% } %> ><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-primary">0</span></button>
                                     </div>
                                 </div>
                                 <div class="panel-foot text-muted">
@@ -264,16 +264,16 @@
 
 <script type="text/javascript">
     let TOP_TREE_NODES = <%- rpt_tpl_data %>;
-    const PAGE_SHOW = {rptwatermark: 0, rptexportpdf: 0, rptexportexcel: 0};
+    const PAGE_SHOW = {closeWatermark: 0, closeExportPdf: 0, closeExportExcel: 0};
     <% if (pageShow !== null) { %>
-    <% if (parseInt(pageShow.rptwatermark) === 1) { %>
-    PAGE_SHOW['rptwatermark'] = 1;
+    <% if (parseInt(pageShow.closeWatermark) === 1) { %>
+    PAGE_SHOW['closeWatermark'] = 1;
     <% } %>
-    <% if (parseInt(pageShow.rptexportpdf) === 1) { %>
-    PAGE_SHOW['rptexportpdf'] = 1;
+    <% if (parseInt(pageShow.closeExportPdf) === 1) { %>
+    PAGE_SHOW['closeExportPdf'] = 1;
     <% } %>
-    <% if (parseInt(pageShow.rptexportexcel) === 1) { %>
-    PAGE_SHOW['rptexportexcel'] = 1;
+    <% if (parseInt(pageShow.closeExportExcel) === 1) { %>
+    PAGE_SHOW['closeExportExcel'] = 1;
     <% } %>
     <% } %>