浏览代码

修复修改流程展示bug

laiguoran 2 年之前
父节点
当前提交
f85b862bfc
共有 2 个文件被更改,包括 32 次插入29 次删除
  1. 26 23
      app/public/js/stage_audit.js
  2. 6 6
      app/view/stage/audit_modal.ejs

+ 26 - 23
app/public/js/stage_audit.js

@@ -391,6 +391,7 @@ $(document).ready(function () {
 
     function changeLiucheng(datas) {
         const auditorshtml = [];
+        let lastAuditorHtml = '';
         for (const [index,data] of datas.entries()) {
             auditorshtml.push('<li class="list-group-item" data-auditorid="' + data.aid + '">');
             auditorshtml.push('<i class="fa ' + (index+1 === datas.length ? 'fa-stop-circle' : 'fa-chevron-circle-down') + '"></i> ');
@@ -403,30 +404,32 @@ $(document).ready(function () {
                 auditorshtml.push('<span class="pull-right">'+ transFormToChinese(index) +'审</span>');
             }
             auditorshtml.push('</li>');
+            if (data.status === auditConst.status.uncheck) {
+                lastAuditorHtml += '<li class="timeline-list-item pb-2 is_uncheck">\n' +
+                    '                                            <div class="timeline-item-date">\n' +
+                    '                                                \n' +
+                    '                                            </div>\n' +
+                    '                                            <div class="timeline-item-icon bg-secondary text-light">\n' +
+                    '                                            </div>\n' +
+                    '                                            <div class="timeline-item-content">\n' +
+                    '                                                <div class="card">\n' +
+                    '                                                    <div class="card-body p-3">\n' +
+                    '                                                        <div class="card-text">\n' +
+                    `                                                            <p class="mb-1"><span class="h5">${data.name}</span>\n` +
+                    '                                                                <span class="pull-right ">\n' +
+                    '                                                                </span>\n' +
+                    '                                                            </p>\n' +
+                    `                                                            <p class="text-muted mb-0">${data.role}</p>\n` +
+                    '                                                        </div>\n' +
+                    '                                                    </div>\n' +
+                    '                                                </div>\n' +
+                    '                                            </div>\n' +
+                    '                                        </li>';
+            }
         }
-        let html = '<li class="timeline-list-item pb-2">\n' +
-            '                                            <div class="timeline-item-date">\n' +
-            '                                                \n' +
-            '                                            </div>\n' +
-            '                                            <div class="timeline-item-icon bg-secondary text-light">\n' +
-            '                                            </div>\n' +
-            '                                            <div class="timeline-item-content">\n' +
-            '                                                <div class="card">\n' +
-            '                                                    <div class="card-body p-3">\n' +
-            '                                                        <div class="card-text">\n' +
-            `                                                            <p class="mb-1"><span class="h5">fuqingqing</span>\n` +
-            '                                                                <span class="pull-right ">\n' +
-            '                                                                    \n' +
-            '                                                                    \n' +
-            '                                                                    \n' +
-            '                                                                </span>\n' +
-            '                                                            </p>\n' +
-            `                                                            <p class="text-muted mb-0">测试角色</p>\n` +
-            '                                                        </div>\n' +
-            '                                                    </div>\n' +
-            '                                                </div>\n' +
-            '                                            </div>\n' +
-            '                                        </li>';
+        console.log(lastAuditorHtml);
+        $('.last-auditor-list .is_uncheck').remove();
+        $('.last-auditor-list').append(lastAuditorHtml);
         $('.auditors-list').html(auditorshtml.join(''));
 
     }

+ 6 - 6
app/view/stage/audit_modal.ejs

@@ -146,7 +146,7 @@
                                                 </div>
                                             </div>
                                         </li>
-                                        <li class="timeline-list-item pb-2">
+                                        <li class="timeline-list-item pb-2 <% if (auditor.status === auditConst.status.uncheck && idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>is_uncheck<% } %>">
                                             <div class="timeline-item-date">
                                                 <%- ctx.helper.formatDate(auditor.end_time) %>
                                             </div>
@@ -190,7 +190,7 @@
                                             </div>
                                         </li>
                                         <% } else {%>
-                                        <li class="timeline-list-item pb-2">
+                                        <li class="timeline-list-item pb-2 <% if (auditor.status === auditConst.status.uncheck && idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>is_uncheck<% } %>">
                                             <div class="timeline-item-date">
                                                 <%- ctx.helper.formatDate(auditor.end_time) %>
                                             </div>
@@ -333,7 +333,7 @@
                                             </div>
                                         </div>
                                     </li>
-                                    <li class="timeline-list-item pb-2">
+                                    <li class="timeline-list-item pb-2 <% if (auditor.status === auditConst.status.uncheck && idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>is_uncheck<% } %>">
                                         <div class="timeline-item-date">
                                             <%- ctx.helper.formatDate(auditor.end_time) %>
                                         </div>
@@ -382,7 +382,7 @@
                                         </div>
                                     </li>
                                     <% } else {%>
-                                    <li class="timeline-list-item pb-2">
+                                    <li class="timeline-list-item pb-2 <% if (auditor.status === auditConst.status.uncheck && idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>is_uncheck<% } %>">
                                         <div class="timeline-item-date">
                                             <%- ctx.helper.formatDate(auditor.end_time) %>
                                         </div>
@@ -526,7 +526,7 @@
                                             </div>
                                         </div>
                                     </li>
-                                    <li class="timeline-list-item pb-2">
+                                    <li class="timeline-list-item pb-2 <% if (auditor.status === auditConst.status.uncheck && idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>is_uncheck<% } %>">
                                         <div class="timeline-item-date">
                                             <%- ctx.helper.formatDate(auditor.end_time) %>
                                         </div>
@@ -602,7 +602,7 @@
                                         </div>
                                     </li>
                                     <% } else {%>
-                                    <li class="timeline-list-item pb-2">
+                                    <li class="timeline-list-item pb-2 <% if (auditor.status === auditConst.status.uncheck && idx === ctx.stage.auditHistory.length - 1 && ctx.stage.auditHistory.length !== 1) { %>is_uncheck<% } %>">
                                         <div class="timeline-item-date">
                                             <%- ctx.helper.formatDate(auditor.end_time) %>
                                         </div>