Browse Source

fix: 普通签名与多人协同签名的一些冲突解决

Tony Kang 1 year ago
parent
commit
2c81d52a7b
2 changed files with 8 additions and 2 deletions
  1. 7 1
      app/public/report/js/rpt_signature.js
  2. 1 1
      app/view/report/index.ejs

+ 7 - 1
app/public/report/js/rpt_signature.js

@@ -871,7 +871,13 @@ let rptSignatureHelper = {
                     }
                     role_rel.sign_date = dftDate;
                     if (isMergeOrgAlso) {
-                        rptSignatureHelper.originalRoleRelList[rridx].sign_date = dftDate;
+                        for (const orgRR of rptSignatureHelper.originalRoleRelList) {
+                            if (orgRR.signature_name === role_rel.signature_name) {
+                                orgRR.sign_date = dftDate;
+                                break;
+                            }
+                        }
+                        // rptSignatureHelper.originalRoleRelList[rridx].sign_date = dftDate; // 这个在实际情况下originalRoleRelList不一定与currRoleRelList一致
                         //备注:在多选导出的情况下,originalRoleRelList不需要merge
                     }
                 }

+ 1 - 1
app/view/report/index.ejs

@@ -383,7 +383,7 @@
 <script type="text/javascript" src="/public/report/js/rpt_figure.js"></script>
 <script type="text/javascript" src="/public/report/js/jpc_output.js"></script>
 <script type="text/javascript" src="/public/report/js/rpt_print.js?20231217"></script>
-<script type="text/javascript" src="/public/report/js/rpt_signature.js?20240109"></script>
+<script type="text/javascript" src="/public/report/js/rpt_signature.js?20240605"></script>
 <script type="text/javascript" src="/public/report/js/rpt_jspdf.js?20231217"></script>
 <script type="text/javascript" src="/public/report/js/rpt_jsexcel.js?20231217"></script>
 <script type="text/javascript" src="/public/report/js/rpt_indexDb.js?20231217"></script>