Browse Source

多期同时计量,原报签章在刷新后丢失问题

Tony Kang 10 months ago
parent
commit
f80caa62e8
1 changed files with 6 additions and 1 deletions
  1. 6 1
      app/public/report/js/rpt_main.js

+ 6 - 1
app/public/report/js/rpt_main.js

@@ -514,6 +514,7 @@ let zTreeOprObj = {
                     CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
                     ROLE_REL_LIST = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
                     rptSignatureHelper.originalRoleRelList = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
+                    resetStampSignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3);
                     rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true, getStageStatus() !== 3);
                     rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST, true, getStageStatus() !== 3);
                     await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST, getStageStatus() !== 3); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
@@ -1035,6 +1036,7 @@ let rptControlObj = {
                             const pageObj = pageDataArr[idx];
                             let singleSignatureRelArr = signatureRelArr[idx];
                             if (signatureRelInfo && signatureRelInfo.length > 0) {
+                                resetStampSignature(pageObj, singleSignatureRelArr, getStageStatus() !== 3);
                                 rptSignatureHelper.mergeSignDate(pageObj, singleSignatureRelArr, false, getStageStatus() !== 3);
                                 // rptSignatureHelper.mergeSignature(pageObj, singleSignatureRelArr); // 这里merge的意义不大
                                 rptSignatureHelper.mergeSignAudit(pageObj, singleSignatureRelArr, STAGE_AUDIT, getStageStatus() !== 3);
@@ -1200,7 +1202,10 @@ let rptControlObj = {
                             }
                             signatureRelArr.push(tmpRel);
                         }
-                        for (const pageData of result.data) {
+                        for (let idx = 0; idx < result.data.length; idx++) {
+                            const pageData = result.data[idx];
+                            let singleSignatureRelArr = signatureRelArr[idx];
+                            resetStampSignature(pageData, singleSignatureRelArr, getStageStatus() !== 3);
                             await rptSignatureHelper.resetDummySignature(pageData, null); //
                         }
                         downloadPDFReport(result.data, pageSize, rpt_names, signatureRelArr, result.signatureRelInfo, refRptTplIds, STAGE_AUDIT);