修复获取审批上一人名称问题

app/view/advance/detail.ejs

@@ -328,7 +328,7 @@
                                                                             class="pull-right
                                                                                         <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                             <%- auditor.status === auditConst.status.checkNo ? advance.user.name : '' %>
-                                                                            <%- auditor.status === auditConst.status.checkNoPre ? auditors.find(item => item.order === auditor.sort-1).name : '' %>
+                                                                            <%- auditor.status === auditConst.status.checkNoPre ? history.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                         </span>
                                                                     </p>
                                                                     <p class="text-muted mb-0"><%- auditor.role %></p>

app/view/advance/modal_audit.ejs

@@ -184,7 +184,7 @@
                                                             class="pull-right
                                                                             <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                             <%- auditor.status === auditConst.status.checkNo ? advance.user.name : '' %>
-                                                            <%- auditor.status === auditConst.status.checkNoPre ? history[index-1].name : '' %>
+                                                            <%- auditor.status === auditConst.status.checkNoPre ? history.find(item => item.sort === auditor.sort-1).name : '' %>
                                                         </span>
                                                     </p>
                                                     <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -368,7 +368,7 @@
                                                                     class="pull-right
                                                                                     <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                     <%- auditor.status === auditConst.status.checkNo ? advance.user.name : '' %>
-                                                                    <%- auditor.status === auditConst.status.checkNoPre ? history[index-1].name : '' %>
+                                                                    <%- auditor.status === auditConst.status.checkNoPre ? history.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                 </span>
                                                             </p>
                                                             <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -535,7 +535,7 @@
                                                                     id="inlineRadio2"
                                                                     value="<%- auditConst.status.checkNoPre %>">
                                                                 <label class="form-check-label" for="inlineRadio2">退回上一审批人
-                                                                    <%- auditors.find(item => item.order === auditor.sort-1).name %></label>
+                                                                    <%- history.find(item => item.sort === auditor.sort-1).name %></label>
                                                             </div>
                                                             <% } %>
                                                         </div>
@@ -581,7 +581,7 @@
                                                                     class="pull-right
                                                                                     <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                     <%- auditor.status === auditConst.status.checkNo ? advance.user.name : '' %>
-                                                                    <%- auditor.status === auditConst.status.checkNoPre ? history[index-1].name : '' %>
+                                                                    <%- auditor.status === auditConst.status.checkNoPre ? history.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                 </span>
                                                             </p>
                                                             <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -609,7 +609,7 @@
                                                                             id="inlineRadio2"
                                                                             value="<%- auditConst.status.checkNoPre %>">
                                                                         <label class="form-check-label" for="inlineRadio2">退回上一审批人
-                                                                            <%- auditors.find(item => item.order === auditor.sort-1).name %></label>
+                                                                            <%- history.find(item => item.sort === auditor.sort-1).name %></label>
                                                                     </div>
                                                                     <% } %>
                                                                 </div>

app/view/material/audit_modal.ejs

@@ -219,7 +219,7 @@
                                                                             class="pull-right
                                                                             <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                         <%- auditor.status === auditConst.status.checkNo ? ctx.material.user.name : '' %>
-                                                                        <%- auditor.status === auditConst.status.checkNoPre ? (ctx.material.auditors2.find(item => item.order === auditor.sort-1) ? ctx.material.auditors2.find(item => item.order === auditor.sort-1).name : '') : '' %>
+                                                                        <%- auditor.status === auditConst.status.checkNoPre ? auditors.find(item => item.sort === auditor.sort-1).name : '' %>
                                                         </span>
                                                                 </p>
                                                                 <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -409,7 +409,7 @@
                                                                                     class="pull-right
                                                                                     <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                                 <%- auditor.status === auditConst.status.checkNo ? ctx.material.user.name : '' %>
-                                                                                <%- auditor.status === auditConst.status.checkNoPre ? ctx.material.auditors2.find(item => item.order === auditor.sort-1).name : '' %>
+                                                                                <%- auditor.status === auditConst.status.checkNoPre ? auditors.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                 </span>
                                                                         </p>
                                                                         <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -624,7 +624,7 @@
                                                                                     class="pull-right
                                                                                     <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                                 <%- auditor.status === auditConst.status.checkNo ? ctx.material.user.name : '' %>
-                                                                                <%- auditor.status === auditConst.status.checkNoPre ? ctx.material.auditors2.find(item => item.order === auditor.sort-1).name : '' %>
+                                                                                <%- auditor.status === auditConst.status.checkNoPre ? auditors.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                 </span>
                                                                         </p>
                                                                         <p class="text-muted mb-0"><%- auditor.role %></p>

app/view/stage/audit_modal.ejs

@@ -585,12 +585,7 @@
                                                                 id="inlineRadio2"
                                                                 value="<%- auditConst.status.checkNoPre %>">
                                                             <label class="form-check-label" for="inlineRadio2">退回上一审批人
-                                                                <% for (const [i, a] of auditors.entries()) { %>
-                                                                    <% if (a.aid === ctx.stage.curAuditor.aid) { %>
-                                                                        <%- auditors[i-1].name %>
-                                                                        <% break; %>
-                                                                    <% } %>
-                                                                <% } %>
+                                                                <%- auditors.find(item => item.sort === auditor.sort-1).name %>
                                                             </label>
                                                         </div>
                                                         <% } %>
@@ -664,12 +659,7 @@
                                                                 id="inlineRadio2"
                                                                 value="<%- auditConst.status.checkNoPre %>">
                                                             <label class="form-check-label" for="inlineRadio2">退回上一审批人
-                                                                <% for (const [i, a] of auditors.entries()) { %>
-                                                                    <% if (a.aid === ctx.stage.curAuditor.aid) { %>
-                                                                        <%- auditors[i-1].name %>
-                                                                        <% break; %>
-                                                                    <% } %>
-                                                                <% } %>
+                                                                <%- auditors.find(item => item.sort === auditor.sort-1).name %>
                                                             </label>
                                                         </div>
                                                         <% } %>