Jelajahi Sumber

一些需要选择信息报表的签名问题

Tony Kang 2 tahun lalu
induk
melakukan
c742db70b0
1 mengubah file dengan 7 tambahan dan 2 penghapusan
  1. 7 2
      app/public/report/js/rpt_custom.js

+ 7 - 2
app/public/report/js/rpt_custom.js

@@ -442,17 +442,22 @@ const rptCustomObj = (function () {
         }
     };
 
-    const reloadReportData = function (result) {
+    const reloadReportData = async function (result) {
         let pageRst = result.data;
         if (result.signatureRelInfo && result.signatureRelInfo.length > 0) {
             CURRENT_ROLE_REL_ID = result.signatureRelInfo[0].id;
             ROLE_REL_LIST = zTreeOprObj._parseRoleRelList(result.signatureRelInfo[0].rel_content);
             STAGE_AUDIT = result.stageAudit;
             rptSignatureHelper.originalRoleRelList = zTreeOprObj._parseRoleRelList(result.signatureRelInfo[0].rel_content);
-            if (current_stage_status === 3) {
+            if (getStageStatus() === 3) {
                 rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true);
                 rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST);
                 rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT);
+            } else {
+                rptSignatureHelper.mergeSignDate(pageRst, ROLE_REL_LIST, true, true);
+                rptSignatureHelper.mergeSignature(pageRst, ROLE_REL_LIST, true, true);
+                await rptSignatureHelper.resetDummySignature(pageRst, ROLE_REL_LIST, true); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
+                rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT, true);
             }
         } else {
             CURRENT_ROLE_REL_ID = -1;