台账审批和计量审批一下bug修复

app/controller/ledger_audit_controller.js

@@ -7,7 +7,7 @@
  * @date 2018/5/28
  * @version
  */
-const auditConst = require('../const/audit').flow;
+const auditConst = require('../const/audit').ledger;
 const spreadConst = require('../const/spread');
 const measureType = require('../const/tender').measureType;
 

app/controller/ledger_controller.js

@@ -19,6 +19,7 @@ const measureType = require('../const/tender').measureType;
 const spreadConst = require('../const/spread');
 const fs = require('fs');
 const LzString = require('lz-string');
+const accountGroup = require('../const/account_group').group;
 
 module.exports = app => {
 
@@ -129,6 +130,15 @@ module.exports = app => {
                     measureType,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.ledger.explode),
                 };
+                if (tender.data.ledger_status === auditConst.status.uncheck || tender.data.ledger_status === auditConst.status.checkNo) {
+                    renderData.accountGroup = accountGroup;
+                    // 获取所有项目参与者
+                    const accountList = await ctx.service.projectAccount.getAllDataByCondition({
+                        where: { project_id: ctx.session.sessionProject.id, enable: 1 },
+                        columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group'],
+                    });
+                    renderData.accountList = accountList;
+                }
 
                 await this.layout('ledger/explode.ejs', renderData, 'ledger/explode_modal.ejs');
             } catch (err) {

app/controller/stage_controller.js

@@ -16,6 +16,7 @@ const payConst = require('../const/deal_pay.js');
 const measureType = tenderConst.measureType;
 const path = require('path');
 const PayCalculator = require('../lib/pay_calc');
+const accountGroup = require('../const/account_group').group;
 
 module.exports = app => {
     class StageController extends app.BaseController {
@@ -136,9 +137,19 @@ module.exports = app => {
                 renderData.curStageData = await ctx.service.stageBills.getAuditorStageData(ctx.tender.id, ctx.stage.id, ctx.stage.times, 0);
                 renderData.jsFiles = this.app.jsFiles.common.concat(this.app.jsFiles.stage.index);
                 // 查询截止上期数据
-                //if (ctx.stage.order > 0) {
-                    //renderData.preStageData
-                //}
+                // if (ctx.stage.order > 0) {
+                // renderData.preStageData
+                // }
+
+                if (ctx.stage.status === auditConst.status.uncheck && ctx.session.sessionUser.accountId === ctx.stage.user_id) {
+                    renderData.accountGroup = accountGroup;
+                    // 获取所有项目参与者
+                    const accountList = await ctx.service.projectAccount.getAllDataByCondition({
+                        where: { project_id: ctx.session.sessionProject.id, enable: 1 },
+                        columns: ['id', 'name', 'company', 'role', 'enable', 'is_admin', 'account_group'],
+                    });
+                    renderData.accountList = accountList;
+                }
                 await this.layout('stage/index.ejs', renderData, 'stage/modal.ejs');
             } catch (err) {
                 this.log(err);
@@ -691,7 +702,7 @@ module.exports = app => {
                     throw '提交数据错误';
                 }
                 if (data.checkType === auditConst.status.checkNo) {
-                    if (!data.backType || isNaN(data.backType)) {
+                    if (!data.checkType || isNaN(data.checkType)) {
                         throw '提交数据错误';
                     }
                 }
@@ -843,4 +854,4 @@ module.exports = app => {
     }
 
     return StageController;
-};
+};

app/public/js/ledger.js

@@ -1294,24 +1294,58 @@ $(document).ready(function() {
             $('#searchResult').hide();
         });
     });
-    $('#addAuditor').click(() => {
-        const data = {
-            auditorId: $('#addAuditor').attr('auditorId'),
-        };
-        postData('/tender/' + getTenderId() + '/ledger/audit/add', data, (data) => {
-            const html = [];
-            html.push('<li class="list-group-item" auditorId="'+ data.audit_id +'"><a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
-            html.push('<span>');
-            html.push(data.audit_order + ' ');
-            html.push(data.name + ' ');
-            html.push('</span>');
-            html.push('<small class="text-muted">');
-            html.push(data.role);
-            html.push('</small></li>');
-            $('#auditors').append(html.join(''));
-        });
+    // 审批人分组选择
+    $('#account_group').change(function () {
+        let account_html = '<option value="0">选择审批人</option>';
+        for (const account of accountList) {
+            if (parseInt($(this).val()) === 0 || parseInt($(this).val()) === account.account_group) {
+                const role = account.role !== '' ? '（' + account.role + '）' : '';
+                const company = account.company !== '' ? ' -' + account.company : '';
+                account_html += '<option value="' + account.id + '">' + account.name + role + company + '</option>';
+            }
+        }
+        $('#account_list').html(account_html);
+    });
+    // 添加到审批流程中
+    $('body').on('change', '#account_list', function () {
+        let id = $(this).val();
+        id = parseInt(id);
+        if (id !== 0) {
+            const data = {
+                auditorId: $(this).val(),
+            };
+            postData('/tender/' + getTenderId() + '/ledger/audit/add', data, (data) => {
+                const html = [];
+                html.push('<li class="list-group-item" auditorId="' + data.audit_id + '"><a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+                html.push('<span>');
+                html.push(data.audit_order + ' ');
+                html.push(data.name + ' ');
+                html.push('</span>');
+                html.push('<small class="text-muted">');
+                html.push(data.role);
+                html.push('</small></li>');
+                $('#auditors').append(html.join(''));
+            });
+        }
     });
-    $('li>a', '#auditors').bind('click', function () {
+    // $('#addAuditor').click(() => {
+    //     const data = {
+    //         auditorId: $('#addAuditor').attr('auditorId'),
+    //     };
+    //     postData('/tender/' + getTenderId() + '/ledger/audit/add', data, (data) => {
+    //         const html = [];
+    //         html.push('<li class="list-group-item" auditorId="'+ data.audit_id +'"><a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+    //         html.push('<span>');
+    //         html.push(data.audit_order + ' ');
+    //         html.push(data.name + ' ');
+    //         html.push('</span>');
+    //         html.push('<small class="text-muted">');
+    //         html.push(data.role);
+    //         html.push('</small></li>');
+    //         $('#auditors').append(html.join(''));
+    //     });
+    // });
+    $('body').on('click', '#auditors li>a', function () {
         const li = $(this).parent();
         const data = {
             auditorId: parseInt(li.attr('auditorId')),

app/public/js/stage_audit.js

@@ -51,8 +51,39 @@ $(document).ready(function () {
             $('#auditors').append(html.join(''));
         });
     });
+    // 审批人分组选择
+    $('#account_group').change(function () {
+        let account_html = '<option value="0">选择审批人</option>';
+        for (const account of accountList) {
+            if (parseInt($(this).val()) === 0 || parseInt($(this).val()) === account.account_group) {
+                const role = account.role !== '' ? '（' + account.role + '）' : '';
+                const company = account.company !== '' ? ' -' + account.company : '';
+                account_html += '<option value="' + account.id + '">' + account.name + role + company + '</option>';
+            }
+        }
+        $('#account_list').html(account_html);
+    });
+    // 添加到审批流程中
+    $('body').on('change', '#account_list', function () {
+        let id = $(this).val();
+        id = parseInt(id);
+        if (id !== 0) {
+            postData(getUrlPre() + '/audit/add', { auditorId: id }, (data) => {
+                const html = [];
+                html.push('<li class="list-group-item" auditorId="'+ data.aid +'"><a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+                html.push('<span>');
+                html.push(data.order + ' ');
+                html.push(data.name + ' ');
+                html.push('</span>');
+                html.push('<small class="text-muted">');
+                html.push(data.role);
+                html.push('</small></li>');
+                $('#auditors').append(html.join(''));
+            });
+        }
+    });
     // 删除审批人
-    $('li>a', '#auditors').bind('click', function () {
+    $('body').on('click', '#auditors li>a', function () {
         const li = $(this).parent();
         const data = {
             auditorId: parseInt(li.attr('auditorId')),
@@ -65,4 +96,4 @@ $(document).ready(function () {
             }
         });
     });
-});
+});

app/service/stage_audit.js

@@ -204,7 +204,7 @@ module.exports = app => {
          * @returns {Promise<void>}
          */
         async check(stageId, checkData, times = 1) {
-            if (checkData.checkType !== auditConst.status.checked && checkData.checkType !== auditConst.status.checkNo) {
+            if (checkData.checkType !== auditConst.status.checked && checkData.checkType !== auditConst.status.checkNo && checkData.checkType !== auditConst.status.checkNoPre) {
                 throw '提交数据错误';
             }
 
@@ -316,4 +316,4 @@ module.exports = app => {
     }
 
     return StageAudit;
-};
+};

app/service/stage_pay.js

@@ -232,7 +232,7 @@ module.exports = app => {
          * @returns {Promise<*>}
          */
         async copyAuditStagePays(stage, times, order, transaction) {
-            if (!stage || !transaction || !times || !order) {
+            if (!stage || !transaction || !times || order === undefined) {
                 throw '数据错误';
             }
             const sql = 'INSERT INTO ?? (`tid`, `sid`, `pid`, `stimes`, `sorder`, `expr`, `pause`, `attachment`, `pre_tp`) ' +
@@ -246,4 +246,4 @@ module.exports = app => {
     }
 
     return StagePay;
-};
+};

app/view/ledger/explode.ejs

@@ -34,7 +34,7 @@
             </div>
             <div>
                 <% if (tender.ledger_status === auditConst.status.checkNo) { %>
-                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark">报审退回</a>
+                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark">审批退回</a>
                 <% } else if (tender.ledger_status === auditConst.status.checking) { %>
                     <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-dark">审批中</a>
                 <% } else if (tender.ledger_status === auditConst.status.checked) { %>
@@ -143,4 +143,9 @@
 </script>
 <script>
     GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";
-</script>
+</script>
+<% if (tender.ledger_status === auditConst.status.uncheck || tender.ledger_status === auditConst.status.checkNo) { %>
+<script>
+    const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
+</script>
+<% } %>

app/view/ledger/explode_modal.ejs

@@ -87,23 +87,42 @@
                 <h5 class="modal-title">上报审批</h5>
             </div>
             <div class="modal-body">
+                <!--<div class="form-group">-->
+                    <!--<label>搜索审批人</label>-->
+                    <!--<div class="input-group">-->
+                        <!--<input class="form-control" placeholder="请输入姓名进行检索" type="text" id="searchName">-->
+                        <!--<div class="input-group-append">-->
+                            <!--<button class="btn btn-outline-secondary" type="button" id="searchAccount"><i class="fa fa-search"></i></button>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
+                <!--<div class="card border-primary" id="searchResult" style="display: none">-->
+                    <!--<div class="card-body">-->
+                        <!--<h5 class="card-title">-->
+                            <!--<a href="javascript: void(0)" class="btn btn-primary btn-sm pull-right" id="addAuditor">添加</a>-->
+                            <!--<span>张三</span>-->
+                        <!--</h5>-->
+                        <!--<h6 class="card-subtitle mb-2 text-muted">监理</h6>-->
+                        <!--<p class="card-text">XXXXX公司</p>-->
+                    <!--</div>-->
+                <!--</div>-->
                 <div class="form-group">
-                    <label>搜索审批人</label>
+                    <label>选择审批人</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text" id="searchName">
-                        <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" id="searchAccount"><i class="fa fa-search"></i></button>
+                        <div class="input-group-prepend">
+                            <select class="form-control" id="account_group">
+                                <option value="0">所有分组</option>
+                                <% for (const dw in accountGroup) { %>
+                                    <option value="<%= dw %>"><%= accountGroup[dw] %></option>
+                                <% } %>
+                            </select>
                         </div>
-                    </div>
-                </div>
-                <div class="card border-primary" id="searchResult" style="display: none">
-                    <div class="card-body">
-                        <h5 class="card-title">
-                            <a href="javascript: void(0)" class="btn btn-primary btn-sm pull-right" id="addAuditor">添加</a>
-                            <span>张三</span>
-                        </h5>
-                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
-                        <p class="card-text">XXXXX公司</p>
+                        <select class="form-control" id="account_list">
+                            <option value="0">选择审批人</option>
+                            <% for (const account of accountList) { %>
+                                <option value="<%= account.id %>"><%= account.name %><% if (account.role !== '') { %>（<%= account.role %>）<% } %><% if (account.company !== '') { %> -<%= account.company %><% } %></option>
+                            <% } %>
+                        </select>
                     </div>
                 </div>
                 <div class="card mt-3">

app/view/stage/audit_modal.ejs

@@ -8,25 +8,44 @@
                 <h5 class="modal-title">上报审批</h5>
             </div>
             <div class="modal-body">
+                <!--<div class="form-group">-->
+                    <!--<label>搜索审批人</label>-->
+                    <!--<div class="input-group">-->
+                        <!--<input class="form-control" placeholder="请输入姓名进行检索" type="text" id="searchName">-->
+                        <!--<div class="input-group-append">-->
+                            <!--<button class="btn btn-outline-secondary" type="button" id="searchAccount"><i class="fa fa-search"></i></button>-->
+                        <!--</div>-->
+                    <!--</div>-->
+                <!--</div>-->
                 <div class="form-group">
-                    <label>搜索审批人</label>
+                    <label>选择审批人</label>
                     <div class="input-group">
-                        <input class="form-control" placeholder="请输入姓名进行检索" type="text" id="searchName">
-                        <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" id="searchAccount"><i class="fa fa-search"></i></button>
+                        <div class="input-group-prepend">
+                            <select class="form-control" id="account_group">
+                                <option value="0">所有分组</option>
+                                <% for (const dw in accountGroup) { %>
+                                    <option value="<%= dw %>"><%= accountGroup[dw] %></option>
+                                <% } %>
+                            </select>
                         </div>
+                        <select class="form-control" id="account_list">
+                            <option value="0">选择审批人</option>
+                            <% for (const account of accountList) { %>
+                                <option value="<%= account.id %>"><%= account.name %><% if (account.role !== '') { %>（<%= account.role %>）<% } %><% if (account.company !== '') { %> -<%= account.company %><% } %></option>
+                            <% } %>
+                        </select>
                     </div>
                 </div>
-                <div class="card border-primary" id="searchResult" style="display: none">
-                    <div class="card-body">
-                        <h5 class="card-title">
-                            <a href="javascript: void(0)" class="btn btn-primary btn-sm pull-right" id="addAuditor">添加</a>
-                            <span>张三</span>
-                        </h5>
-                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
-                        <p class="card-text">XXXXX公司</p>
-                    </div>
-                </div>
+                <!--<div class="card border-primary" id="searchResult" style="display: none">-->
+                    <!--<div class="card-body">-->
+                        <!--<h5 class="card-title">-->
+                            <!--<a href="javascript: void(0)" class="btn btn-primary btn-sm pull-right" id="addAuditor">添加</a>-->
+                            <!--<span>张三</span>-->
+                        <!--</h5>-->
+                        <!--<h6 class="card-subtitle mb-2 text-muted">监理</h6>-->
+                        <!--<p class="card-text">XXXXX公司</p>-->
+                    <!--</div>-->
+                <!--</div>-->
                 <div class="card mt-3">
                     <div class="card-header">
                         审批流程
@@ -55,7 +74,7 @@
     <% if (ctx.stage.curAuditor && ctx.stage.curAuditor.aid === ctx.session.sessionUser.accountId) { %>
         <!--审批通过-->
         <div class="modal fade" id="sp-done" data-backdrop="static">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <form class="modal-content" action="<%- preUrl %>/audit/check" method="post">
             <div class="modal-header">
                 <h5 class="modal-title">审批通过</h5>
@@ -94,6 +113,8 @@
                                     <span class="text-success pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批通过</span>
                                     <% } else if (auditors[iA].stauts == auditConst.status.checking) { %>
                                     <span class="pull-right">审批中</span>
+                                    <% } else if (auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <span class="text-warning pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批退回</span>
                                     <% } %>
                                     <h5 class="card-title">
                                         <i class="<%- (iA < auditors.length - 1 ? 'fa fa-chevron-circle-down' : 'fa fa-stop-circle') %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small>
@@ -103,7 +124,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion"></textarea>
+                                        <textarea class="form-control" name="opinion">同意</textarea>
                                     </div>
                                     <% } %>
                                 </li>
@@ -124,8 +145,8 @@
 </div>
         <!--审批退回-->
         <div class="modal fade" id="sp-back" data-backdrop="static">
-    <div class="modal-dialog" role="document">
-        <form class="modal-content" action="<%- preUrl %>/audit/check" method="post">
+    <div class="modal-dialog modal-lg" role="document">
+        <form class="modal-content modal-lg" action="<%- preUrl %>/audit/check" method="post">
             <div class="modal-header">
                 <h5 class="modal-title">审批退回</h5>
             </div>
@@ -163,6 +184,8 @@
                                     <span class="text-success pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批通过</span>
                                     <% } else if (auditors[iA].stauts == auditConst.status.checking) { %>
                                     <span class="pull-right">审批中</span>
+                                    <% } else if (auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <span class="text-warning pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批退回</span>
                                     <% } %>
                                     <h5 class="card-title">
                                         <i class="<%- (iA < auditors.length - 1 ? 'fa fa-chevron-circle-down' : 'fa fa-stop-circle') %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small>
@@ -172,7 +195,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion"></textarea>
+                                        <textarea class="form-control" name="opinion">不同意</textarea>
                                     </div>
                                     <div class="alert alert-warning">
                                         <div class="form-check form-check-inline">
@@ -246,8 +269,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -257,8 +280,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -268,8 +291,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -294,8 +317,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -305,8 +328,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -316,8 +339,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -380,8 +403,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -391,8 +414,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -402,8 +425,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -428,8 +451,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -439,8 +462,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -450,8 +473,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -513,8 +536,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -524,8 +547,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -535,8 +558,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -561,8 +584,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -572,8 +595,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -583,8 +606,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -689,8 +712,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -700,8 +723,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -711,8 +734,8 @@
                                     <span class="<%- auditConst.statusClass[ah[iA].status] %> pull-right"><%- auditConst.statusString[ah[iA].status]%><% if (ah[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[ah[iA].status] %>"></i> <%- ah[iA].name %> <small class="text-muted"><%- ah[iA].role %></small></h5>
-                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[ah[iA].status]%>，<%- ah[iA].opinion %>。</p>
+                                    <% if (ah[iA].status === auditConst.status.checked || ah[iA].status === auditConst.status.checkNo || ah[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- ah[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- ah[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -737,8 +760,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text mb-1"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text mb-1"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -748,8 +771,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-stop-circle <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -759,8 +782,8 @@
                                     <span class="<%- auditConst.statusClass[auditors[iA].status] %> pull-right"><%- auditConst.statusString[auditors[iA].status]%><% if (auditors[iA].status === auditConst.status.checkNo) { %> <%- ctx.stage.user.name %><% } %></span>
                                     <% } %>
                                     <h5 class="card-title"><i class="fa fa-chevron-circle-down <%- auditConst.statusClass[auditors[iA].status] %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small></h5>
-                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo) { %>
-                                    <p class="card-text"><%- auditConst.statusString[auditors[iA].status]%>，<%- auditors[iA].opinion %>。</p>
+                                    <% if (auditors[iA].status === auditConst.status.checked || auditors[iA].status === auditConst.status.checkNo || auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <p class="card-text"><%- auditors[iA].opinion %></p>
                                     <p class="card-text"><small class="text-muted"><%- auditors[iA].end_time.toLocaleDateString() %></small></p>
                                     <% } %>
                                 </li>
@@ -781,7 +804,7 @@
     <% if (ctx.session.sessionUser.accountId === ctx.stage.curAuditor.aid) { %>
         <!--审批通过-->
         <div class="modal fade" id="sp-done" data-backdrop="static">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <form class="modal-content" action="<%- preUrl %>/audit/check" method="post">
             <div class="modal-header">
                 <h5 class="modal-title">审批通过</h5>
@@ -820,6 +843,8 @@
                                     <span class="text-success pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批通过</span>
                                     <% } else if (auditors[iA].stauts == auditConst.status.checking) { %>
                                     <span class="pull-right">审批中</span>
+                                    <% } else if (auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <span class="text-warning pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批退回</span>
                                     <% } %>
                                     <h5 class="card-title">
                                         <i class="<%- (iA < auditors.length - 1 ? 'fa fa-chevron-circle-down' : 'fa fa-stop-circle') %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small>
@@ -829,7 +854,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion"></textarea>
+                                        <textarea class="form-control" name="opinion">同意</textarea>
                                     </div>
                                     <% } %>
                                 </li>
@@ -850,7 +875,7 @@
 </div>
         <!--审批退回-->
         <div class="modal fade" id="sp-back" data-backdrop="static">
-    <div class="modal-dialog" role="document">
+    <div class="modal-dialog modal-lg" role="document">
         <form class="modal-content" action="<%- preUrl %>/audit/check" method="post">
             <div class="modal-header">
                 <h5 class="modal-title">审批退回</h5>
@@ -889,6 +914,8 @@
                                     <span class="text-success pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批通过</span>
                                     <% } else if (auditors[iA].stauts == auditConst.status.checking) { %>
                                     <span class="pull-right">审批中</span>
+                                    <% } else if (auditors[iA].status === auditConst.status.checkNoPre) { %>
+                                    <span class="text-warning pull-right"><small><%- auditors[iA].end_time.toLocaleString() %></small> 审批退回</span>
                                     <% } %>
                                     <h5 class="card-title">
                                         <i class="<%- (iA < auditors.length - 1 ? 'fa fa-chevron-circle-down' : 'fa fa-stop-circle') %>"></i> <%- auditors[iA].name %> <small class="text-muted"><%- auditors[iA].role %></small>
@@ -898,7 +925,7 @@
                                     <% } else if (auditors[iA].status === auditConst.status.checking) { %>
                                     <div class="form-group">
                                         <label>审批意见<b class="text-danger">*</b></label>
-                                        <textarea class="form-control" name="opinion"></textarea>
+                                        <textarea class="form-control" name="opinion">不同意</textarea>
                                     </div>
                                     <div class="alert alert-warning">
                                         <div class="form-check form-check-inline">
@@ -929,4 +956,4 @@
     </div>
 </div>
     <% } %>
-<% } %>
+<% } %>

app/view/stage/index.ejs

@@ -276,4 +276,9 @@
     const stage = JSON.parse('<%- JSON.stringify(ctx.stage) %>');
     const ledgerData = JSON.parse('<%- JSON.stringify(ledgerData) %>');
     const curStageData = JSON.parse('<%- JSON.stringify(curStageData) %>');
-</script>
+</script>
+<% if (ctx.stage.status === auditConst.status.uncheck && ctx.session.sessionUser.accountId === ctx.stage.user_id) {%>
+<script>
+    const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
+</script>
+<% } %>