签名预览

app/controller/payment_controller.js

@@ -313,6 +313,7 @@ module.exports = app => {
                     currentStamp: rptAudit && rptAudit.signature_msg.stamp_path ? rptAudit.signature_msg.stamp_path : (stampPathList.length > 0 ? stampPathList[0] : ''),
                     companyStamp: companyInfo && companyInfo.sign_path ? companyInfo.sign_path : '',
                     preUrl: '/payment/' + ctx.tender.id + '/detail/' + ctx.detail.id,
+                    OSS_PATH: ctx.app.config.fujianOssPath,
                 };
                 if ((ctx.detail.status === auditConst.status.uncheck || ctx.detail.status === auditConst.status.checkNo) && ctx.session.sessionUser.accountId === ctx.detail.uid) {
                     // data.accountGroup = accountGroup;

app/public/report/js/jpc_output.js

@@ -12,7 +12,7 @@ let JpcCanvasOutput = {
         ctx.clearRect(0,0, canvas.width, canvas.height);
         ctx.restore();
     },
-    drawToCanvas : function(pageObj, canvas, pageIdx,hideSignature=false) {
+    drawToCanvas : function(pageObj, canvas, pageIdx,hideSignature=false, forceToDraw = false) {
         let me = this;
         let ctx = canvas.getContext("2d");
         let floatReg = /^(-?\d+)(\.\d+)?$/;
@@ -621,7 +621,7 @@ let JpcCanvasOutput = {
               
                for (let k = 0; k < page.signature_cells.length; k++) {
                     let cell = page.signature_cells[k];
-                    if (PAGE_SHOW['isTextSignature'] === 0 || cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0) {
+                    if (PAGE_SHOW['isTextSignature'] === 0 || cell.signature_name.indexOf(JV.SIGNATURE_NAME_DUMMY) >= 0 || forceToDraw) {
                         // 如果是非文本签名或草图，才显示图片(文本签名已经在后台单独处理，在cells数组内增加一个合适的cell)
                       if(!hideSignature)  private_drawSignatureCell(cell, fonts, styles, controls, newPageMergeBand,moveSignatureTool);
                     }

app/view/payment/detail.ejs

@@ -42,7 +42,7 @@
                     </div>
                     <div class="col-6">
                         <div class="d-flex flex-row">
-                            <a href="#" class="mr-2" >刷新</a>
+                            <a href="javascript: void(0);" onclick="auditRptPrintHelper.showPage()" class="mr-2" >刷新</a>
                             <a href="javascript: void(0);" class="mr-2"  onclick="auditRptPrintHelper.directPDF()">导出pdf</a>
                             <a href="javascript: void(0);" onclick="auditRptPrintHelper.directPrint()">打印</a>
                         </div>
@@ -68,6 +68,7 @@
     const PAGE_SHOW = {closeWaterMark: 1};
     const current_stage_status = -1;
     const VIEW_CANVAS = document.getElementById("auditRptCanvas");
+    const OSS_PATH = '<%- OSS_PATH %>';
     const CUST_CFG = {
         "fonts": [
             {
@@ -147,7 +148,7 @@
         showPage: function() {
             JpcCanvasOutput.cleanCanvas(VIEW_CANVAS);
             JpcCanvasOutput.drawPageBorder(tesRpttData, VIEW_CANVAS, getScreenDPI());
-            JpcCanvasOutput.drawToCanvas(tesRpttData, VIEW_CANVAS, 1);
+            JpcCanvasOutput.drawToCanvas(tesRpttData, VIEW_CANVAS, 1, false, true);
         },
         directPrint: function() {
             sessionStorage.report_direct_data = JSON.stringify(tesRpttData);