feat: 修改原报和流程 添加单位展示

app/view/change/apply_information_modal.ejs

@@ -221,7 +221,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -231,7 +231,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -246,7 +246,7 @@
                                                 <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -290,9 +290,14 @@
                                                         <div class="card">
                                                             <div class="card-body px-3 py-0">
                                                                 <div class="card-text p-2 py-3 row">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- ctx.change.user.name %></span>
-                                                                        <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                        <span class="text-muted ml-1">
+                                                                            <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role && ctx.change.user.role.trim()) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                        </span>
                                                                     </div>
                                                                     <div class="col">
                                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -415,7 +420,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -426,7 +431,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -441,7 +446,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -485,9 +490,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.change.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -620,7 +630,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -630,7 +640,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -645,7 +655,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -1506,7 +1516,7 @@
                     auditorshtml.push('<span class="mr-1"><i class="fa ' + (index === 0 ? 'fa-play-circle fa-rotate-90' : index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i></span>');
                     auditorshtml.push('<span class="text-muted">');
                     for (const u of data) {
-                        auditorshtml.push(`<small class="d-inline-block text-dark mx-1" title="${u.role}" data-auditorId="${u.aid}">${u.name}</small>`);
+                        auditorshtml.push(`<small class="d-inline-block text-dark mx-1" title="${u.company}" data-auditorId="${u.aid}">${u.name}</small>`);
                     }
                     auditorshtml.push('</span>');
                     auditorshtml.push('<div class="d-flex ml-auto">');

app/view/change/plan_information_modal.ejs

@@ -213,7 +213,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -223,7 +223,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -238,7 +238,7 @@
                                                 <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -282,9 +282,14 @@
                                                         <div class="card">
                                                             <div class="card-body px-3 py-0">
                                                                 <div class="card-text p-2 py-3 row">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- ctx.change.user.name %></span>
-                                                                        <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                        <span class="text-muted ml-1">
+                                                                            <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                        </span>
                                                                     </div>
                                                                     <div class="col">
                                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -340,7 +345,7 @@
                                                                             <% } else { %>
                                                                                 <span class="text-muted ml-1">
                                                                                     <%- auditor.company %>
-                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <% if (auditor.role) { %>
                                                                                         - <%- auditor.role %>
                                                                                     <% } %>
                                                                                 </span>
@@ -407,7 +412,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -418,7 +423,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -433,7 +438,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -477,9 +482,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.change.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -604,7 +614,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -614,7 +624,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -629,7 +639,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -673,9 +683,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.change.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/view/change/project_information_modal.ejs

@@ -161,7 +161,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -171,7 +171,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -186,7 +186,7 @@
                                                 <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -230,9 +230,14 @@
                                                         <div class="card">
                                                             <div class="card-body px-3 py-0">
                                                                 <div class="card-text p-2 py-3 row">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- ctx.change.user.name %></span>
-                                                                        <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                        <span class="text-muted ml-1">
+                                                                            <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                        </span>
                                                                     </div>
                                                                     <div class="col">
                                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -359,7 +364,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -370,7 +375,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -385,7 +390,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -429,9 +434,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.change.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -560,7 +570,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -570,7 +580,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -585,7 +595,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -629,9 +639,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.change.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.change.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.change.user.company %>
+                                                                                    <% if (ctx.change.user.role) { %>
+                                                                                        - <%- ctx.change.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -1538,7 +1553,7 @@
                     auditorshtml.push('<span class="mr-1"><i class="fa ' + (index === 0 ? 'fa-play-circle fa-rotate-90' : index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i></span>');
                     auditorshtml.push('<span class="text-muted">');
                     for (const u of data) {
-                        auditorshtml.push(`<small class="d-inline-block text-dark mx-1" title="${u.role}" data-auditorId="${u.aid}">${u.name}</small>`);
+                        auditorshtml.push(`<small class="d-inline-block text-dark mx-1" title="${u.company}" data-auditorId="${u.aid}">${u.name}</small>`);
                     }
                     auditorshtml.push('</span>');
                     auditorshtml.push('<div class="d-flex ml-auto">');

app/view/financial/pay_detail_modal.ejs

@@ -186,7 +186,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -196,7 +196,7 @@
                                                 <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -211,7 +211,7 @@
                                                 <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                 <span class="text-muted">
                                                     <% for (const u of item) { %>
-                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                        <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                     <% } %>
                                                 </span>
                                                 <div class="d-flex ml-auto">
@@ -255,9 +255,14 @@
                                                         <div class="card">
                                                             <div class="card-body px-3 py-0">
                                                                 <div class="card-text p-2 py-3 row">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- financialPay.user.name %></span>
-                                                                        <span class="text-muted ml-1"><%- financialPay.user.role %></span>
+                                                                        <span class="text-muted ml-1">
+                                                                            <%- financialPay.user.company %>
+                                                                                    <% if (financialPay.user.role) { %>
+                                                                                        - <%- financialPay.user.role %>
+                                                                                    <% } %>
+                                                                        </span>
                                                                     </div>
                                                                     <div class="col">
                                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -377,7 +382,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -388,7 +393,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -403,7 +408,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -447,9 +452,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- financialPay.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- financialPay.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- financialPay.user.company %>
+                                                                                    <% if (financialPay.user.role) { %>
+                                                                                        - <%- financialPay.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -505,7 +515,7 @@
                                                                             <% } else { %>
                                                                                 <span class="text-muted ml-1">
                                                                                     <%- auditor.company %>
-                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <% if (auditor.role) { %>
                                                                                         - <%- auditor.role %>
                                                                                     <% } %>
                                                                                 </span>
@@ -571,7 +581,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -581,7 +591,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -596,7 +606,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -640,9 +650,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- financialPay.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- financialPay.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- financialPay.user.company %>
+                                                                                    <% if (financialPay.user.role) { %>
+                                                                                        - <%- financialPay.user.role %>
+                                                                                    <% } %>
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/view/ledger/audit_modal.ejs

@@ -20,7 +20,7 @@
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -30,7 +30,7 @@
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -45,7 +45,7 @@
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -89,9 +89,14 @@
                                         <div class="card">
                                             <div class="card-body px-3 py-0">
                                                 <div class="card-text p-2 py-3 row">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- tender.user.name %></span>
-                                                        <span class="text-muted ml-1"><%- tender.user.role %></span>
+                                                        <span class="text-muted ml-1">
+                                                            <%- tender.user.company %>
+                                                            <% if (tender.user.role) { %>
+                                                                - <%= tender.user.role %>
+                                                            <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -138,7 +143,8 @@
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                     <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                        <span class="text-muted ml-1">
+                                                        <%- auditor.company %>
                                                         <% if (auditor.role) { %>
                                                             - <%= auditor.role %>
                                                         <% } %>
@@ -205,7 +211,7 @@
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -215,7 +221,7 @@
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -230,7 +236,7 @@
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -276,7 +282,12 @@
                                                 <div class="card-text p-2 py-3 row">
                                                     <div class="col-10">
                                                         <span class="h6"><%- tender.user.name %></span>
-                                                        <span class="text-muted ml-1"><%- tender.user.role %></span>
+                                                        <span class="text-muted ml-1">
+                                                            <%- tender.user.company %>
+                                                            <% if (tender.user.role) { %>
+                                                                - <%= tender.user.role %>
+                                                            <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/view/ledger/explode_modal.ejs

@@ -301,7 +301,7 @@
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -311,7 +311,7 @@
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -326,7 +326,7 @@
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -370,9 +370,14 @@
                                         <div class="card">
                                             <div class="card-body px-3 py-0">
                                                 <div class="card-text p-2 py-3 row">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- tender.user.name %></span>
-                                                        <span class="text-muted ml-1"><%- tender.user.role %></span>
+                                                        <span class="text-muted ml-1">
+                                                            <%- tender.user.company %>
+                                                            <% if (tender.user.role) { %>
+                                                                - <%= tender.user.role %>
+                                                            <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -419,10 +424,11 @@
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                     <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.company %>
-                                                        <% if (auditor.role) { %>
-                                                            - <%= auditor.role %>
-                                                        <% } %>
+                                                        <span class="text-muted ml-1">
+                                                            <%- auditor.company %>
+                                                            <% if (auditor.role) { %>
+                                                                - <%= auditor.role %>
+                                                            <% } %>
                                                         </span>
                                                     </div>
                                                     <div class="col">

app/view/material/audit_modal.ejs

@@ -104,7 +104,7 @@
                                             <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                             <span class="text-muted">
                                                 <% for (const u of item) { %>
-                                                    <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                    <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                 <% } %>
                                             </span>
                                             <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -114,7 +114,7 @@
                                             <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                             <span class="text-muted">
                                                 <% for (const u of item) { %>
-                                                    <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                    <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                 <% } %>
                                             </span>
                                             <div class="d-flex ml-auto">
@@ -129,7 +129,7 @@
                                             <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                             <span class="text-muted">
                                                 <% for (const u of item) { %>
-                                                    <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                    <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                 <% } %>
                                             </span>
                                             <div class="d-flex ml-auto">
@@ -173,9 +173,14 @@
                                                     <div class="card">
                                                         <div class="card-body px-3 py-0">
                                                             <div class="card-text p-2 py-3 row">
-                                                                <div class="col">
+                                                                <div class="col-10">
                                                                     <span class="h6"><%- ctx.material.user.name %></span>
-                                                                    <span class="text-muted ml-1"><%- ctx.material.user.role %></span>
+                                                                    <span class="text-muted ml-1">
+                                                                        <%- ctx.material.user.company %>
+                                                                        <% if (ctx.material.user.role) { %>
+                                                                            - <%= ctx.material.user.role %>
+                                                                        <% } %> 
+                                                                    </span>
                                                                 </div>
                                                                 <div class="col">
                                                                     <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -222,7 +227,8 @@
                                                             <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                                 <div class="col-10">
                                                                     <span class="h6"><%- auditor.name %></span>
-                                                                    <span class="text-muted ml-1"><%- auditor.company %>
+                                                                    <span class="text-muted ml-1">
+                                                                        <%- auditor.company %>
                                                                         <% if (auditor.role) { %>
                                                                             - <%= auditor.role %>
                                                                         <% } %>    
@@ -286,7 +292,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -297,7 +303,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -312,7 +318,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -356,9 +362,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.material.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.material.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.material.user.company %>
+                                                                                <% if (ctx.material.user.role) { %>
+                                                                                    - <%= ctx.material.user.role %>
+                                                                                <% } %> 
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -472,7 +483,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -483,7 +494,7 @@
                                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -498,7 +509,7 @@
                                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                                     <span class="text-muted">
                                                         <% for (const u of item) { %>
-                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                                         <% } %>
                                                     </span>
                                                     <div class="d-flex ml-auto">
@@ -541,9 +552,14 @@
                                                             <div class="card">
                                                                 <div class="card-body px-3 py-0">
                                                                     <div class="card-text p-2 py-3 row">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- ctx.material.user.name %></span>
-                                                                            <span class="text-muted ml-1"><%- ctx.material.user.role %></span>
+                                                                            <span class="text-muted ml-1">
+                                                                                <%- ctx.material.user.company %>
+                                                                                <% if (ctx.material.user.role) { %>
+                                                                                    - <%= ctx.material.user.role %>
+                                                                                <% } %> 
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/view/phase_pay/audit_modal.ejs

@@ -105,7 +105,7 @@
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -115,7 +115,7 @@
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -130,7 +130,7 @@
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -204,7 +204,7 @@
                                                         <% } else { %>
                                                             <span class="text-muted ml-1">
                                                                 <%- auditor.company %>
-                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                <% if (auditor.role) { %>
                                                                     - <%- auditor.role %>
                                                                 <% } %>
                                                             </span>
@@ -271,7 +271,7 @@
                                     <% } %>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -413,7 +413,7 @@
                                     <% } %>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">

app/view/revise/history_modal.ejs

@@ -16,7 +16,7 @@
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -26,7 +26,7 @@
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -41,7 +41,7 @@
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -85,9 +85,14 @@
                                         <div class="card">
                                             <div class="card-body px-3 py-0">
                                                 <div class="card-text p-2 py-3 row">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- revise.user.name %></span>
-                                                        <span class="text-muted ml-1"><%- revise.user.role %></span>
+                                                        <span class="text-muted ml-1">
+                                                            <%- revise.user.company %>
+                                                            <% if (revise.user.role) { %>
+                                                                - <%= revise.user.role %>
+                                                            <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -134,7 +139,8 @@
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                     <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                        <span class="text-muted ml-1">
+                                                            <%- auditor.company %>
                                                             <% if (auditor.role) { %>
                                                                 - <%= auditor.role %>
                                                             <% } %>

app/view/revise/info_modal.ejs

@@ -157,7 +157,7 @@
                                         <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                         <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -167,7 +167,7 @@
                                         <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                         <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -182,7 +182,7 @@
                                         <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                         <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -226,9 +226,14 @@
                                             <div class="card">
                                                 <div class="card-body px-3 py-0">
                                                     <div class="card-text p-2 py-3 row">
-                                                        <div class="col">
+                                                        <div class="col-10">
                                                             <span class="h6"><%- revise.user.name %></span>
-                                                            <span class="text-muted ml-1"><%- revise.user.role %></span>
+                                                            <span class="text-muted ml-1">
+                                                                <%- revise.user.company %>
+                                                                <% if (revise.user.role) { %>
+                                                                    - <%= revise.user.role %>
+                                                                <% } %>
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -275,10 +280,11 @@
                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                         <div class="col-10">
                                                             <span class="h6"><%- auditor.name %></span>
-                                                            <span class="text-muted ml-1"><%- auditor.company %>
-                                                            <% if (auditor.role) { %>
-                                                                - <%= auditor.role %>
-                                                            <% } %>    
+                                                            <span class="text-muted ml-1">
+                                                                <%- auditor.company %>
+                                                                <% if (auditor.role) { %>
+                                                                    - <%= auditor.role %>
+                                                                <% } %>    
                                                             </span>
                                                         </div>
                                                         <div class="col">
@@ -338,7 +344,7 @@
                                         <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                         <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -348,7 +354,7 @@
                                         <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                         <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -363,7 +369,7 @@
                                         <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                         <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -406,9 +412,14 @@
                                             <div class="card">
                                                 <div class="card-body px-3 py-0">
                                                     <div class="card-text p-2 py-3 row">
-                                                        <div class="col">
+                                                        <div class="col-10">
                                                             <span class="h6"><%- revise.user.name %></span>
-                                                            <span class="text-muted ml-1"><%- revise.user.role %></span>
+                                                            <span class="text-muted ml-1">
+                                                                <%- revise.user.company %>
+                                                                <% if (revise.user.role) { %>
+                                                                    - <%= revise.user.role %>
+                                                                <% } %>
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -524,7 +535,7 @@
                                     <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -534,7 +545,7 @@
                                     <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -549,7 +560,7 @@
                                     <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                     <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 class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.audit_id %>"><%- u.name %></small>
                                         <% } %>
                                     </span>
                                     <div class="d-flex ml-auto">
@@ -593,9 +604,14 @@
                                         <div class="card">
                                             <div class="card-body px-3 py-0">
                                                 <div class="card-text p-2 py-3 row">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- revise.user.name %></span>
-                                                        <span class="text-muted ml-1"><%- revise.user.role %></span>
+                                                        <span class="text-muted ml-1">
+                                                            <%- revise.user.company %>
+                                                            <% if (revise.user.role) { %>
+                                                                - <%= revise.user.role %>
+                                                            <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/view/stage/audit_modal.ejs

@@ -117,7 +117,7 @@
                                         <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -127,7 +127,7 @@
                                         <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -142,7 +142,7 @@
                                         <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -186,9 +186,14 @@
                                                 <div class="card">
                                                     <div class="card-body px-3 py-0">
                                                         <div class="card-text p-2 py-3 row">
-                                                            <div class="col">
+                                                            <div class="col-10">
                                                                 <span class="h6"><%- ctx.stage.user.name %></span>
-                                                                <span class="text-muted ml-1"><%- ctx.stage.user.role %></span>
+                                                                <span class="text-muted ml-1">
+                                                                    <%- ctx.stage.user.company %>
+                                                                    <% if (ctx.stage.user.role) { %>
+                                                                        - <%= ctx.stage.user.role %>
+                                                                    <% } %>
+                                                                </span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -299,7 +304,7 @@
                                         <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -310,7 +315,7 @@
                                         <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -325,7 +330,7 @@
                                         <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -371,7 +376,12 @@
                                                     <div class="card-text p-2 py-3 row">
                                                         <div class="col">
                                                             <span class="h6"><%- ctx.stage.user.name %></span>
-                                                            <span class="text-muted ml-1"><%- ctx.stage.user.role %></span>
+                                                            <span class="text-muted ml-1">
+                                                                <%- ctx.stage.user.company %>
+                                                                <% if (ctx.stage.user.role) { %>
+                                                                    - <%= ctx.stage.user.role %>
+                                                                <% } %>
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -485,7 +495,7 @@
                                         <span class="mr-1"><i class="fa fa fa-play-circle fa-rotate-90"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <span class="badge badge-light badge-pill ml-auto"><small>原报</small></span>
@@ -496,7 +506,7 @@
                                         <span class="mr-1"><i class="fa fa fa-stop-circle"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -511,7 +521,7 @@
                                         <span class="mr-1"><i class="fa fa-chevron-circle-down"></i></span>
                                         <span class="text-muted">
                                             <% for (const u of item) { %>
-                                            <small class="d-inline-block text-dark mx-1" title="<%- u.role %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
+                                            <small class="d-inline-block text-dark mx-1" title="<%- u.company %>" data-auditorId="<%- u.aid %>"><%- u.name %></small>
                                             <% } %>
                                         </span>
                                         <div class="d-flex ml-auto">
@@ -556,7 +566,12 @@
                                                     <div class="card-text p-2 py-3 row">
                                                         <div class="col">
                                                             <span class="h6"><%- ctx.stage.user.name %></span>
-                                                            <span class="text-muted ml-1"><%- ctx.stage.user.role %></span>
+                                                            <span class="text-muted ml-1">
+                                                                <%- ctx.stage.user.company %>
+                                                                <% if (ctx.stage.user.role) { %>
+                                                                    - <%= ctx.stage.user.role %>
+                                                                <% } %>
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>