BUG #3657

app/public/report/js/rpt_jspdf.js

@@ -75,14 +75,16 @@ const JpcJsPDFHelper = {
         let newPageMergeBand = private_getIniPageMergeBorder(pageObj[JV.BAND_PROP_MERGE_BAND]);
         // let ppStatus = zTreeOprObj._chkPrePayStatus();
         if (!keepOrgValue) {
-            if (getStageStatus() === 3) {
-                rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false);
-                // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr); // 这里merge的意义不大
-                rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr);
-            } else {
-                rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false, true);
-                // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr, false, true); // 这里merge的意义很大
-                rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr, true);
+            if (signatureRelArr && signatureRelArr.length > 0) {
+                if (getStageStatus() === 3) {
+                    rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false);
+                    // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr); // 这里merge的意义不大
+                    rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr);
+                } else {
+                    rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false, true);
+                    // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr, false, true); // 这里merge的意义很大
+                    rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr, true);
+                }
             }
         }
         // let signatureCounter = {"allAmt": 0, "picAmt": 0};

app/public/report/js/rpt_main.js

@@ -1052,11 +1052,13 @@ let rptControlObj = {
                         for (let idx = 0; idx < pageDataArr.length; idx++) {
                             const pageObj = pageDataArr[idx];
                             let singleSignatureRelArr = signatureRelArr[idx];
-                            rptSignatureHelper.mergeSignDate(pageObj, singleSignatureRelArr, false, getStageStatus() !== 3);
-                            // rptSignatureHelper.mergeSignature(pageObj, singleSignatureRelArr); // 这里merge的意义不大
-                            rptSignatureHelper.mergeSignAudit(pageObj, singleSignatureRelArr, STAGE_AUDIT, getStageStatus() !== 3);
-                            if (PAGE_SHOW.isTextSignature) {
-                                resetTextSignature(pageObj, getStageStatus() !== 3);
+                            if (signatureRelInfo && signatureRelInfo.length > 0) {
+                                rptSignatureHelper.mergeSignDate(pageObj, singleSignatureRelArr, false, getStageStatus() !== 3);
+                                // rptSignatureHelper.mergeSignature(pageObj, singleSignatureRelArr); // 这里merge的意义不大
+                                rptSignatureHelper.mergeSignAudit(pageObj, singleSignatureRelArr, STAGE_AUDIT, getStageStatus() !== 3);
+                                if (PAGE_SHOW.isTextSignature) {
+                                    resetTextSignature(pageObj, getStageStatus() !== 3);
+                                }
                             }
                         }
                         // if (getStageStatus() === 3) {

app/public/report/js/rpt_preview_common.js

@@ -68,19 +68,21 @@ async function printPageLoading() {
                             break;
                         }
                     }
-                    if (_current_stage_status === 3) {
-                        rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false);
-                        rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true);
-                        await rptSignatureHelper.resetDummySignature(result.data[idx], null); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
-                        rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit);
-                    } else {
-                        rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false, true);
-                        rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true, true);
-                        await rptSignatureHelper.resetDummySignature(result.data[idx], singleSignatureRelArr, false, true); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
-                        rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit, true);
-                    }
-                    if (isTextSignature) {
-                        resetTextSignature(result.data[idx], _current_stage_status !== 3);
+                    if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
+                        if (_current_stage_status === 3) {
+                            rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false);
+                            rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true);
+                            await rptSignatureHelper.resetDummySignature(result.data[idx], null); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
+                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit);
+                        } else {
+                            rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false, true);
+                            rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr, true, true);
+                            await rptSignatureHelper.resetDummySignature(result.data[idx], singleSignatureRelArr, false, true); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
+                            rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit, true);
+                        }
+                        if (isTextSignature) {
+                            resetTextSignature(result.data[idx], _current_stage_status !== 3);
+                        }
                     }
                 }
                 let multiRptData = result.data;