审批流程显示问题

app/public/js/measure_stage.js

@@ -38,8 +38,8 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                 </li>`
             }
         })
-        $('#auditor-list').empty()
-        $('#auditor-list').append(auditorsHTML)
+        $('#auditor-list').empty();
+        $('#auditor-list').append(auditorsHTML);
         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"
@@ -75,29 +75,20 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                     <li class="timeline-list-item pb-2">
                         <div class="timeline-item-date">
                             ${formatDate(auditor.end_time)}
-                        </div>`
-
-                        if(index < auditors.length - 1) {
-                            historyHTML += `<div class="timeline-item-tail"></div>`
-                        }
-                        if(auditor.status === auditConst.status.checked) {
-                            historyHTML += `<div class="timeline-item-icon bg-success text-light">
-                                <i class="fa fa-check"></i>
-                            </div>`
-
-                        } else if(auditor.status === auditConst.status.checkNo || auditor.status === auditConst.status.checkNoPre) {
-                            historyHTML += `<div class="timeline-item-icon bg-warning text-light">
-                                <i class="fa fa-level-up"></i>
-                            </div>`
-                        } else if(auditor.status === auditConst.status.checking) {
-                            historyHTML += `<div class="timeline-item-icon bg-warning text-light">
-                                <i class="fa fa-ellipsis-h"></i>
-                            </div>`
-                        } else {
-                            historyHTML += `<div class="timeline-item-icon bg-secondary text-light"></div>`
-
-                        }
-                        historyHTML += `<div class="timeline-item-content">
+                        </div>`;
+                    if (index < auditors.length - 1) {
+                        historyHTML += `<div class="timeline-item-tail"></div>`;
+                    }
+                    if (auditor.status === auditConst.status.checked) {
+                        historyHTML += `<div class="timeline-item-icon bg-success text-light"><i class="fa fa-check"></i></div>`;
+                    } else if (auditor.status === auditConst.status.checkNo || auditor.status === auditConst.status.checkNoPre) {
+                        historyHTML += `<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-level-up"></i></div>`;
+                    } else if (auditor.status === auditConst.status.checking) {
+                        historyHTML += `<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-ellipsis-h"></i></div>`;
+                    } else {
+                        historyHTML += `<div class="timeline-item-icon bg-secondary text-light"></div>`
+                    }
+                    historyHTML += `<div class="timeline-item-content">
                             <div class="card">
                                 <div class="card-body p-3">
                                     <div class="card-text">
@@ -106,67 +97,50 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                                         </p>
                                         <p class="text-muted mb-0">${auditor.role}</p>
                                     </div>
-                                </div>`
-                        if (auditor.opinion) {
-                        historyHTML += `<div class="card-body p-3 border-top">
-                                <p style="margin: 0;">${auditor.opinion}</p>
-                            </div>`
-                        }
-                        historyHTML += `</div></div></li>`
+                                </div>`;
+                    if (auditor.opinion) {
+                        historyHTML += `<div class="card-body p-3 border-top"><p style="margin: 0;">${auditor.opinion}</p></div>`;
+                    }
+                    historyHTML += `</div></div></li>`
                 } else {
-                    historyHTML += `<li class="timeline-list-item pb-2">
-                    <div class="timeline-item-date">
-                        ${formatDate(auditor.end_time)}
-                    </div>`
-
+                    historyHTML += `<li class="timeline-list-item pb-2"><div class="timeline-item-date">${formatDate(auditor.end_time)}</div>`;
                     if(index < auditors.length - 1) {
                         historyHTML += `<div class="timeline-item-tail"></div>`
                     }
                     if(auditor.status === auditConst.status.checked) {
-                        historyHTML += `<div class="timeline-item-icon bg-success text-light">
-                            <i class="fa fa-check"></i>
-                        </div>`
+                        historyHTML += `<div class="timeline-item-icon bg-success text-light"><i class="fa fa-check"></i></div>`;
                     } else if(auditor.status === auditConst.status.checkNo || auditor.status === auditConst.status.checkNoPre) {
-                        historyHTML += `<div class="timeline-item-icon bg-warning text-light">
-                            <i class="fa fa-level-up"></i>
-                        </div>`
-
+                        historyHTML += `<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-level-up"></i></div>`;
                     } else if(auditor.status === auditConst.status.checking) {
-                        historyHTML += `<div class="timeline-item-icon bg-warning text-light">
-                            <i class="fa fa-ellipsis-h"></i>
-                        </div>`
+                        historyHTML += `<div class="timeline-item-icon bg-warning text-light"><i class="fa fa-ellipsis-h"></i></div>`;
                     } else {
-                        historyHTML += `<div class="timeline-item-icon bg-secondary text-light"></div>`
+                        historyHTML += `<div class="timeline-item-icon bg-secondary text-light"></div>`;
                     }
                     historyHTML += `<div class="timeline-item-content">
                     <div class="card">
                         <div class="card-body p-3">
                             <div class="card-text">
                                 <p class="mb-1"><span class="h5">${auditor.name}</span>
-                                    <span
-                                        class="pull-right
-                                                        ${auditConst.statusClass[auditor.status]}">${auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''}
+                                    <span 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 ? auditors[index+1].name : ''}
                                     </span>
                                 </p>
                                 <p class="text-muted mb-0">${auditor.role}</p>
                             </div>
-                        </div>`
+                        </div>`;
 
                     if (auditor.opinion) {
-                    historyHTML += `<div class="card-body p-3 border-top">
-                        <p style="margin: 0;">${auditor.opinion} </p>
-                    </div>`
+                        historyHTML += `<div class="card-body p-3 border-top"><p style="margin: 0;">${auditor.opinion} </p></div>`;
                     }
-                    historyHTML += `</div></div></li>`
+                    historyHTML += `</div></div></li>`;
                 }
-            })
-            historyHTML += '</ul></div>'
-
-        })
-        $('#audit-list').empty()
-        $('#audit-list').append(historyHTML)
+            });
+            historyHTML += '</ul></div>';
+        });
+        $('#audit-list').empty();
+        $('#audit-list').append(historyHTML);
     })
 
 });

app/view/ledger/audit_modal.ejs

@@ -360,9 +360,7 @@
                                                 <% } else { %>
                                                 <p style="margin: 0;"><%- auditor.opinion %></p>
                                                 <% } %>
-
                                             </div>
-
                                             <% } %>
                                         </div>
                                     </div>
@@ -536,7 +534,6 @@
                                                             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 : '' %>
                                                         </span>
                                                     </p>
                                                     <p class="text-muted mb-0"><%- auditor.role %></p>

app/view/stage/audit_modal.ejs

@@ -112,7 +112,6 @@
                             </div>
                         </div>
                         <div class="col-8 modal-height-500" style="overflow: auto">
-
                             <% ctx.stage.auditHistory.forEach((auditors, idx) => { %>
                                 <!-- 展开/收起历史流程 -->
                                 <% if(idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>
@@ -219,11 +218,10 @@
                                                     <div class="card-body p-3">
                                                         <div class="card-text">
                                                             <p class="mb-1"><span class="h5"><%- auditor.name %></span>
-                                                                <span
-                                                                    class="pull-right
-                                                                                    <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
+                                                                <span class="pull-right <%- auditConst.statusClass[auditor.status] %>">
+                                                                    <%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                     <%- auditor.status === auditConst.status.checkNo ? ctx.stage.user.name : '' %>
-                                                                    <%- auditor.status === auditConst.status.checkNoPre ? auditors[index-1].name : '' %>
+                                                                    <%- auditor.status === auditConst.status.checkNoPre ? auditors[index+1].name : '' %>
                                                                 </span>
                                                             </p>
                                                             <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -408,11 +406,10 @@
                                                 <div class="card-body p-3">
                                                     <div class="card-text">
                                                         <p class="mb-1"><span class="h5"><%- auditor.name %></span>
-                                                            <span
-                                                                class="pull-right
-                                                                                        <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
+                                                            <span class="pull-right <%- auditConst.statusClass[auditor.status] %>">
+                                                                <%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                 <%- auditor.status === auditConst.status.checkNo ? ctx.stage.user.name : '' %>
-                                                                <%- auditor.status === auditConst.status.checkNoPre ? auditors[index-1].name : '' %>
+                                                                <%- auditor.status === auditConst.status.checkNoPre ? auditors[index+1].name : '' %>
                                                             </span>
                                                         </p>
                                                         <p class="text-muted mb-0"><%- auditor.role %></p>
@@ -620,11 +617,10 @@
                                                 <div class="card-body p-3">
                                                     <div class="card-text">
                                                         <p class="mb-1"><span class="h5"><%- auditor.name %></span>
-                                                            <span
-                                                                class="pull-right
-                                                                                        <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
+                                                            <span class="pull-right <%- auditConst.statusClass[auditor.status] %>">
+                                                                <%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
                                                                 <%- auditor.status === auditConst.status.checkNo ? ctx.stage.user.name : '' %>
-                                                                <%- auditor.status === auditConst.status.checkNoPre ? auditors[index-1].name : '' %>
+                                                                <%- auditor.status === auditConst.status.checkNoPre ? auditors[index+1].name : '' %>
                                                             </span>
                                                         </p>
                                                         <p class="text-muted mb-0"><%- auditor.role %></p>