样式调整

app/view/ledger/audit_modal.ejs

@@ -18,21 +18,21 @@
                                 <% if (idx === 0) { %>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of group) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
-                                    </small>
+                                    </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
                                 </li>
                                 <% } else if(idx === tender.userGroups.length -1 && idx !== 0) { %>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of group) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
-                                    </small>
+                                    </span>
                                     <div class="d-flex ml-auto">
                                         <% if (group[0].audit_type !== auditType.key.common) { %>
                                         <span class="badge badge-pill badge-<%-  auditType.info[group[0].audit_type].class %> p-1"><small><%- auditType.info[group[0].audit_type].short %></small></span>
@@ -43,11 +43,11 @@
                                 <% } else {%>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of group) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
-                                    </small>
+                                    </span>
                                     <div class="d-flex ml-auto">
                                         <% if (group[0].audit_type !== auditType.key.common) { %>
                                         <span class="badge badge-pill badge-<%- auditType.info[group[0].audit_type].class %> p-1"><small><%- auditType.info[group[0].audit_type].short %></small></span>
@@ -199,21 +199,21 @@
                                 <% if (idx === 0) { %>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of item) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
-                                    </small>
+                                    </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
                                 </li>
                                 <% } else if(idx === tender.userGroups.length -1 && idx !== 0) { %>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of item) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></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>
@@ -224,11 +224,11 @@
                                 <% } else {%>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of item) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></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>

app/view/ledger/explode_modal.ejs

@@ -216,21 +216,21 @@
                                 <% if (idx === 0) { %>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of item) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
-                                    </small>
+                                    </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
                                 </li>
                                 <% } else if(idx === tender.userGroups.length -1 && idx !== 0) { %>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of item) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></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>
@@ -241,11 +241,11 @@
                                 <% } else {%>
                                 <li class="list-group-item d-flex justify-content-between align-items-center">
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
-                                    <small class="text-muted">
+                                    <span class="text-muted">
                                         <% for (const u of item) { %>
                                         <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></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>
@@ -269,6 +269,7 @@
                         <div class="<%- idx < tender.auditHistory.length - 1 ? 'fold-card' : '' %>">
                             <div class="text-center text-muted"><%- idx+1 %>#</div>
                             <ul class="timeline-list list-unstyled mt-2 <% if (idx === tender.auditHistory.length - 1) { %>last-auditor-list<% } %>">
+                                <% console.log(his) %>
                                 <% his.forEach((group, index) => { %>
                                 <% if (index === 0) { %>
                                 <li class="timeline-list-item pb-2">
@@ -474,6 +475,7 @@
 </div>
 <% } %>
 
+<% console.log(ctx.session.sessionUser.accountId, ctx.tender.data.user_id, ctx.session.sessionUser.is_admin) %>
 <% if ((ctx.session.sessionUser.accountId === ctx.tender.data.user_id || ctx.session.sessionUser.is_admin) && (ctx.tender.data.ledger_status === auditConst.status.uncheck || ctx.tender.data.ledger_status === auditConst.status.checkNo)) { %>
     <script>
         const shenpi_status = <%- ctx.tender.info.shenpi.ledger %>;