Browse Source

会签或签审批bug

MaiXinRong 11 months ago
parent
commit
29548223e8
2 changed files with 3 additions and 4 deletions
  1. 3 2
      app/controller/ledger_audit_controller.js
  2. 0 2
      app/view/ledger/explode_modal.ejs

+ 3 - 2
app/controller/ledger_audit_controller.js

@@ -143,8 +143,9 @@ module.exports = app => {
                 if (!tender.data || tender.data.ledger_status !== auditConst.status.checking) {
                     throw '当前标段数据有误';
                 }
-                const curAudit = await ctx.service.ledgerAudit.getCurAuditor(tender.id, tender.data.ledger_times);
-                if (curAudit.audit_id !== ctx.session.sessionUser.accountId) {
+                const curAudits = await ctx.service.ledgerAudit.getCurAuditors(tender.id, tender.data.ledger_times);
+                const curAuditIds = curAudits.map(x => { return x.audit_id; });
+                if (curAuditIds.indexOf(ctx.session.sessionUser.accountId) < 0) {
                     throw '审批失败';
                 }
                 const checkType = parseInt(ctx.request.body.checkType);

+ 0 - 2
app/view/ledger/explode_modal.ejs

@@ -269,7 +269,6 @@
                         <div class="<%- idx < tender.auditHistory.length - 1 ? 'fold-card' : '' %>">
                             <div class="text-center text-muted"><%- idx+1 %>#</div>
                             <ul class="timeline-list list-unstyled mt-2 <% if (idx === tender.auditHistory.length - 1) { %>last-auditor-list<% } %>">
-                                <% console.log(his) %>
                                 <% his.forEach((group, index) => { %>
                                 <% if (index === 0) { %>
                                 <li class="timeline-list-item pb-2">
@@ -475,7 +474,6 @@
 </div>
 <% } %>
 
-<% console.log(ctx.session.sessionUser.accountId, ctx.tender.data.user_id, ctx.session.sessionUser.is_admin) %>
 <% if ((ctx.session.sessionUser.accountId === ctx.tender.data.user_id || ctx.session.sessionUser.is_admin) && (ctx.tender.data.ledger_status === auditConst.status.uncheck || ctx.tender.data.ledger_status === auditConst.status.checkNo)) { %>
     <script>
         const shenpi_status = <%- ctx.tender.info.shenpi.ledger %>;