审批流程显示调整

app/public/js/measure_stage.js

@@ -40,15 +40,19 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                 auditorsHTML.push(`<li class="list-group-item d-flex justify-content-between align-items-center">
                     <span class="mr-1"><i class="fa fa fa-stop-circle fa-rotate-90"></i></span>
                 <span class="text-muted">${getGroupAuditHtml(group)}</span>
-                <span class="badge badge-light badge-pill ml-auto"><small>终审</small></span>
+                <div class="d-flex ml-auto">
                 ${getAuditTypeHtml(group[0].audit_type)}
+                <span class="badge badge-light badge-pill ml-auto"><small>终审</small></span>
+                </div>
                 </li>`);
             } else {
                 auditorsHTML.push(`<li class="list-group-item d-flex justify-content-between align-items-center">
                     <span class="mr-1"><i class="fa fa fa-chevron-circle-down"></i></span>
                 <span class="text-muted">${getGroupAuditHtml(group)}</span>
-                <span class="badge badge-light badge-pill ml-auto"><small>${transFormToChinese(idx)}审</small></span>
+                <div class="d-flex ml-auto">
                 ${getAuditTypeHtml(group[0].audit_type)}
+                <span class="badge badge-light badge-pill"><small>${transFormToChinese(idx)}审</small></span>
+                </div>
                 </li>`);
             }
         });

app/view/stage/audit_modal.ejs

@@ -119,10 +119,12 @@
                                             <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
-                                        <% if (item[0].audit_type !== auditType.key.common) { %>
-                                        <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
-                                        <% } %>
-                                        <span class="badge badge-light badge-pill"><small>终审</small></span>
+                                        <div class="d-flex ml-auto">
+                                            <% if (item[0].audit_type !== auditType.key.common) { %>
+                                            <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1"><small><%- auditType.info[item[0].audit_type].short %></small></span>
+                                            <% } %>
+                                            <span class="badge badge-light badge-pill"><small>终审</small></span>
+                                        </div>
                                     </li>
                                     <% } else {%>
                                     <li class="list-group-item d-flex justify-content-between align-items-center">
@@ -132,10 +134,12 @@
                                             <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
-                                        <% if (item[0].audit_type !== auditType.key.common) { %>
-                                        <span class="badge badge-pill badge-<%- auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
-                                        <% } %>
-                                        <span class="badge badge-light badge-pill"><small><%= ctx.helper.transFormToChinese(idx) %>审</small></span>
+                                        <div class="d-flex ml-auto">
+                                            <% if (item[0].audit_type !== auditType.key.common) { %>
+                                            <span class="badge badge-pill badge-<%- auditType.info[item[0].audit_type].class %> p-1"><small><%- auditType.info[item[0].audit_type].short %></small></span>
+                                            <% } %>
+                                            <span class="badge badge-light badge-pill"><small><%= ctx.helper.transFormToChinese(idx) %>审</small></span>
+                                        </div>
                                     </li>
                                     <% } %>
                                     <% }) %>
@@ -292,10 +296,12 @@
                                             <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
-                                        <% if (item[0].audit_type !== auditType.key.common) { %>
-                                        <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
-                                        <% } %>
-                                        <span class="badge badge-light badge-pill"><small>终审</small></span>
+                                        <div class="d-flex ml-auto">
+                                            <% if (item[0].audit_type !== auditType.key.common) { %>
+                                            <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1"><small><%- auditType.info[item[0].audit_type].short %></small></span>
+                                            <% } %>
+                                            <span class="badge badge-light badge-pill"><small>终审</small></span>
+                                        </div>
                                     </li>
                                     <% } else {%>
                                     <li class="list-group-item d-flex justify-content-between align-items-center">
@@ -305,10 +311,12 @@
                                             <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
-                                        <% if (item[0].audit_type !== auditType.key.common) { %>
-                                        <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
-                                        <% } %>
-                                        <span class="badge badge-light badge-pill"><small><%= ctx.helper.transFormToChinese(idx) %>审</small></span>
+                                        <div class="d-flex ml-auto">
+                                            <% if (item[0].audit_type !== auditType.key.common) { %>
+                                            <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
+                                            <% } %>
+                                            <span class="badge badge-light badge-pill"><small><%= ctx.helper.transFormToChinese(idx) %>审</small></span>
+                                        </div>
                                     </li>
                                     <% } %>
                                     <% }) %>
@@ -468,10 +476,12 @@
                                             <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
-                                        <% if (item[0].audit_type !== auditType.key.common) { %>
-                                        <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
-                                        <% } %>
-                                        <span class="badge badge-light badge-pill"><small>终审</small></span>
+                                        <div class="d-flex ml-auto">
+                                            <% if (item[0].audit_type !== auditType.key.common) { %>
+                                            <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1"><small><%- auditType.info[item[0].audit_type].short %></small></span>
+                                            <% } %>
+                                            <span class="badge badge-light badge-pill"><small>终审</small></span>
+                                        </div>
                                     </li>
                                     <% } else {%>
                                     <li class="list-group-item d-flex justify-content-between align-items-center">
@@ -481,10 +491,12 @@
                                             <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
-                                        <% if (item[0].audit_type !== auditType.key.common) { %>
-                                        <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1 ml-auto"><small><%- auditType.info[item[0].audit_type].short %></small></span>
-                                        <% } %>
-                                        <span class="badge badge-light badge-pill"><small><%= ctx.helper.transFormToChinese(idx) %>审</small></span>
+                                        <div class="d-flex ml-auto">
+                                            <% if (item[0].audit_type !== auditType.key.common) { %>
+                                            <span class="badge badge-pill badge-<%-  auditType.info[item[0].audit_type].class %> p-1"><small><%- auditType.info[item[0].audit_type].short %></small></span>
+                                            <% } %>
+                                            <span class="badge badge-light badge-pill"><small><%= ctx.helper.transFormToChinese(idx) %>审</small></span>
+                                        </div>
                                     </li>
                                     <% } %>
                                     <% }) %>