支付审批-导出、打印问题 + 水印

app/controller/report_controller.js

@@ -371,6 +371,7 @@ module.exports = app => {
                 await this._getStageAuditViewData(ctx);
                 const pageShow = ctx.session.sessionProject.page_show;
                 pageShow.showArchive = 1;
+                pageShow.closeWatermark = 1;
                 const tenderId = ctx.params.id;
                 const paymentDetail_id = ctx.params.did;
                 // 支付审批: ctx.params.did 是 zh_payment_detail表的id, 通过这个did在 zh_payment_detail_audit表里找审核信息(td_id = ctx.params.did)
@@ -673,7 +674,9 @@ module.exports = app => {
                 ctx.status = 201;
                 return;
             }
-            await this._saveCustomSelects(params);
+            if (![-100, -200, -300].includes(params.stage_id)) {
+                await this._saveCustomSelects(params);
+            }
             // const pageRstArr = await getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir) || [];
             const pageRstArr = await ctx.service.jpcReport.getMultiRptsCommon(ctx, params, JV.OUTPUT_TYPE_NORMAL, this.app.baseDir) || [];
             for (const pageRst of pageRstArr) {

app/public/report/js/rpt_main.js

@@ -715,7 +715,9 @@ let rptControlObj = {
             rptControlObj.getTplIdsCommon(refRptTplIds, rpt_sheet_names, splitArchives);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
             params.closeWatermark = getCloseWatermarkForExcel();
-            await rptCustomObj.getCustomSelect(params);
+            if (![-100, -200, -300].includes(STAGE_ID)) {
+                await rptCustomObj.getCustomSelect(params);
+            }
             params.rpt_names = rpt_sheet_names;
             params.rptName = TENDER_NAME;
             params.option = getExcelOutputOption();
@@ -757,7 +759,9 @@ let rptControlObj = {
             rptControlObj.getTplIdsCommon(refRptTplIds, rpt_names, splitArchives);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
             params.closeWatermark = getCloseWatermarkForExcel();
-            await rptCustomObj.getCustomSelect(params);
+            if (![-100, -200, -300].includes(STAGE_ID)) {
+                await rptCustomObj.getCustomSelect(params);
+            }
             params.isOneSheet = true;
             params.rpt_names = rpt_names;
             params.rptName = 'All';
@@ -891,7 +895,9 @@ let rptControlObj = {
                 params.splitArchives = splitArchives;
 
                 // params.getPicFlag = true; //专门针对草图项，只有此项为true，才需要把草图信息带过来，预览及打印动态加载草图 // 纠结：但这样还是解决不了效率问题，得另外想交互方式
-                await rptCustomObj.getCustomSelect(params);
+                if (![-100, -200, -300].includes(STAGE_ID)) {
+                    await rptCustomObj.getCustomSelect(params);
+                }
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向
                 $.bootstrapLoading.start();
                 if (COMMON_WATER_MARK_PIC_DATA === null || COMMON_WATER_MARK_PIC_DATA === '') {
@@ -1055,7 +1061,9 @@ let rptControlObj = {
                 let params = rptControlObj.creatCommonExportParam(refRptTplIds);
                 params.splitArchives = splitArchives;
                 // params.getPicFlag = true; //专门针对草图项，只有此项为true，才需要把草图信息带过来，预览及打印动态加载草图 // 纠结：但这样还是解决不了效率问题，得另外想交互方式
-                await rptCustomObj.getCustomSelect(params);
+                if (![-100, -200, -300].includes(STAGE_ID)) {
+                    await rptCustomObj.getCustomSelect(params);
+                }
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向
                 $.bootstrapLoading.start();
                 if (COMMON_WATER_MARK_PIC_DATA === null || COMMON_WATER_MARK_PIC_DATA === '') {

app/public/report/js/rpt_print.js

@@ -8,7 +8,9 @@ let rptPrintHelper = {
             let refRptTplIds = [];
             rptControlObj.getTplIdsCommon(refRptTplIds, null);
             let params = rptControlObj.creatCommonExportParam(refRptTplIds);
-            await rptCustomObj.getCustomSelect(params);
+            if (![-100, -200, -300].includes(STAGE_ID)) {
+                await rptCustomObj.getCustomSelect(params);
+            }
             let chkNodes = zTreeOprObj.treeObj.getCheckedNodes(true);
             if (chkNodes.length > 0) {
                 delete params.orientation; // 打印时有勾选的话，不需要提供方向

app/view/report/index.ejs

@@ -429,7 +429,7 @@
     let ROLE_REL_LIST = [];
     let CURRENT_ROLE_REL_ID = -1;
     let current_stage_order = -1;
-    let current_stage_id = -1;
+    let current_stage_id = STAGE_ID;
     let current_stage_times = -1;
     let current_stage_status = -1;
     const customSelects = <%- JSON.stringify(customSelects) %>;