审批流程显示调整

app/public/js/measure_stage.js

@@ -112,11 +112,13 @@ $('a[data-target="#sp-list" ]').on('click', function () {
                 }
 
                 historyHTML.push('<div class="timeline-item-content">');
+                const statuStr = group.status !== auditConst.status.uncheck ?
+                    `<span class="pull-right ${auditConst.statusClass[group.status]}">${auditConst.statusString[group.status]}</span>` : '';
                 historyHTML.push(`<div class="py-1">
                         <span class="text-black-50">
                         ${ !group.is_final ? group.audit_order + '' : '终' }审 ${getAuditTypeText(group.audit_type)}
                         </span>
-                        <span class="pull-right ${auditConst.statusClass[group.status]}">${auditConst.statusString[group.status]}</span>
+                        ${statuStr}
                     </div>`);
                 historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                 for (const [i, auditor] of group.auditors.entries()) {

app/public/js/tender_list.js

@@ -63,7 +63,7 @@ const tenderListSpec = (function(){
         html.push('<td style="width: 15%">');
         if (!node.cid && node.cur_flow) {
             if (node.stage_status !== undefined) {
-                if (node.cur_flow instanceof Array) {
+                if (node.cur_flow instanceof Array && node.cur_flow[0].audit_type !== auditType.key.common) {
                     html.push(`<span class="${node.progress.status_class}">${node.progress.status}</span>（${transFormToChinese(node.cur_flow[0].audit_order)}审）`);
                 } else {
                     html.push(`<span class="${node.progress.status_class}">${node.progress.status}</span>（${node.cur_flow.name}）`);

app/public/js/tender_list_info.js

@@ -58,7 +58,7 @@ const tenderListSpec = (function(){
                 html.push(curUser);
                 html.push((node.lastStage && node.lastStage.status === auditConst.stage.status.uncheck) || (!node.lastStage && node.ledger_status === auditConst.ledger.status.uncheck ) ? ' ':
                     '</a> ');
-                if (node.cur_flow instanceof Array && node.cur_flow[0].audit_type !== auditType.key.common) {
+                if (node.cur_flow instanceof Array) {
                     html.push('<span class="' + node.cur_flow[0].status_class +'">' + node.cur_flow[0].status + '</span>');
                 } else {
                     html.push('<span class="' + node.cur_flow.status_class +'">' + node.cur_flow.status + '</span>');

app/view/stage/audit_modal.ejs

@@ -208,7 +208,9 @@
                                                             <%- (!group.is_final ? group.audit_order : '终') %>审
                                                             <% if (group.audit_type !== auditType.key.common) { %><span class="text-<%- auditType.info[group.audit_type].class %> "><%- auditType.info[group.audit_type].long %></span><% } %>
                                                         </span>
+                                                    <% if (group.status !== auditConst.status.uncheck) { %>
                                                     <span class="pull-right <%- auditConst.statusClass[group.status] %>"><%- auditConst.statusString[group.status] %></span>
+                                                    <% } %>
                                                 </div>
                                                 <div class="card">
                                                     <div class="card-body px-3 py-0">
@@ -375,11 +377,13 @@
                                         <% } %>
                                         <div class="timeline-item-content">
                                             <div class="py-1">
-                                                        <span class="text-black-50">
-                                                            <%- (!group.is_final ? group.audit_order : '终') %>审
-                                                            <% if (group.audit_type !== auditType.key.common) { %><span class="text-<%- auditType.info[group.audit_type].class %> "><%- auditType.info[group.audit_type].long %></span><% } %>
-                                                        </span>
+                                                <span class="text-black-50">
+                                                    <%- (!group.is_final ? group.audit_order : '终') %>审
+                                                    <% if (group.audit_type !== auditType.key.common) { %><span class="text-<%- auditType.info[group.audit_type].class %> "><%- auditType.info[group.audit_type].long %></span><% } %>
+                                                </span>
+                                                <% if (group.status !== auditConst.status.uncheck) { %>
                                                 <span class="pull-right <%- auditConst.statusClass[group.status] %>"><%- auditConst.statusString[group.status] %></span>
+                                                <% } %>
                                             </div>
                                             <div class="card">
                                                 <div class="card-body px-3 py-0">
@@ -548,11 +552,13 @@
                                         <% } %>
                                         <div class="timeline-item-content">
                                             <div class="py-1">
-                                                        <span class="text-black-50">
-                                                            <%- (!group.is_final ? group.audit_order : '终') %>审
-                                                            <% if (group.audit_type !== auditType.key.common) { %><span class="text-<%- auditType.info[group.audit_type].class %> "><%- auditType.info[group.audit_type].long %></span><% } %>
-                                                        </span>
+                                                <span class="text-black-50">
+                                                    <%- (!group.is_final ? group.audit_order : '终') %>审
+                                                    <% if (group.audit_type !== auditType.key.common) { %><span class="text-<%- auditType.info[group.audit_type].class %> "><%- auditType.info[group.audit_type].long %></span><% } %>
+                                                </span>
+                                                <% if (group.status !== auditConst.status.uncheck) { %>
                                                 <span class="pull-right <%- auditConst.statusClass[group.status] %>"><%- auditConst.statusString[group.status] %></span>
+                                                <% } %>
                                             </div>
                                             <div class="card">
                                                 <div class="card-body px-3 py-0">

app/view/tender/detail.ejs

@@ -1244,11 +1244,13 @@
                 }
 
                 historyHTML.push('<div class="timeline-item-content">');
+                const statuStr = group.status !== auditConst.status.uncheck ?
+                    `<span class="pull-right ${auditConst.statusClass[group.status]}">${auditConst.statusString[group.status]}</span>` : '';
                 historyHTML.push(`<div class="py-1">
                         <span class="">
                         ${ !group.is_final ? group.audit_order + '' : '终' }审 ${getAuditTypeText(group.audit_type)}
                         </span>
-                        <span class="pull-right ${auditConst.statusClass[group.status]}">${auditConst.statusString[group.status]}</span>
+                        ${statuStr}
                     </div>`);
                 historyHTML.push(`<div class="card ${darkHTML}"><div class="card-body px-3 py-0">`);
                 for (const [i, auditor] of group.auditors.entries()) {

app/view/tender/modal.ejs

@@ -182,11 +182,13 @@
                     }
 
                     historyHTML.push('<div class="timeline-item-content">');
+                    const statuStr = group.status !== auditConst2.status.uncheck ?
+                        `<span class="pull-right ${auditConst2.statusClass[group.status]}">${auditConst2.statusString[group.status]}</span>` : '';
                     historyHTML.push(`<div class="py-1">
                         <span class="text-black-50">
                         ${ !group.is_final ? group.audit_order + '' : '终' }审 ${getAuditTypeText(group.audit_type)}
                         </span>
-                        <span class="pull-right ${auditConst2.statusClass[group.status]}">${auditConst2.statusString[group.status]}</span>
+                        ${statuStr}
                     </div>`);
                     historyHTML.push('<div class="card"><div class="card-body px-3 py-0">');
                     for (const [i, auditor] of group.auditors.entries()) {