或签问题(选择签名时日期显示)

app/public/report/js/rpt_signature.js

@@ -935,15 +935,15 @@ let rptSignatureHelper = {
             }
         }
     },
-    _chkOrAudit: function(orgRoleRel) {
+    _chkOrAudit: function(acc_id) {
         // 检测 '或签' 情况下的审核状态(在或签情况下，另一个审核通过，那么这个也是通过的)
         let rst = false;
         for (const flow of STAGE_FLOW) {
-            if (flow.aid === orgRoleRel.acc_id) {
+            if (flow.aid === acc_id) {
                 if (flow.audit_type === 3) {
                     // 判断 或签 用户状态
                     for (const secFlow of STAGE_FLOW) {
-                        if (secFlow.audit_type === 3 && secFlow.order === flow.order && secFlow.aid !== orgRoleRel.acc_id) {
+                        if (secFlow.audit_type === 3 && secFlow.order === flow.order && secFlow.aid !== acc_id) {
                             rst = secFlow.status === 3;
                             if (rst) break;
                         }
@@ -981,7 +981,7 @@ let rptSignatureHelper = {
                 }
             }
             if (!rst) {
-                rst = this._chkOrAudit(role_rel);
+                rst = this._chkOrAudit(role_rel.acc_id);
             }
         }
         // rst = true; //测试，未来将屏蔽
@@ -1106,7 +1106,8 @@ function _getSignDateByAllScenarios(userAccId) {
     for (const stg_audit of STAGE_AUDIT) {
         if (stg_audit.aid === userAccId) {
             hasAudit = true;
-            if (stg_audit.status === 3) {
+            // 加上 '或签' 检测
+            if (stg_audit.status === 3 || rptSignatureHelper._chkOrAudit(userAccId)) {
                 rst = stg_audit.end_time;
             } else {
                 rst = '';