Browse Source

feat: 优化审批信息展示,增加用户公司和角色信息

caipin 1 week ago
parent
commit
e2399f2877
1 changed files with 21 additions and 10 deletions
  1. 21 10
      app/view/advance/modal_audit.ejs

+ 21 - 10
app/view/advance/modal_audit.ejs

@@ -286,12 +286,18 @@
                                             <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"><%- advance.user.name %></span><span
+                                                        <div class="card-text p-2 py-3 row">
+                                                            <div class="col-9">
+                                                                <span class="h5"><%- advance.user.name %></span>
+                                                                <span class="text-muted"><%- advance.user.company %> - <%- advance.user.role %></span>
+                                                            </div>
+                                                            <div class="col">
+                                                                <span
                                                                     class="pull-right text-success"><%- idx !== 0 ? '重新' : '' %>上报审批</span>
-                                                            </p>
-                                                            <p class="text-muted mb-0"><%- advance.user.role %></p>
+                                                            
+                                                            </div>
+
+                                                            
                                                         </div>
                                                     </div>
                                                 </div>
@@ -487,12 +493,17 @@
                                             <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"><%- advance.user.name %></span><span
+                                                        <div class="card-text p-2 py-3 row">
+                                                            <div class="col-9">
+                                                                <span class="h5"><%- advance.user.name %></span>
+                                                                <span class="text-muted"><%- advance.user.company %> - <%- advance.user.role %></span>
+                                                            </div>
+                                                            <div class="col">
+                                                                <span
                                                                     class="pull-right text-success"><%- idx !== 0 ? '重新' : '' %>上报审批</span>
-                                                            </p>
-                                                            <p class="text-muted mb-0"><%- advance.user.role %></p>
+                                                            
+                                                            </div>
+                                                            
                                                         </div>
                                                     </div>
                                                 </div>