变更审批流程和弹窗点击空白处不关闭设置

app/public/js/change_set.js

@@ -264,8 +264,11 @@ $(document).ready(() => {
                 // 添加新审批人
                 const addhtml2 = '<li class="list-group-item" data-auditid="' + accountInfo.id + '" >' +
                     '<i class="fa fa-stop-circle"></i>' +
-                    accountInfo.name + ' <small class="text-muted">' + accountInfo.role + '</small>' +
+                    accountInfo.name + ' <small class="text-muted">' + accountInfo.role + '</small><span class="pull-right">终审</span>' +
                     '</li>';
+                for (let i = 0; i < $('#shenpi-audit-list li').length; i++) {
+                    $('#shenpi-audit-list li').eq(i).find('.pull-right').text(transFormToChinese(i+1) + '审');
+                }
                 $('#shenpi-audit-list').append(addhtml2);
             } else {
                 toastr.error('审批流程中已存在该用户！');
@@ -293,6 +296,9 @@ $(document).ready(() => {
             $('#shenpi-audit-list li').eq($('#shenpi-audit-list li').length-1).children('i')
                 .removeClass('fa-chevron-circle-down').addClass('fa-stop-circle');
         }
+        for (let i = 0; i < $('#shenpi-audit-list li').length; i++) {
+            $('#shenpi-audit-list li').eq(i).find('.pull-right').text((i+1 === $('#shenpi-audit-list li').length ? '终' : transFormToChinese(i+1)) + '审');
+        }
     });
 
     // 打开签约清单modal并删除之前的操作

app/service/change_audit.js

@@ -240,6 +240,7 @@ module.exports = app => {
                 value: times,
                 operate: '!=',
             });
+            this.sqlBuilder.orderBy = [['usort', 'ASC']];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
             const result = await this.db.query(sql, sqlParam);
 

app/view/change/info_modal.ejs

@@ -94,7 +94,7 @@
 <script src="/public/js/change_company.js"></script>
 
 <!--添加清单-->
-<div class="modal fade " tabindex="-1" role="dialog" aria-hidden="true" id="addlist">
+<div class="modal fade " tabindex="-1" role="dialog" aria-hidden="true" id="addlist" data-backdrop="static">
     <style>
         /* 设置滚动条的样式 */
         .fixed_headers ::-webkit-scrollbar, .fixed_headers2 ::-webkit-scrollbar {
@@ -239,7 +239,7 @@
                                         <% if (audit.usite === 0) { %>
                                             <li class="list-group-item">
                                                 <i class="fa fa-play-circle fa-rotate-90"></i>
-                                                <%= audit.name %>  <small class="text-muted"><%= audit.jobs %></small><span class="pull-right"><%= index === 0 ? '原报' : (index+1 === auditList.length ? '终审' : ctx.helper.transFormToChinese(index+1) + '审') %></span>
+                                                <%= audit.name %>  <small class="text-muted"><%= audit.jobs %></small><span class="pull-right">原报</span>
                                             </li>
                                         <% } %>
                                     <% } %>
@@ -253,7 +253,7 @@
                                                 <% } else if (index+1 === auditList.length) { %>
                                                     <i class="fa fa-stop-circle"></i>
                                                 <% } %>
-                                                <%= a.name %>  <small class="text-muted"><%= a.jobs %></small>
+                                                <%= a.name %>  <small class="text-muted"><%= a.jobs %></small><span class="pull-right"><%= index+1 === auditList.length ? '终' : ctx.helper.transFormToChinese(index) %>审</span>
                                             </li>
                                         <% }%>
                                     <% } %>
