feat: 调整所有模块审批弹窗显示为 col-10 添加展示单位

app/public/js/change.js

@@ -239,7 +239,12 @@ $(document).ready(() => {
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {
                         historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                        let companyRolePart = '';
+                        if (group.audit_order !== 0) {
+                            const rolePart = auditor.role ? ' - ' + auditor.role : '';
+                            companyRolePart = `<span class="text-muted ml-1">${auditor.company}${rolePart}</span>`;
+                        }
+                        historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span>${companyRolePart}</div>`);
                         historyHTML.push('<div class="col">');
                         if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) {
                             historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/public/js/change_apply.js

@@ -279,8 +279,13 @@ $(document).ready(() => {
                     historyHTML.push('</div>');
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {
-                        historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                        historyHTML.push(`<div class="card-text p-2 py-3 row ${(i > 0 ? 'border-top' : '')}">`);
+                        let companyRolePart = '';
+                        if (group.audit_order !== 0) {
+                            const rolePart = auditor.role ? ' - ' + auditor.role : '';
+                            companyRolePart = `<span class="text-muted ml-1">${auditor.company}${rolePart}</span>`;
+                        }
+                        historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span>${companyRolePart}</div>`);
                         historyHTML.push('<div class="col">');
                         if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) {
                             historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/public/js/change_plan.js

@@ -278,8 +278,13 @@ $(document).ready(() => {
                     historyHTML.push('</div>');
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {
-                        historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                        historyHTML.push(`<div class="card-text p-2 py-3 row ${(i > 0 ? 'border-top' : '')}">`);
+                        let companyRolePart = '';
+                        if (group.audit_order !== 0) {
+                            const rolePart = auditor.role ? ' - ' + auditor.role : '';
+                            companyRolePart = `<span class="text-muted ml-1">${auditor.company}${rolePart}</span>`;
+                        }
+                        historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span>${companyRolePart}</div>`);
                         historyHTML.push('<div class="col">');
                         if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) {
                             historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/public/js/change_project.js

@@ -287,7 +287,12 @@ $(document).ready(() => {
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {
                         historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                        let companyRolePart = '';
+                        if (group.audit_order !== 0) {
+                            const rolePart = auditor.role ? ' - ' + auditor.role : '';
+                            companyRolePart = `<span class="text-muted ml-1">${auditor.company}${rolePart}</span>`;
+                        }
+                        historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span>${companyRolePart}</div>`);
                         historyHTML.push('<div class="col">');
                         if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) {
                             historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/public/js/material_audit.js

@@ -383,7 +383,7 @@ $(document).ready(function () {
                 lastAuditorHtml.push('<div class="card"><div class="card-body px-3 py-0">');
                 for (const [i, auditor] of data.entries()) {
                     lastAuditorHtml.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                    lastAuditorHtml.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                    lastAuditorHtml.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                     lastAuditorHtml.push('<div class="col">');
                     lastAuditorHtml.push('</div>');
                     lastAuditorHtml.push('</div>');

app/public/js/measure_material.js

@@ -127,7 +127,7 @@ $(function () {
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {
                         historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                        historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                         historyHTML.push('<div class="col">');
                         if (auditor.status === auditConst.status.checked) {
                             historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/public/js/measure_stage.js

@@ -127,7 +127,7 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                 historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                 for (const [i, auditor] of group.auditors.entries()) {
                     historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                    historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                    historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${user.company}${user.role ? ' - ' + user.role : ''}</span></div>`);
                     historyHTML.push('<div class="col">');
                     if (auditor.status === auditConst.status.checked) {
                         historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/public/js/phase_pay_list.js

@@ -107,7 +107,13 @@ $(document).ready(() => {
                 historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                 for (const [i, auditor] of group.auditors.entries()) {
                     historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                    historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                    let companyRolePart = '';
+                        if (group.audit_order !== 0) {
+                            const rolePart = auditor.role ? ' - ' + auditor.role : '';
+                            companyRolePart = `<span class="text-muted ml-1">${auditor.company}${rolePart}</span>`;
+                        }
+                    
+                    historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span>${companyRolePart}</div>`);
                     historyHTML.push('<div class="col">');
                     if (auditor.audit_status === auditConst.status.checked) {
                         historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');

app/view/change/apply_information_modal.ejs

@@ -339,9 +339,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -523,9 +534,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -718,7 +740,18 @@
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                                         <div class="col">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -1505,7 +1538,7 @@
                         lastAuditorHtml.push('<div class="card"><div class="card-body px-3 py-0">');
                         for (const [i, auditor] of data.entries()) {
                             lastAuditorHtml.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                            lastAuditorHtml.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                            lastAuditorHtml.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                             lastAuditorHtml.push('<div class="col">');
                             lastAuditorHtml.push('</div>');
                             lastAuditorHtml.push('</div>');

app/view/change/information_modal.ejs

@@ -355,9 +355,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) { %>
@@ -512,9 +523,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) { %>
@@ -681,9 +703,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked || group.status === auditConst.status.cancelRevise) { %>
@@ -1570,7 +1603,7 @@
                         lastAuditorHtml.push('<div class="card"><div class="card-body px-3 py-0">');
                         for (const [i, auditor] of data.entries()) {
                             lastAuditorHtml.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                            lastAuditorHtml.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                            lastAuditorHtml.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                             lastAuditorHtml.push('<div class="col">');
                             lastAuditorHtml.push('</div>');
                             lastAuditorHtml.push('</div>');

app/view/change/plan_information_modal.ejs

@@ -331,9 +331,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -515,9 +526,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -700,9 +722,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -1489,7 +1522,7 @@
                         lastAuditorHtml.push('<div class="card"><div class="card-body px-3 py-0">');
                         for (const [i, auditor] of data.entries()) {
                             lastAuditorHtml.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                            lastAuditorHtml.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                            lastAuditorHtml.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                             lastAuditorHtml.push('<div class="col">');
                             lastAuditorHtml.push('</div>');
                             lastAuditorHtml.push('</div>');

app/view/change/project_information_modal.ejs

@@ -281,9 +281,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -469,9 +480,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -658,9 +680,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked || auditor.status === auditConst.status.cancelRevise) { %>
@@ -1537,7 +1570,7 @@
                         lastAuditorHtml.push('<div class="card"><div class="card-body px-3 py-0">');
                         for (const [i, auditor] of data.entries()) {
                             lastAuditorHtml.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                            lastAuditorHtml.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                            lastAuditorHtml.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                             lastAuditorHtml.push('<div class="col">');
                             lastAuditorHtml.push('</div>');
                             lastAuditorHtml.push('</div>');

app/view/financial/pay_detail_modal.ejs

@@ -304,9 +304,20 @@
                                                         <div class="card-body px-3 py-0">
                                                             <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                    <div class="col">
+                                                                    <div class="col-10">
                                                                         <span class="h6"><%- auditor.name %></span>
-                                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                        <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                     </div>
                                                                     <div class="col">
                                                                         <% if (auditor.status === auditConst.status.checked) { %>
@@ -485,9 +496,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked) { %>
@@ -667,9 +689,20 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <% if (group.audit_order === 0) { %>
+                                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                                <% } %>
+                                                                            <% } else { %>
+                                                                                <span class="text-muted ml-1">
+                                                                                    <%- auditor.company %>
+                                                                                    <% if (auditor.role && auditor.role.trim()) { %>
+                                                                                        - <%- auditor.role %>
+                                                                                    <% } %>
+                                                                                </span>
+                                                                            <% } %>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked) { %>

app/view/ledger/audit_modal.ejs

@@ -136,9 +136,13 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                        <% if (auditor.role) { %>
+                                                            - <%= auditor.role %>
+                                                        <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.status === auditConst.status.checked) { %>
@@ -270,7 +274,7 @@
                                         <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>
                                                     </div>
@@ -317,9 +321,13 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                        <% if (auditor.role) { %>
+                                                            - <%= auditor.role %>
+                                                        <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.status === auditConst.status.checked) { %>

app/view/ledger/explode_modal.ejs

@@ -417,9 +417,13 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                        <% if (auditor.role) { %>
+                                                            - <%= auditor.role %>
+                                                        <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.status === auditConst.status.checked) { %>

app/view/material/audit_modal.ejs

@@ -220,9 +220,13 @@
                                                     <div class="card-body px-3 py-0">
                                                         <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                             <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                <div class="col">
+                                                                <div class="col-10">
                                                                     <span class="h6"><%- auditor.name %></span>
-                                                                    <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                    <span class="text-muted ml-1"><%- auditor.company %>
+                                                                        <% if (auditor.role) { %>
+                                                                            - <%= auditor.role %>
+                                                                        <% } %>    
+                                                                    </span>
                                                                 </div>
                                                                 <div class="col">
                                                                     <% if (auditor.status === auditConst.status.checked) { %>
@@ -399,9 +403,13 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <span class="text-muted ml-1"><%- auditor.company %>
+                                                                                <% if (auditor.role) { %>
+                                                                                    - <%= auditor.role %>
+                                                                                <% } %>    
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked) { %>
@@ -580,9 +588,13 @@
                                                             <div class="card-body px-3 py-0">
                                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                                        <div class="col">
+                                                                        <div class="col-10">
                                                                             <span class="h6"><%- auditor.name %></span>
-                                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                            <span class="text-muted ml-1"><%- auditor.company %>
+                                                                                <% if (auditor.role) { %>
+                                                                                    - <%= auditor.role %>
+                                                                                <% } %>    
+                                                                            </span>
                                                                         </div>
                                                                         <div class="col">
                                                                             <% if (auditor.status === auditConst.status.checked) { %>

app/view/phase_pay/audit_modal.ejs

@@ -195,9 +195,20 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <% if (group.audit_order === 0) { %>
+                                                            <% if (auditor.role && auditor.role.trim()) { %>
+                                                                <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <% } %>
+                                                        <% } else { %>
+                                                            <span class="text-muted ml-1">
+                                                                <%- auditor.company %>
+                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                    - <%- auditor.role %>
+                                                                <% } %>
+                                                            </span>
+                                                        <% } %>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.audit_status === auditConst.status.checked) { %>
@@ -322,9 +333,20 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <% if (group.audit_order === 0) { %>
+                                                            <% if (auditor.role && auditor.role.trim()) { %>
+                                                                <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <% } %>
+                                                        <% } else { %>
+                                                            <span class="text-muted ml-1">
+                                                                <%- auditor.company %>
+                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                    - <%- auditor.role %>
+                                                                <% } %>
+                                                            </span>
+                                                        <% } %>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.audit_status === auditConst.status.checked) { %>
@@ -453,9 +475,20 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <% if (group.audit_order === 0) { %>
+                                                            <% if (auditor.role && auditor.role.trim()) { %>
+                                                                <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <% } %>
+                                                        <% } else { %>
+                                                            <span class="text-muted ml-1">
+                                                                <%- auditor.company %>
+                                                                <% if (auditor.role && auditor.role.trim()) { %>
+                                                                    - <%- auditor.role %>
+                                                                <% } %>
+                                                            </span>
+                                                        <% } %>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.audit_status === auditConst.status.checked) { %>

app/view/revise/history_modal.ejs

@@ -132,9 +132,13 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                            <% if (auditor.role) { %>
+                                                                - <%= auditor.role %>
+                                                            <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.status === auditConst.status.checked) { %>

app/view/revise/info_modal.ejs

@@ -273,9 +273,13 @@
                                                 <div class="card-body px-3 py-0">
                                                     <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                        <div class="col">
+                                                        <div class="col-10">
                                                             <span class="h6"><%- auditor.name %></span>
-                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <span class="text-muted ml-1"><%- auditor.company %>
+                                                            <% if (auditor.role) { %>
+                                                                - <%= auditor.role %>
+                                                            <% } %>    
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <% if (auditor.status === auditConst.status.checked) { %>
@@ -449,9 +453,13 @@
                                                 <div class="card-body px-3 py-0">
                                                     <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                        <div class="col">
+                                                        <div class="col-10">
                                                             <span class="h6"><%- auditor.name %></span>
-                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <span class="text-muted ml-1"><%- auditor.company %>
+                                                            <% if (auditor.role) { %>
+                                                                - <%= auditor.role %>
+                                                            <% } %>
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <% if (auditor.status === auditConst.status.checked) { %>
@@ -632,9 +640,13 @@
                                             <div class="card-body px-3 py-0">
                                                 <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                    <div class="col">
+                                                    <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></span>
-                                                        <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                        <span class="text-muted ml-1"><%- auditor.company %>
+                                                        <% if (auditor.role) { %>
+                                                            - <%= auditor.role %>
+                                                        <% } %>
+                                                        </span>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.status === auditConst.status.checked) { %>

app/view/stage/audit_modal.ejs

@@ -222,9 +222,13 @@
                                                     <div class="card-body px-3 py-0">
                                                         <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                         <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                            <div class="col">
+                                                            <div class="col-10">
                                                                 <span class="h6"><%- auditor.name %></span>
-                                                                <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                                <span class="text-muted ml-1"><%- auditor.company %>
+                                                                <% if (auditor.role) { %>
+                                                                    - <%= auditor.role %>
+                                                                <% } %>    
+                                                                </span>
                                                             </div>
                                                             <div class="col">
                                                                 <% if (auditor.status === auditConst.status.checked) { %>
@@ -401,9 +405,13 @@
                                                 <div class="card-body px-3 py-0">
                                                     <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                        <div class="col">
+                                                        <div class="col-10">
                                                             <span class="h6"><%- auditor.name %></span>
-                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <span class="text-muted ml-1"><%- auditor.company %>
+                                                            <% if (auditor.role) { %>
+                                                                - <%= auditor.role %>
+                                                            <% } %> 
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <% if (auditor.status === auditConst.status.checked) { %>
@@ -582,9 +590,13 @@
                                                 <div class="card-body px-3 py-0">
                                                     <% for (const [i, auditor] of group.auditors.entries()) { %>
                                                     <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
-                                                        <div class="col">
+                                                        <div class="col-10">
                                                             <span class="h6"><%- auditor.name %></span>
-                                                            <span class="text-muted ml-1"><%- auditor.role %></span>
+                                                            <span class="text-muted ml-1"><%- auditor.company %>
+                                                            <% if (auditor.role) { %>
+                                                                - <%= auditor.role %>
+                                                            <% } %>    
+                                                            </span>
                                                         </div>
                                                         <div class="col">
                                                             <% if (auditor.status === auditConst.status.checked) { %>

app/view/tender/modal.ejs

@@ -154,9 +154,9 @@
                                                 <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">${user.name}</span>
-                                                                <span class="text-muted ml-1">${user.role}</span>
+                                                                <span class="text-muted ml-1">${user.company}${user.role ? ' - ' + user.role : ''}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -198,7 +198,7 @@
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {
                         historyHTML.push(`<div class="card-text p-2 py-3 row ${ ( i > 0 ? 'border-top' : '') }">`);
-                        historyHTML.push(`<div class="col"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.role}</span></div>`);
+                        historyHTML.push(`<div class="col-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.company}${auditor.role ? ' - ' + auditor.role : ''}</span></div>`);
                         historyHTML.push('<div class="col">');
                         if (auditor.status === auditConst2.status.checked) {
                             historyHTML.push('<span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>');