安全计量，计量期列表显示调整

app/service/safe_stage.js

@@ -141,6 +141,9 @@ module.exports = app => {
             safeStage.userIds = safeStage.audit_status === audit.status.uncheck // 当前流程下全部参与人id
                 ? [safeStage.user_id]
                 : safeStage.auditorIds;
+            if (safeStage.audit_status === audit.status.checkNo) {
+                safeStage.checkNoAuditors = await this.ctx.service.safeStageAudit.getAuditorsByStatus(safeStage.id, audit.status.checkNo, safeStage.audit_times-1);
+            }
         }
         async loadAuditViewData(safeStage) {
             if (!safeStage.user) safeStage.user = await this.ctx.service.projectAccount.getAccountInfoById(safeStage.user_id);

app/view/safe_calc/stage.ejs

@@ -83,14 +83,20 @@
                                     <% } else { %>
                                         <a href="#sp-list" data-toggle="modal" data-target="#sp-list" stage-order="<%- s.stage_order %>"><%- ctx.helper.transFormToChinese(s.curAuditors[0].audit_order) + '审' %></a>
                                     <% } %>
-                                <% } %>
+                                <% } else if (s.audit_status === auditConst.status.checkNo && s.checkNoAuditors.length > 0) { %>
+                                    <% if (s.checkNoAuditors[0].audit_type === auditType.key.common) { %>
+                                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" stage-order="<%- s.stage_order %>"><%- s.checkNoAuditors[0].name %><%if (s.checkNoAuditors[0].role !== '' && s.checkNoAuditors[0].role !== null) { %>-<%- s.checkNoAuditors[0].role %><% } %></a>
+                                    <% } else { %>
+                                        <a href="#sp-list" data-toggle="modal" data-target="#sp-list" stage-order="<%- s.stage_order %>"><%- ctx.helper.transFormToChinese(s.checkNoAuditors[0].audit_order) + '审' %></a>
+                                    <% } %>
+                                <% }%>
                             <% } %>
                             <%- auditConst.info[s.audit_status].title %>
                         </td>
                         <td class="text-center">
                             <% if (s.audit_status === auditConst.status.uncheck && s.create_user_id === ctx.session.sessionUser.accountId) { %>
                             <a href="<%- `/sp/${ctx.subProject.id}/safe/tender/${ctx.tender.id}/stage/${s.stage_order}/bills` %>" target="_blank" class="btn <%- auditConst.info[s.audit_status].btnClass %> btn-sm"><%- auditConst.info[s.audit_status].btnTitle %></a>
-                            <% } else if (s.audit_status === auditConst.status.checkNo && s.user_id === ctx.session.sessionUser.accountId) { %>
+                            <% } else if (s.audit_status === auditConst.status.checkNo && s.create_user_id === ctx.session.sessionUser.accountId) { %>
                             <a href="<%- `/sp/${ctx.subProject.id}/safe/tender/${ctx.tender.id}/stage/${s.stage_order}/bills` %>" target="_blank" class="btn <%- auditConst.info[s.audit_status].btnClass %> btn-sm"><%- auditConst.info[s.audit_status].btnTitle %></a>
                             <% } else if ((s.audit_status === auditConst.status.checking || s.audit_status === auditConst.status.checkNoPre) && s.curAuditors && s.curAuditorIds.indexOf(ctx.session.sessionUser.accountId) >= 0) { %>
                             <a href="<%- `/sp/${ctx.subProject.id}/safe/tender/${ctx.tender.id}/stage/${s.stage_order}/bills` %>" target="_blank" class="btn <%- auditConst.info[s.audit_status].btnClass %> btn-sm"><%- auditConst.info[s.audit_status].btnTitle %></a>