Browse Source

预付款bug修复

laiguoran 4 years ago
parent
commit
d11717ff09
2 changed files with 4 additions and 4 deletions
  1. 4 2
      app/controller/advance_controller.js
  2. 0 2
      app/public/js/advance_audit.js

+ 4 - 2
app/controller/advance_controller.js

@@ -94,12 +94,14 @@ module.exports = app => {
                 });
                 data.auditorList = await ctx.service.advanceAudit.getAuditors(ctx.advance.id, ctx.advance.times);
             }
-            // 获取审核人左边列表
-            data.auditors = await ctx.service.advanceAudit.getAuditorsWithOwner(ctx.advance.id, ctx.advance.times);
             // data.fileList = await ctx.service.advanceFile.getAdvanceFiles({ vid: ctx.advance.id });
             // 获取审批流程中右边列表
             const auditHistory = [];
             const times = ctx.advance.status === auditConst.status.checkNo ? ctx.advance.times - 1 : ctx.advance.times;
+            // 获取审核人左边列表
+            data.auditors = ctx.advance.status === auditConst.status.checkNo && ctx.session.sessionUser.accountId !== ctx.advance.uid ?
+                await ctx.service.advanceAudit.getAuditorsWithOwner(ctx.advance.id, times) :
+                await ctx.service.advanceAudit.getAuditorsWithOwner(ctx.advance.id, ctx.advance.times);
             if (times >= 1) {
                 for (let i = 1; i <= times; i++) {
                     auditHistory.push(await ctx.service.advanceAudit.getAuditors(ctx.advance.id, i));

+ 0 - 2
app/public/js/advance_audit.js

@@ -160,10 +160,8 @@ $(document).ready(function () {
                 $('#auditors2 li').eq($('#auditors2 li').length-1).children('i')
                     .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
             }
-            console.log($('#auditors2 li').length);
             for (let i = 0; i < $('#auditors2 li').length; i++) {
                 $('#auditors2 li').eq(i).find('.pull-right').text(i === 0 ? '原报' : (i+1 === $('#auditors2 li').length ? '终' : transFormToChinese(i)) + '审');
-                console.log(i, $('#auditors2 li').eq(i).find('.pull-right').text());
             }
         })
     });