变更令导出PDF的签名问题(status判断)

app/public/report/js/rpt_jspdf.js

@@ -73,7 +73,7 @@ const JpcJsPDFHelper = {
         let newPageMergeBand = private_getIniPageMergeBorder(pageObj[JV.BAND_PROP_MERGE_BAND]);
         // let ppStatus = zTreeOprObj._chkPrePayStatus();
         if (!keepOrgValue) {
-            if (current_stage_status === 3 || ppStatus === 3) {
+            if (getStageStatus() === 3) {
                 rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false);
                 // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr); // 这里merge的意义不大
                 rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr);
@@ -124,7 +124,7 @@ const JpcJsPDFHelper = {
                 // 计量有电子签名，要单独处理
                 // let ppStatus = zTreeOprObj._chkPrePayStatus();
                 for (let cell of page.signature_cells) {
-                    if (current_stage_status === 3 || ppStatus === 3) {
+                    if (getStageStatus() === 3) {
                         private_drawSignature(doc, ctx, cell, styles, controls, newPageMergeBand, false, signatureRelArr);
                     } else {
                         private_drawSignature(doc, ctx, cell, styles, controls, newPageMergeBand, true, signatureRelArr);

app/public/report/js/rpt_main.js

@@ -1163,8 +1163,17 @@ let rptControlObj = {
                         if (params.needWaterMark) COMMON_WATER_MARK_PIC_DATA = result.waterMarkStr;
                         STAGE_AUDIT = result.stageAudit;
                         let pageSize = rptControlObj.getCurrentPageSize();
-                        for (const signatureRel of result.signatureRelInfo) {
-                            signatureRelArr.push(JSON.parse(signatureRel.rel_content));
+                        let pageDataArr = result.data;
+                        let signatureRelInfo = result.signatureRelInfo;
+                        for (let pageObj of pageDataArr) {
+                            let tmpRel = [];
+                            for (const signatureRel of signatureRelInfo) {
+                                if (signatureRel.rpt_id === pageObj.id) {
+                                    tmpRel = JSON.parse(signatureRel.rel_content);
+                                    break;
+                                }
+                            }
+                            signatureRelArr.push(tmpRel);
                         }
                         for (const pageData of result.data) {
                             await rptSignatureHelper.resetDummySignature(pageData, null); //