变更列表页展示流程

app/public/js/change.js

@@ -203,36 +203,6 @@ $(document).ready(() => {
                 historyHTML.push(`<div class="text-center text-muted">${idx+1}#</div>`);
                 historyHTML.push(`<ul class="timeline-list list-unstyled mt-2 ${ idx === auditHistory.length - 1 && auditHistory.length !== 1 ? 'last-auditor-list' : '' }">`);
                 his.forEach((group, index) => {
-                    if (index === 0) {
-                        historyHTML.push(`<li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">
-                                                ${group.beginYear}
-                                                <span>${group.beginDate}</span>
-                                                <span>${group.beginTime}</span>
-                                            </div>
-                                            <div class="timeline-item-tail"></div>
-                                            <div class="timeline-item-icon bg-success text-light"><i class="fa fa-caret-down"></i></div>
-                                            <div class="timeline-item-content">
-                                                <div class="py-1">
-                                                    <span class="text-black-50">原报</span>
-                                                    <span class="pull-right text-success">${idx !== 0 ? '重新' : '' }上报审批</span>
-                                                </div>
-                                                <div class="card">
-                                                    <div class="card-body px-3 py-0">
-                                                        <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>
-                                                            </div>
-                                                            <div class="col">
-                                                                <span class="pull-right text-success"><i class="fa fa-check-circle"></i></span>
-                                                            </div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </li>`);
-                    }
                     historyHTML.push(`<li class="timeline-list-item pb-2 ${ group.status === auditConst.status.uncheck && idx === auditHistory.length - 1 && auditHistory.length !== 1 ? 'is_uncheck' : ''}">`);
                     if (group.endYear) {
                         historyHTML.push(`<div class="timeline-item-date">${group.endYear}<span>${group.endDate}</span><span>${group.endTime}</span></div>`);
@@ -253,14 +223,20 @@ $(document).ready(() => {
                     }
 
                     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">
+                    historyHTML.push('<div class="py-1">');
+                    if (index === 0) {
+                        historyHTML.push('<span class="text-black-50">原报</span>');
+                        historyHTML.push(`<span class="pull-right text-success">${idx !== 0 ? '重新' : ''}上报审批</span>`);
+                    } else {
+                        const statuStr = group.status !== auditConst.status.uncheck ?
+                            `<span class="pull-right ${auditConst.statusClass[group.status]}">${auditConst.statusString[group.status]}</span>` : '';
+                        historyHTML.push(`
                         <span class="text-black-50">
-                        ${ !group.is_final ? group.audit_order + '' : '终' }审 ${getAuditTypeText(group.audit_type)}
+                        ${ group.audit_order === 0 ? '原报' : !group.is_final ? group.audit_order + '审' : '终审' } ${getAuditTypeText(group.audit_type)}
                         </span>
-                        ${statuStr}
-                    </div>`);
+                        ${statuStr}`);
+                    }
+                    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' : '') }">`);

app/view/change/information_modal.ejs

@@ -335,15 +335,13 @@
                                                 <div class="timeline-item-content">
                                                     <div class="py-1">
                                                         <% if (index === 0) { %>
-                                                        <div class="py-1">
                                                             <span class="text-black-50">原报</span>
                                                             <span class="pull-right text-success"><%- idx !== 0 ? '重新' : '' %>上报审批</span>
-                                                        </div>
                                                         <% } else { %>
-                                                        <span class="text-black-50">
-                                                            <%- (group.audit_order === 0 ? '原报' : !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.audit_order === 0 ? '原报' : !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>
                                                         <% } %>