@@ -267,19 +267,6 @@
                                     <ul class="list-group list-group-flush">
                                         <% for (const [aindex,al] of auditList3[time].entries()) { %>
                                             <li class="list-group-item">
-                                                <% if (al.usite === 0 && al.status === 2) { %>
-                                                    <span class="pull-right">重新上报中</span>
-                                                <% } else if (al.usite === 0 && al.status === 3) { %>
-                                                    <span class="text-success pull-right">上报</span>
-                                                <% } else if (al.usite !== 0 && al.status === 2) { %>
-                                                    <span class="pull-right">审批中</span>
-                                                <% } else if (al.usite !== 0 && al.status === 3) { %>
-                                                    <span class="text-success pull-right">审批通过</span>
-                                                <% } else if (al.usite !== 0 && al.status === 4) { %>
-                                                    <span class="text-danger pull-right">审批终止</span>
-                                                <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
-                                                    <span class="text-warning pull-right">审批退回 </span>
-                                                <% } %>
                                                 <h5 class="card-title">
                                                     <% if (al.usite === 0 && al.status === 2 ) { %>
                                                         <i class="fa fa-play-circle fa-rotate-90"></i>
@@ -294,14 +281,26 @@
                                                     <% } else if (al.status === 5 || al.status === 6) { %>
                                                         <i class="fa <% if (aindex+1 === auditList3[time].length) { %>fa-stop-circle<% } else { %>fa-chevron-circle-down<% } %> text-warning"></i>
                                                     <% } %>
-                                                    <%= al.name %>&nbsp;<small class="text-muted"><%= al.jobs %></small>
+                                                    <%= al.name %>&nbsp;<small class="text-muted"><%= al.jobs %></small><span class="pull-right"><%= al.usite === 0 ? '原报' : (aindex+1 === auditList3[time].length ? '终审' : ctx.helper.transFormToChinese(al.usite) + '审') %></span>
                                                 </h5>
-                                                <% if (al.sdesc !== '' && al.sdesc !== null) { %>
-                                                    <p class="card-text mb-1"><%= al.sdesc %></p>
-                                                <% } %>
-                                                <% if (al.sin_time !== null) { %>
-                                                    <p class="card-text"><small class="text-muted"><%= moment(al.sin_time).format('YYYY-MM-DD') %></small></p>
-                                                <% } %>
+                                                <div class="ml-3">
+                                                    <% if (al.usite === 0 && al.status === 2) { %>
+                                                        <span>重新上报中</span>
+                                                    <% } else if (al.usite === 0 && al.status === 3) { %>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>上报</span>
+                                                    <% } else if (al.usite !== 0 && al.status === 2) { %>
+                                                        <span>审批中</span>
+                                                    <% } else if (al.usite !== 0 && al.status === 3) { %>
+                                                        <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                                    <% } else if (al.usite !== 0 && al.status === 4) { %>
+                                                        <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                                    <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
+                                                        <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回 </span>
+                                                    <% } %>
+                                                    <% if (al.sdesc !== '' && al.sdesc !== null) { %>
+                                                        <p class="card-text"><%= al.sdesc %></p>
+                                                    <% } %>
+                                                </div>
                                             </li>
                                         <% } %>
                                     </ul>
@@ -344,7 +343,7 @@
                                         <% } else if (index+1 === auditList2.length) { %>
                                             <i class="fa fa-stop-circle"></i>
                                         <% } %>
-                                        <%= a.name %>  <small class="text-muted"><%= a.jobs %></small><span class="pull-right"><%= a.usite === 0 ? '原报' : (index+1 === auditList2.length ? '终审' : ctx.helper.transFormToChinese(index+1) + '审') %></span>
+                                        <%= a.name %>  <small class="text-muted"><%= a.jobs %></small><span class="pull-right"><%= a.usite === 0 ? '原报' : (index+1 === auditList2.length ? '终审' : ctx.helper.transFormToChinese(a.usite) + '审') %></span>
                                     </li>
                                 <% } %>
                             </ul>
