Prechádzať zdrojové kódy

多标段汇总表签章问题

Tony Kang 2 rokov pred
rodič
commit
71f4501db5
1 zmenil súbory, kde vykonal 6 pridanie a 9 odobranie
  1. 6 9
      app/public/report/js/rpt_custom.js

+ 6 - 9
app/public/report/js/rpt_custom.js

@@ -449,15 +449,12 @@ const rptCustomObj = (function () {
             ROLE_REL_LIST = zTreeOprObj._parseRoleRelList(result.signatureRelInfo[0].rel_content);
             STAGE_AUDIT = result.stageAudit;
             rptSignatureHelper.originalRoleRelList = zTreeOprObj._parseRoleRelList(result.signatureRelInfo[0].rel_content);
-            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);
+            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); // 这里重新整理签章坐标信息(因签章大小在后台暂时获取不到,挪到前端处理)
+            rptSignatureHelper.mergeSignAudit(pageRst, ROLE_REL_LIST, STAGE_AUDIT, getStageStatus() !== 3);
+            if (PAGE_SHOW.isTextSignature) {
+                resetTextSignature(pageRst, getStageStatus() !== 3);
             }
         } else {
             CURRENT_ROLE_REL_ID = -1;