期列表审批进度调整

app/const/audit.js

@@ -217,6 +217,7 @@ const stage = (function() {
     statusButtonClass[status.checkNoPre] = 'btn-warning';
     statusButtonClass[status.checkAgain] = 'btn-warning';
     statusButtonClass[status.checkCancel] = 'btn-warning';
+
     // 描述文本
     const auditString = [];
     auditString[status.uncheck] = '';
@@ -247,19 +248,19 @@ const stage = (function() {
     auditProgress[status.uncheck] = '待上报';
     auditProgress[status.checking] = '审批中';
     auditProgress[status.checked] = '审批通过';
-    auditProgress[status.checkNo] = '审批退回';
-    auditProgress[status.checkNoPre] = '审批退回';
-    auditProgress[status.checkAgain] = '重新审批';
-    auditProgress[status.checkCancel] = '撤回';
+    auditProgress[status.checkNo] = '重新上报';
+    auditProgress[status.checkNoPre] = '审批中';
+    auditProgress[status.checkAgain] = '审批中';
+    auditProgress[status.checkCancel] = '';
     // 样式
     const auditProgressClass = [];
     auditProgressClass[status.uncheck] = '';
     auditProgressClass[status.checking] = 'text-warning';
     auditProgressClass[status.checked] = 'text-success';
-    auditProgressClass[status.checkNo] = 'text-warning';
+    auditProgressClass[status.checkNo] = '';
     auditProgressClass[status.checkNoPre] = 'text-warning';
     auditProgressClass[status.checkAgain] = 'text-warning';
-    auditProgressClass[status.checkCancel] = 'text-warning';
+    auditProgressClass[status.checkCancel] = '';
     /* ------------------------------------------------------- */
 
     const tiStatusString = [];

app/controller/measure_controller.js

@@ -55,10 +55,8 @@ module.exports = app => {
                     }
                     if (!s.final_auditor_str || s.status !== auditConst.status.checked) {
                         // 根据期状态返回展示用户
+                        if (s.status === auditConst.status.checkNoPre) s.status = auditConst.status.checking;
                         s.curAuditors = await ctx.service.stageAudit.getAuditorsByStatus(s.id, s.status, s.times);
-                        if (s.status === auditConst.status.checkNoPre) {
-                            s.curAuditors2 = await ctx.service.stageAudit.getAuditorsByStatus(s.id, auditConst.status.checking, s.times);
-                        }
                         if (s.status === auditConst.status.checked) {
                             const final_auditor_str = (s.curAuditors[0].audit_type === auditType.key.common)
                                 ? `${s.curAuditors[0].name}${(s.curAuditors[0].role ? '-' + s.curAuditors[0].role : '')}`

app/view/measure/stage.ejs

@@ -107,11 +107,9 @@
                         <td class="text-center">
                             <% if (s.status === auditConst.status.uncheck && s.user_id === ctx.session.sessionUser.accountId) { %>
                             <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
-                            <% } else if (s.status === auditConst.status.checkNo && s.curAuditors && s.user_id === ctx.session.sessionUser.accountId) { %>
+                            <% } else if (s.status === auditConst.status.checkNo && s.user_id === ctx.session.sessionUser.accountId) { %>
                             <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
-                            <% } else if (s.status === auditConst.status.checking && s.curAuditors && s.curAuditors.findIndex(x => { return x.aid === ctx.session.sessionUser.accountId; }) >= 0) { %>
-                            <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
-                            <% } else if (s.status === auditConst.status.checkNoPre && s.curAuditor2 && s.curAuditor2.findIndex(x => { return x.aid === ctx.session.sessionUser.accountId; }) >= 0) { %>
+                            <% } else if ((s.status === auditConst.status.checking || s.status === auditConst.status.checkNoPre) && s.curAuditors && s.curAuditors.findIndex(x => { return x.aid === ctx.session.sessionUser.accountId; }) >= 0) { %>
                             <a href="<%- '/tender/' + ctx.tender.id + '/measure/stage/' + s.order %>" target="_blank" class="btn <%- auditConst.statusButtonClass[s.status] %> btn-sm"><%- auditConst.statusButton[s.status] %></a>
                             <% } else { %>
                             <span class="<%- auditConst.auditStringClass[s.status] %>"><%- auditConst.auditString[s.status] %></span>