多表导出PDF/打印 签名日期merge问题

app/public/report/js/rpt_custom.js

@@ -267,7 +267,7 @@ const rptCustomObj = (function () {
             STAGE_AUDIT = result.stageAudit;
             rptSignatureHelper.originalRoleRelList = zTreeOprObj._parseRoleRelList(result.signatureRelInfo[0].rel_content);
             if (current_stage_status === 3) {
-                rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST);
+                rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true);
                 rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST);
                 rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
             }

app/public/report/js/rpt_jspdf.js

@@ -59,7 +59,7 @@ let JpcJsPDFHelper = {
 
         let newPageMergeBand = private_getIniPageMergeBorder(pageObj[JV.BAND_PROP_MERGE_BAND]);
         if (current_stage_status === 3) {
-            rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr);
+            rptSignatureHelper.mergeSignDate(pageObj, signatureRelArr, false);
             // rptSignatureHelper.mergeSignature(pageObj, signatureRelArr); // 这里merge的意义不大
             rptSignatureHelper.mergeSignAudit(pageObj, signatureRelArr, signAuditArr);
         }

app/public/report/js/rpt_main.js

@@ -312,7 +312,7 @@ let zTreeOprObj = {
                     ROLE_REL_LIST = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
                     rptSignatureHelper.originalRoleRelList = me._parseRoleRelList(result.signatureRelInfo[0].rel_content);
                     if (current_stage_status === 3) {
-                        rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST);
+                        rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true);
                         rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST);
                         rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
                     }

app/public/report/js/rpt_print.js

@@ -48,7 +48,7 @@ let rptPrintHelper = {
                         // }
 
                         if (current_stage_status === 3) {
-                            rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr);
+                            rptSignatureHelper.mergeSignDate(result.data[idx], singleSignatureRelArr, false);
                             rptSignatureHelper.mergeSignature(result.data[idx], singleSignatureRelArr);
                             rptSignatureHelper.mergeSignAudit(result.data[idx], singleSignatureRelArr, result.stageAudit);
                         }

app/public/report/js/rpt_signature.js

@@ -555,7 +555,7 @@ let rptSignatureHelper = {
             }
         }
     },
-    mergeSignDate: function (pageData, currRoleRelList) {
+    mergeSignDate: function (pageData, currRoleRelList, isMergeOrgAlso) {
         if (currRoleRelList && currRoleRelList.length > 0 && STAGE_AUDIT && STAGE_AUDIT.length > 0) {
             for (let rridx = 0; rridx < currRoleRelList.length; rridx++) {
                 const role_rel = currRoleRelList[rridx];
@@ -563,7 +563,10 @@ let rptSignatureHelper = {
                     //*
                     let dftDate = _getSignDateByAllScenarios(role_rel.acc_id);
                     role_rel.sign_date = dftDate;
-                    rptSignatureHelper.originalRoleRelList[rridx].sign_date = dftDate;
+                    if (isMergeOrgAlso) {
+                        rptSignatureHelper.originalRoleRelList[rridx].sign_date = dftDate;
+                        //备注：在多选导出的情况下，originalRoleRelList不需要merge
+                    }
                     /*/
                     let hasAudit = false;
                     for (const stg_audit of STAGE_AUDIT) {