code sync

app/public/report/js/rpt_jspdf.js

@@ -177,12 +177,14 @@ const JpcJsPDFHelper = {
                 private_drawLine(cell, doc, ctx, style, JV.PROP_LEFT, [JV.PROP_LEFT, JV.PROP_BOTTOM],[JV.PROP_LEFT, JV.PROP_TOP], mergedBand, styles, isNeedMergeBand);
             }
             ctx.closePath();
-            if (!onlyShowBorder || cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
-                private_drawSignatureCellText(doc, ctx, cell, controls, signatureRelArr);
-            } else {
-                for (const signRel of signatureRelArr) {
-                    if (cell.signature_name === signRel.signature_name && rptSignatureHelper._chkIfAudit(signRel)) {
-                        private_drawSignatureCellText(doc, ctx, cell, controls, signatureRelArr);
+            if (PAGE_SHOW.isTextSignature === 0 || cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
+                if (!onlyShowBorder || cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
+                    private_drawSignatureCellText(doc, ctx, cell, controls, signatureRelArr);
+                } else {
+                    for (const signRel of signatureRelArr) {
+                        if (cell.signature_name === signRel.signature_name && rptSignatureHelper._chkIfAudit(signRel)) {
+                            private_drawSignatureCellText(doc, ctx, cell, controls, signatureRelArr);
+                        }
                     }
                 }
             }

app/public/report/js/rpt_main.js

@@ -1207,6 +1207,9 @@ let rptControlObj = {
                             let singleSignatureRelArr = signatureRelArr[idx];
                             resetStampSignature(pageData, singleSignatureRelArr, getStageStatus() !== 3);
                             await rptSignatureHelper.resetDummySignature(pageData, null); //
+                            if (PAGE_SHOW.isTextSignature) {
+                                resetTextSignature(pageData, getStageStatus() !== 3);
+                            }
                         }
                         downloadPDFReport(result.data, pageSize, rpt_names, signatureRelArr, result.signatureRelInfo, refRptTplIds, STAGE_AUDIT);
                     },

app/public/report/js/rpt_print.js

@@ -97,8 +97,10 @@ let rptPrintHelper = {
             }
             // 计量有电子签名，要单独处理
             for (let cell of page.signature_cells) {
-                svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, fonts, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
-                    offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
+                if (sessionStorage.isTextSignature === '0' || cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
+                    svgPageArr.push(buildSignatureCellSvg(cell, styles, controls, fonts, page[JV.PROP_PAGE_MERGE_BORDER], pagesData[JV.BAND_PROP_MERGE_BAND],
+                        offsetX - actAreaOffsetX, offsetY - actAreaOffsetY, adjustY, canvas, isHtoV, pixelSize, actAreaArr[idx]));
+                }
             }
             //图表
             if (page.figure_cells && page.figure_cells.length > 0) {