水印处理（打印、导出PDF）

app/public/report/js/rpt_jspdf.js

@@ -101,8 +101,10 @@ let JpcJsPDFHelper = {
                         private_drawSignature(doc, ctx, cell, styles, controls, newPageMergeBand, true, signatureRelArr);
                     }
                 }
-                for (let cell of page.watermark_cells) {
-                    _drawWatermark(doc, ctx, cell, controls);
+                if (PAGE_SHOW['closeWatermark'] === 0) {
+                    for (let cell of page.watermark_cells) {
+                        _drawWatermark(doc, ctx, cell, controls);
+                    }
                 }
             }
         }

app/public/report/js/rpt_print.js

@@ -115,9 +115,11 @@ let rptPrintHelper = {
                 svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
                     offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
             }
-            for (let cell of page.watermark_cells) {
-                svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
-                    offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
+            if (PAGE_SHOW['closeWatermark'] === 0) {
+                for (let cell of page.watermark_cells) {
+                    svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
+                        offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
+                }
             }
             // 计量有电子签名日期，在处理上与cells一样
             for (let cell of page.signature_date_cells) {