审批流程修正

app/controller/material_controller.js

@@ -98,7 +98,7 @@ module.exports = app => {
                 }
                 responseData.data.auditHistory = auditHistory;
                 // 获取审批流程中左边列表
-                responseData.data.auditors = await ctx.service.materialAudit.getAuditGroupByList(materialInfo.id, times);
+                responseData.data.auditors = await ctx.service.materialAudit.getAuditorsWithOwner(materialInfo.id, times);
 
                 responseData.data.user = await ctx.service.projectAccount.getAccountInfoById(materialInfo.user_id);
                 // 获取原报信息

app/public/js/measure_material.js

@@ -40,6 +40,7 @@ $(function () {
             })
             $('#auditor-list').empty()
             $('#auditor-list').append(auditorsHTML)
+            const leftAuditors = auditors;
             auditHistory.forEach((auditors, idx) => {
                 if(idx === auditHistory.length - 1 && auditHistory.length !== 1) {
                     historyHTML += `<div class="text-right"><a href="javascript: void(0);" id="fold-btn" data-target="show"
@@ -147,7 +148,7 @@ $(function () {
                                             class="pull-right
                                                             ${auditConst.statusClass[auditor.status]}">${auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''}
                                             ${auditor.status === auditConst.status.checkNo ? user.name : ''}
-                                            ${auditor.status === auditConst.status.checkNoPre ? auditors[index-1].name : ''}
+                                            ${auditor.status === auditConst.status.checkNoPre ? (leftAuditors.find(item => item.order === auditor.sort-1) ? leftAuditors.find(item => item.order === auditor.sort-1).name : '') : ''}
                                         </span>
                                     </p>
                                     <p class="text-muted mb-0">${auditor.role}</p>

app/service/change.js

@@ -399,7 +399,6 @@ module.exports = app => {
                     audit.flow.status.revise,
                 ];
                 const result = await this.db.queryOne(sql, sqlParam);
-                console.log(result);
                 return result ? result.count : 0;
             }
             return await this.db.count(this.tableName, { tid: tenderId, status });

app/view/material/audit_modal.ejs

@@ -215,7 +215,6 @@
                                             <div class="card-body p-3">
                                                 <div class="card-text">
                                                     <p class="mb-1"><span class="h5"><%- auditor.name %></span>
-                                                        <% console.log(auditor.status) %>
                                                         <span
                                                             class="pull-right
                                                                             <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>

app/view/tender/detail.ejs

@@ -890,8 +890,9 @@
                 auditConst = JSON.parse('<%- JSON.stringify(audit.material) %>');
             }
             postData(url, data, function (result) {
-                const { auditHistory, user } = result
+                const { auditHistory, auditors, user } = result
                 let historyHTML = ''
+                const leftAuditors = auditors;
                 auditHistory.forEach((auditors, idx) => {
                     if(idx === auditHistory.length - 1 && auditHistory.length !== 1) {
                         historyHTML += `<div class="text-right"><a href="javascript: void(0);" id="fold-btn" data-target="show"
@@ -999,7 +1000,7 @@
                                             class="pull-right
                                                             ${auditConst.statusClass[auditor.status]}">${auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''}
                                             ${auditor.status === auditConst.status.checkNo ? user.name : ''}
-                                            ${auditor.status === auditConst.status.checkNoPre ? auditors[index-1].name : ''}
+                                            ${auditor.status === auditConst.status.checkNoPre ? (leftAuditors.find(item => item.order === auditor.sort-1) ? leftAuditors.find(item => item.order === auditor.sort-1).name : '') : ''}
                                         </span>
                                     </p>
                                     <p class="text-muted mb-0">${auditor.role}</p>