BUG #3796

app/public/report/js/rpt_custom.js

@@ -458,7 +458,7 @@ const rptCustomObj = (function () {
             await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
             rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT, getStageStatus() !== 3);
             if (PAGE_SHOW.isTextSignature) {
-                resetTextSignature(pageRst, getStageStatus() !== 3);
+                resetTextSignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3);
             }
         } else {
             CURRENT_ROLE_REL_ID = -1;

app/public/report/js/rpt_main.js

@@ -524,7 +524,7 @@ let zTreeOprObj = {
                     await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到，挪到前端处理)
                     rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT, getStageStatus() !== 3);
                     if (PAGE_SHOW.isTextSignature) {
-                        resetTextSignature(pageRst, getStageStatus() !== 3);
+                        resetTextSignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3);
                     }
                 } else {
                     CURRENT_ROLE_REL_ID = -1;
@@ -551,7 +551,7 @@ let zTreeOprObj = {
                     rptSignatureHelper.buildSelectableAccountUsed();
                     rptSignatureHelper.buildRoleDom(ROLE_LIST);
                     // if (PAGE_SHOW.isTextSignature) {
-                    //     resetTextSignature(zTreeOprObj.currentRptPageRst, current_stage_status !== 3);
+                    //     resetTextSignature(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, current_stage_status !== 3);
                     // }
                     me.showPage(1, canvas);
                     if (PAGE_SHOW.showArchive) {
@@ -1054,7 +1054,7 @@ let rptControlObj = {
                                 // rptSignatureHelper.mergeSignature(pageObj, singleSignatureRelArr); // 这里merge的意义不大
                                 rptSignatureHelper.mergeSignAudit(pageObj, singleSignatureRelArr, STAGE_AUDIT, getStageStatus() !== 3);
                                 if (PAGE_SHOW.isTextSignature) {
-                                    resetTextSignature(pageObj, getStageStatus() !== 3);
+                                    resetTextSignature(pageObj, singleSignatureRelArr, getStageStatus() !== 3);
                                 }
                             }
                         }
@@ -1225,7 +1225,7 @@ let rptControlObj = {
                             resetStampSignature(pageData, singleSignatureRelArr, getStageStatus() !== 3, STAGE_AUDIT, LEDGER_LIST);
                             await rptSignatureHelper.resetDummySignature(pageData, null); //
                             if (PAGE_SHOW.isTextSignature) {
-                                resetTextSignature(pageData, getStageStatus() !== 3);
+                                resetTextSignature(pageData, singleSignatureRelArr, getStageStatus() !== 3);
                             }
                         }
                         downloadPDFReport(result.data, pageSize, rpt_names, signatureRelArr, result.signatureRelInfo, refRptTplIds, STAGE_AUDIT);

app/public/report/js/rpt_preview_common.js

@@ -86,7 +86,7 @@ async function printPageLoading() {
                             rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit, true);
                         }
                         if (isTextSignature) {
-                            resetTextSignature(result.data[idx], _current_stage_status !== 3);
+                            resetTextSignature(result.data[idx], singleSignatureRelArr, _current_stage_status !== 3);
                         }
                     }
                 }

app/public/report/js/rpt_signature.js

@@ -606,8 +606,7 @@ let rptSignatureHelper = {
         // ROLE_REL_LIST = ROLE_REL_LIST.concat(rptSignatureHelper.originalRoleRelList);
         ROLE_REL_LIST = JSON.parse(JSON.stringify(rptSignatureHelper.originalRoleRelList));
         if (PAGE_SHOW.isTextSignature) {
-            // resetTextSignature(zTreeOprObj.currentRptPageRst);
-            resetTextSignature(zTreeOprObj.currentRptPageRst, getStageStatus() !== 3);
+            resetTextSignature(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, getStageStatus() !== 3);
         }
         zTreeOprObj.showPage(zTreeOprObj.currentPage, zTreeOprObj.canvas);
     },
@@ -676,7 +675,7 @@ let rptSignatureHelper = {
         await rptSignatureHelper.resetDummySignature(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, getStageStatus() !== 3);
         // rptSignatureHelper.mergeSignAudit(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, STAGE_AUDIT, getStageStatus() !== 3);
         if (PAGE_SHOW.isTextSignature) {
-            resetTextSignature(zTreeOprObj.currentRptPageRst, getStageStatus() !== 3);
+            resetTextSignature(zTreeOprObj.currentRptPageRst, ROLE_REL_LIST, getStageStatus() !== 3);
         }
         zTreeOprObj.showPage(zTreeOprObj.currentPage, zTreeOprObj.canvas);
     },
@@ -1550,7 +1549,7 @@ function resetStampSignature(pageData, roleRelList, checkAudit = false, stg_audi
     }
 }
 
-function resetTextSignature(pageData, checkAudit = false) {
+function resetTextSignature(pageData, role_rel_list = [], checkAudit = false) {
     for (let pageIdx = 0; pageIdx < pageData.items.length; pageIdx++) {
         const page = pageData.items[pageIdx];
         for (let sCell of page.signature_cells) {
@@ -1565,7 +1564,7 @@ function resetTextSignature(pageData, checkAudit = false) {
                 }
                 if (fitCell) {
                     fitCell.Value = '';
-                    for (let role of ROLE_REL_LIST) {
+                    for (let role of role_rel_list) {
                         const role_rel = getTheRightRole(role, pageIdx);
                         if (!checkAudit || rptSignatureHelper._chkIfAudit(role_rel)) {
                             if (sCell.signature_name === role_rel.signature_name) {
@@ -1587,8 +1586,8 @@ function resetTextSignature(pageData, checkAudit = false) {
                         Value: '',
                         area: { Left: sCell.area.Left, Right: sCell.area.Right, Top: sCell.area.Top, Bottom: sCell.area.Bottom },
                     };
-                    if (ROLE_REL_LIST) {
-                        for (let role of ROLE_REL_LIST) {
+                    if (role_rel_list) {
+                        for (let role of role_rel_list) {
                             const role_rel = getTheRightRole(role, pageIdx);
                             if (!checkAudit || rptSignatureHelper._chkIfAudit(role_rel)) {
                                 if (sCell.signature_name === role_rel.signature_name && role_rel.sign_output && role_rel.sign_output.indexOf(NORMAL_SIGN_STR) >= 0) {