导出PDF签名

app/public/report/js/rpt_jspdf.js

@@ -133,7 +133,7 @@ let JpcJsPDFHelper = {
                 for (const rtpSignRel of signatureRelArr) {
                     if (!finded) {
                         for (const signRel of rtpSignRel) {
-                            if (cell.signature_name === signRel.signature_name) {
+                            if (cell.signature_name === signRel.signature_name && signRel.sign_pic !== null && signRel.sign_pic !== undefined) {
                                 private_drawImage(doc, ctx, cell, control, signRel.sign_pic);
                                 finded = true;
                                 break;

app/public/report/js/rpt_main.js

@@ -284,22 +284,10 @@ let zTreeOprObj = {
                 if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
                     CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
                     ROLE_REL_LIST = JSON.parse(result.signatureRelInfo[0].rel_content);
-                    rptSignatureHelper.originalRoleRelList = JSON.parse(result.signatureRelInfo[0].rel_content);
                     STAGE_AUDIT = result.stageAudit;
+                    rptSignatureHelper.originalRoleRelList = JSON.parse(result.signatureRelInfo[0].rel_content);
                     rptSignatureHelper.mergeSignDate();
                     rptSignatureHelper.mergeSignature(pageRst);
-                    // for (const page of pageRst.items) {
-                    //     if (page.signature_cells) {
-                    //         for (const sCell of page.signature_cells) {
-                    //             for (const role_rel of ROLE_REL_LIST) {
-                    //                 if (role_rel.signature_name === sCell.signature_name) {
-                    //                     sCell.path = role_rel.sign_path;
-                    //                     sCell.pre_path = role_rel.sign_path;
-                    //                 }
-                    //             }
-                    //         }
-                    //     }
-                    // }
                 } else {
                     CURRENT_ROLE_REL_ID = -1;
                     ROLE_REL_LIST = [];
@@ -581,6 +569,8 @@ let rptControlObj = {
                         }
                         for (let idx = 0; idx < result.data.length; idx++) {
                             let pageData = result.data[idx];
+                            rptSignatureHelper.mergeSignDate();
+                            rptSignatureHelper.mergeSignature(pageData);
                             JpcJsPDFHelper.outputAsPdf(pageData, pageSize, rpt_names[idx], signatureRelArr);
                         }
                     },