@@ -356,23 +355,6 @@
                             <ul class="list-group list-group-flush">
                                 <% for (const [aindex,al] of auditList3[time].entries()) { %>
                                 <li class="list-group-item">
-                                    <% if (al.usite === 0 && al.status === 2) { %>
-                                    <span class="pull-right">重新上报中</span>
-                                    <% } else if (al.usite === 0 && al.status === 3 && al.times === 1) { %>
-                                    <span class="text-success pull-right">上报</span>
-                                    <% } else if (al.usite === 0 && al.status === 3 && al.times !== 1) { %>
-                                    <span class="text-success pull-right">重新上报</span>
-                                    <% } else if (al.usite !== 0 && al.status === 2) { %>
-                                    <span class="pull-right">审批中</span>
-                                    <% } else if (al.usite !== 0 && al.status === 3) { %>
-                                    <span class="text-success pull-right">审批通过</span>
-                                    <% } else if (al.usite !== 0 && al.status === 4) { %>
-                                    <span class="text-danger pull-right">审批终止</span>
-                                    <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
-                                    <span class="text-warning pull-right">审批退回 <% if (al.status === 5) {%><%= auditList3[time][0].name %><% } %></span>
-                                    <% } else if (al.usite !== 0 && al.status === 7) { %>
-                                        <span class="text-warning pull-right">重新审批</span>
-                                    <% } %>
                                     <h5 class="card-title">
                                         <% if (al.usite === 0 && al.status === 2 ) { %>
                                         <i class="fa fa-play-circle fa-rotate-90"></i>
@@ -389,14 +371,30 @@
                                         <% } else if (al.status === 7) { %>
                                         <i class="fa fa-chevron-circle-down text-warning"></i>
                                         <% } %>
-                                        <%= al.name %>&nbsp;<small class="text-muted"><%= al.jobs %></small>
+                                        <%= al.name %>&nbsp;<small class="text-muted"><%= al.jobs %></small><span class="pull-right"><%= al.usite === 0 ? '原报' : (aindex+1 === auditList3[time].length ? '终审' : ctx.helper.transFormToChinese(aindex) + '审')  %></span>
                                     </h5>
-                                        <% if (al.sdesc !== '' && al.sdesc !== null) { %>
-                                            <p class="card-text mb-1"><%= al.sdesc %></p>
+                                    <div class="ml-3">
+                                        <% if (al.usite === 0 && al.status === 2) { %>
+                                            <span>重新上报中</span>
+                                        <% } else if (al.usite === 0 && al.status === 3 && al.times === 1) { %>
+                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>上报</span>
+                                        <% } else if (al.usite === 0 && al.status === 3 && al.times !== 1) { %>
+                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新上报</span>
+                                        <% } else if (al.usite !== 0 && al.status === 2) { %>
+                                            <span>审批中</span>
+                                        <% } else if (al.usite !== 0 && al.status === 3) { %>
+                                            <span class="text-success"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批通过</span>
+                                        <% } else if (al.usite !== 0 && al.status === 4) { %>
+                                            <span class="text-danger"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批终止</span>
+                                        <% } else if (al.usite !== 0 && (al.status === 5 || al.status === 6)) { %>
+                                            <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>审批退回 <% if (al.status === 5) {%><%= auditList3[time][0].name %><% } %></span>
+                                        <% } else if (al.usite !== 0 && al.status === 7) { %>
+                                            <span class="text-warning"><% if (al.sin_time !== null) { %><small><%= moment(al.sin_time).format('YYYY-MM-DD') %></small> <% } %>重新审批</span>
                                         <% } %>
-                                        <% if (al.sin_time !== null) { %>
-                                            <p class="card-text"><small class="text-muted"><%= moment(al.sin_time).format('YYYY-MM-DD') %></small></p>
+                                        <% if (al.sdesc !== '' && al.sdesc !== null) { %>
+                                            <p class="card-text"><%= al.sdesc %></p>
                                         <% } %>
+                                    </div>
                                 </li>
                                 <% } %>
                             </ul>
@@ -427,11 +425,11 @@
                         <ul class="list-group list-group-flush">
                             <% for (const [index,a] of auditList.entries()) { %>
                             <li class="list-group-item">
-                                <% if (a.status === 3 && a.usort === 0 && a.times === 1) { %>
+                                <% if (a.status === 3 && a.usite === 0 && a.times === 1) { %>
                                 <span class="text-success pull-right">上报</span>
-                                <% } else if (a.status === 3 && a.usort === 0 && a.times !== 1) { %>
+                                <% } else if (a.status === 3 && a.usite === 0 && a.times !== 1) { %>
                                 <span class="text-success pull-right">重新上报</span>
-                                <% } else if (a.status === 3 && a.usort !== 0) { %>
+                                <% } else if (a.status === 3 && a.usite !== 0) { %>
                                 <span class="text-success pull-right">审批通过</span>
                                 <% } else if (a.status === 2) { %>
                                 <span class="pull-right">审批中</span>
@@ -498,11 +496,11 @@
                         <ul class="list-group list-group-flush">
                             <% for (const [index,a] of auditList.entries()) { %>
                                 <li class="list-group-item">
-                                    <% if (a.status === 3 && a.usort === 0 && a.times === 1) { %>
+                                    <% if (a.status === 3 && a.usite === 0 && a.times === 1) { %>
                                         <span class="text-success pull-right">上报</span>
-                                    <% } else if (a.status === 3 && a.usort === 0 && a.times !== 1) { %>
+                                    <% } else if (a.status === 3 && a.usite === 0 && a.times !== 1) { %>
                                         <span class="text-success pull-right">重新上报</span>
-                                    <% } else if (a.status === 3 && a.usort !== 0) { %>
+                                    <% } else if (a.status === 3 && a.usite !== 0) { %>
                                         <span class="text-success pull-right">审批通过</span>
                                     <% } else if (a.status === 2) { %>
                                         <span class="pull-right">审批中</span>