fix: 更新用户信息显示格式，增加公司名称

app/public/js/advance.js

@@ -126,13 +126,15 @@ $(document).ready(function () {
                             </div>
                             <div class="timeline-item-content">
                                 <div class="card">
-                                    <div class="card-body p-3">
-                                        <div class="card-text">
-                                            <p class="mb-1"><span
-                                                    class="h5">${user.name}</span><span
-                                                    class="pull-right text-success">${idx !== 0 ? '重新' : ''}上报审批</span>
-                                            </p>
-                                            <p class="text-muted mb-0">${user.role}</p>
+                                    <div class="card-body px-3 py-0">
+                                        <div class="card-text p-2 py-3 row">
+                                            <div class="col-9">
+                                                <span class="h6">${user.name}</span>
+                                                <span class="text-muted">${user.company} - ${user.role}</span>
+                                            </div>
+                                            <div class="col">
+                                                <span class="pull-right text-success">${idx !== 0 ? '重新' : ''}上报审批</span>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -170,11 +172,15 @@ $(document).ready(function () {
                             historyHTML += `<div class="timeline-item-content">
                                 <div class="card">
                                     <div class="card-body p-3">
-                                        <div class="card-text">
-                                            <p class="mb-1"><span class="h5">${auditor.name}</span><span
+                                        <div class="card-text p-2 py-3 row">
+                                            <div class="col-9">
+                                                <span class="h6">${auditor.name}</span>
+                                                <span class="text-muted">${auditor.company} - ${auditor.role}</span>
+                                            </div>
+                                            <div class="col">
+                                                <span
                                                     class="pull-right ${auditConst.statusClass[auditor.status]}">${auditConst.statusString[auditor.status]}</span>
-                                            </p>
-                                            <p class="text-muted mb-0">${auditor.role}</p>
+                                            </div>
                                         </div>
                                     </div>`
                             if (auditor.opinion) {

app/public/js/change.js

@@ -240,10 +240,8 @@ $(document).ready(() => {
                     for (const [i, auditor] of group.auditors.entries()) {
                         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>`;
-                        }
+                        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) {

app/public/js/change_apply.js

@@ -235,9 +235,9 @@ $(document).ready(() => {
                                                 <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}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/public/js/change_plan.js

@@ -234,9 +234,9 @@ $(document).ready(() => {
                                                 <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}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/public/js/change_project.js

@@ -240,9 +240,9 @@ $(document).ready(() => {
                                                 <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}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/public/js/file_detail.js

@@ -1454,7 +1454,8 @@ $(document).ready(function() {
                 }
                 return false;
             });
-            $('dl').on('click', 'dd', function () {
+            $('dl').on('click', 'dd', function (e) {
+                e.stopPropagation();
                 const type = $(this).data('type');
                 if (type === 'all') {
                     const cid = parseInt($(this).data('id'));

app/public/js/financial_pay.js

@@ -224,7 +224,7 @@ $(function () {
                                                         <div class="card-text p-2 py-3 row">
                                                             <div class="col">
                                                                 <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}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/public/js/financial_pay_tender.js

@@ -361,9 +361,9 @@ $(function () {
                                                 <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}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>

app/public/js/measure_stage.js

@@ -85,9 +85,9 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                                                 <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}</span>
                                                             </div>
                                                             <div class="col">
                                                                 <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
@@ -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-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-10"><span class="h6">${auditor.name}</span><span class="text-muted ml-1">${auditor.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

@@ -108,10 +108,8 @@ $(document).ready(() => {
                 for (const [i, auditor] of group.auditors.entries()) {
                     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>`;
-                        }
+                    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">');

app/view/phase_pay/audit_modal.ejs

@@ -197,18 +197,12 @@
                                                 <div class="card-text p-2 py-3 row <%- ( i > 0 ? 'border-top' : '') %>">
                                                     <div class="col-10">
                                                         <span class="h6"><%- auditor.name %></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 %>
                                                                 <% } %>
                                                             </span>
-                                                        <% } %>
                                                     </div>
                                                     <div class="col">
                                                         <% if (auditor.audit_status === auditConst.status.checked) { %>