Tony Kang 7 kuukautta sitten
vanhempi
commit
0243d790ef
2 muutettua tiedostoa jossa 12 lisäystä ja 1 poistoa
  1. 5 1
      app/public/report/js/rpt_signature.js
  2. 7 0
      app/service/role_rpt_rel.js

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

@@ -1096,7 +1096,11 @@ let rptSignatureHelper = {
                     }
                     for (const role of currRoleRelList) {
                         const role_rel = getTheRightRole(role, pageIdx);
-                        if (role.type === '流程') rptSignatureHelper._setDftDate(role_rel, false);
+                        // if (role.type === '流程') rptSignatureHelper._setDftDate(role_rel, false);
+                        if (role.type === '流程') {
+                            if (role.flowAccList[pageIdx] < 0) continue; // 没有合适的,则判断下一个
+                            rptSignatureHelper._setDftDate(role_rel, false);
+                        }
                         if (sCell.signature_name === role_rel.signature_name + '_签字日期') {
                             if (!checkAudit || rptSignatureHelper._chkIfAudit(role_rel)) {
                                 // 如果签名者是在审核流程中并已审批通过(个人通过,非期通过),则也需要显示

+ 7 - 0
app/service/role_rpt_rel.js

@@ -183,6 +183,13 @@ module.exports = app => {
                             newRole[key] = '';
                         }
                     }
+                    if (newRole.type === '流程') {
+                        if (newRole.assFlowInfos && newRole.assFlowInfos.length > 0) {
+                            newRole.assFlowInfos.forEach(assRole => {
+                                assRole.sign_date = '';
+                            });
+                        }
+                    }
                 }
                 await this.createRoleRelationship(tender_id, rptRoleRel.rpt_id, stage.id, '', 'tender', newRelList); // 暂时用不到,就先不返回结果
             }