合同支付，审批流程显示问题

app/service/phase_pay_audit.js

@@ -63,45 +63,45 @@ module.exports = app => {
         // 获取全部审批历史
         async getAuditorHistory(phaseId, auditTimes, reverse = false) {
             const history = [];
-            if (auditTimes >= 1) {
-                for (let i = 1; i <= auditTimes; i++) {
-                    const auditors = await this.getAuditors(phaseId, i);
-                    const group = this.ctx.helper.groupAuditors(auditors);
-                    const historyGroup = [];
-                    const max_order = group.length > 0 && group[group.length - 1].length > 0 ? group[group.length - 1][0].audit_order : -1;
-                    for (const g of group) {
-                        const his = {
-                            auditYear: '', auditDate: '', auditTime: '', audit_time: null,
-                            audit_type: g[0].audit_type, audit_order: g[0].audit_order,
-                            auditors: g
-                        };
-                        his.is_final = his.audit_order === max_order;
-                        his.auditName = his.audit_order === 0 ? '原报' : (his.is_final ? '终审' : his.audit_order + '审');
-                        his.auditCnName = his.audit_order === 0 ? '原报' : (his.is_final ? '终审' : this.ctx.helper.transFormToChinese(his.audit_order) + '审');
-                        his.name = his.audit_type === auditType.key.common ? g[0].name : his.auditName;
-                        let audit_time;
-                        g.forEach(x => {
-                            if (x.audit_status === auditConst.phasePay.status.checkSkip) return;
-                            if (!his.audit_status || x.audit_status === auditConst.phasePay.status.checking) his.audit_status = x.audit_status;
-                            if (x.audit_time && (!audit_time || x.audit_time > audit_time)) {
-                                audit_time = x.audit_time;
-                                if (his.audit_status !== auditConst.phasePay.status.checking) his.audit_status = x.audit_status;
-                            }
-                        });
-                        if (audit_time) {
-                            his.audit_time = audit_time;
-                            const auditTime = this.ctx.moment(audit_time);
-                            his.auditYear = auditTime.format('YYYY');
-                            his.auditDate = auditTime.format('MM-DD');
-                            his.auditTime = auditTime.format('HH:mm:ss');
+            if (auditTimes < 1) return history;
+
+            for (let i = 1; i <= auditTimes; i++) {
+                const auditors = await this.getAuditors(phaseId, i);
+                const group = this.ctx.helper.groupAuditors(auditors, 'active_order');
+                const historyGroup = [];
+                const max_order = group.length > 0 && group[group.length - 1].length > 0 ? group[group.length - 1][0].audit_order : -1;
+                for (const g of group) {
+                    const his = {
+                        auditYear: '', auditDate: '', auditTime: '', audit_time: null,
+                        audit_type: g[0].audit_type, audit_order: g[0].audit_order,
+                        auditors: g
+                    };
+                    his.is_final = his.audit_order === max_order;
+                    his.auditName = his.audit_order === 0 ? '原报' : (his.is_final ? '终审' : his.audit_order + '审');
+                    his.auditCnName = his.audit_order === 0 ? '原报' : (his.is_final ? '终审' : this.ctx.helper.transFormToChinese(his.audit_order) + '审');
+                    his.name = his.audit_type === auditType.key.common ? g[0].name : his.auditName;
+                    let audit_time;
+                    g.forEach(x => {
+                        if (x.audit_status === auditConst.phasePay.status.checkSkip) return;
+                        if (!his.audit_status || x.audit_status === auditConst.phasePay.status.checking) his.audit_status = x.audit_status;
+                        if (x.audit_time && (!audit_time || x.audit_time > audit_time)) {
+                            audit_time = x.audit_time;
+                            if (his.audit_status !== auditConst.phasePay.status.checking) his.audit_status = x.audit_status;
                         }
-                        historyGroup.push(his);
-                    }
-                    if (reverse) {
-                        history.push(historyGroup.reverse());
-                    } else {
-                        history.push(historyGroup);
+                    });
+                    if (audit_time) {
+                        his.audit_time = audit_time;
+                        const auditTime = this.ctx.moment(audit_time);
+                        his.auditYear = auditTime.format('YYYY');
+                        his.auditDate = auditTime.format('MM-DD');
+                        his.auditTime = auditTime.format('HH:mm:ss');
                     }
+                    historyGroup.push(his);
+                }
+                if (reverse) {
+                    history.push(historyGroup.reverse());
+                } else {
+                    history.push(historyGroup);
                 }
             }
             return history;