Przeglądaj źródła

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

caipin 3 tygodni temu
rodzic
commit
b7e7ebcdf3
1 zmienionych plików z 60 dodań i 30 usunięć
  1. 60 30
      app/view/advance/modal_audit.ejs

+ 60 - 30
app/view/advance/modal_audit.ejs

@@ -97,12 +97,14 @@
                                     <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
-                                                            class="pull-right text-success"><%- idx !== 0 ? '重新' : '' %>上报审批</span>
-                                                    </p>
-                                                    <p class="text-muted mb-0"><%- advance.user.role %></p>
+                                                <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>
+                                                    </div>
                                                 </div>
                                             </div>
                                         </div>
@@ -134,11 +136,15 @@
                                     <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
+                                                <div class="card-text p-2 py-3 row">
+                                                    <div class="col-9">
+                                                        <span class="h5"><%- auditor.name %></span>
+                                                        <span class="text-muted"><%- auditor.company %> - <%- auditor.role %></span>
+                                                    </div>
+                                                    <div class="col">
+                                                        <span
                                                             class="pull-right <%- auditConst.statusClass[auditor.status] %>"><%- auditConst.statusString[auditor.status] %></span>
-                                                    </p>
-                                                    <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                    </div>
                                                 </div>
                                             </div>
 
@@ -178,16 +184,20 @@
                                     <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>
+                                                <div class="card-text p-2 py-3 row">
+                                                    <div class="col-9">
+                                                        <span class="h5"><%- auditor.name %></span>
+                                                        <span class="text-muted"><%- auditor.company %> - <%- auditor.role %></span>
+                                                    </div>
+                                                    <div class="col">
                                                         <span
                                                             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.find(item => item.sort === auditor.sort-1).name : '' %>
                                                         </span>
-                                                    </p>
-                                                    <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                    </div>
+                                                    
                                                 </div>
                                             </div>
                                             <!--审批意见-->
@@ -313,11 +323,16 @@
                                             <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
+                                                        <div class="card-text p-2 py-3 row">
+                                                            <div class="col-9">
+                                                                <span class="h5"><%- auditor.name %></span>
+                                                                <span class="text-muted"><%- auditor.company %> - <%- auditor.role %></span>
+                                                            </div>
+                                                            <div class="col">
+                                                                <span
                                                                     class="pull-right <%- auditConst.statusClass[auditor.status] %>"><%- auditConst.statusString[auditor.status] %></span>
-                                                            </p>
-                                                            <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                            </div>
+
                                                         </div>
                                                     </div>
                                                     <!--审批意见-->
@@ -362,16 +377,20 @@
                                             <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>
+                                                        <div class="card-text p-2 py-3 row">
+                                                            <div class="col-9">
+                                                                <span class="h5"><%- auditor.name %></span>
+                                                                <span class="text-muted"><%- auditor.company %> - <%- auditor.role %></span>
+                                                            </div>
+                                                            <div class="col">
                                                                 <span
                                                                     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.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                 </span>
-                                                            </p>
-                                                            <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                            </div>
+
                                                         </div>
                                                     </div>
                                                     <!--审批意见-->
@@ -505,11 +524,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"><%- auditor.name %></span><span
+                                                        <div class="card-text p-2 py-3 row">
+                                                            <div class="col-9">
+                                                                <span class="h5"><%- auditor.name %></span>
+                                                                <span class="text-muted"><%- auditor.company %> - <%- auditor.role %></span>
+                                                            </div>
+                                                            <div class="col">
+                                                                <span
                                                                     class="pull-right <%- auditConst.statusClass[auditor.status] %>"><%- auditConst.statusString[auditor.status] %></span>
-                                                            </p>
-                                                            <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                            
+                                                            </div>
+
                                                         </div>
                                                     </div>
 
@@ -575,16 +600,21 @@
                                             <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>
+                                                        <div class="card-text p-2 py-3 row">
+                                                            <div class="col-9">
+                                                                <span class="h5"><%- auditor.name %></span>
+                                                                <span class="text-muted"><%- auditor.company %> - <%- auditor.role %></span>
+                                                            </div>
+                                                            <div class="col">
                                                                 <span
                                                                     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.find(item => item.sort === auditor.sort-1).name : '' %>
                                                                 </span>
-                                                            </p>
-                                                            <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                            </div>
+
+
                                                         </div>
                                                     </div>
                                                     <!--审批意见-->