feat: 预付款审核页功能完成

app/const/audit.js

@@ -366,12 +366,14 @@ const advance = (function() {
     statusString[status.checking] = '审批中';
     statusString[status.checked] = '审批通过';
     statusString[status.checkNo] = '审批退回';
+    statusString[status.checkNoPre] = '审批退回';
 
     const statusClass = [];
     statusClass[status.uncheck] = '';
     statusClass[status.checking] = 'text-warning';
     statusClass[status.checked] = 'text-success';
     statusClass[status.checkNo] = 'text-warning';
+    statusClass[status.checkNoPre] = 'text-warning';
 
     // 标段概况页
     // 描述文本

app/controller/advance_controller.js

@@ -76,7 +76,6 @@ module.exports = app => {
                     auditHistory.push(await ctx.service.advanceAudit.getAuditors(ctx.advance.id, i));
                 }
             }
-            console.log('auditHistory', auditHistory);
             data.auditHistory = auditHistory;
             return data;
         }
@@ -222,6 +221,9 @@ module.exports = app => {
                 if (ctx.advance.status === auditConst.status.checking || ctx.advance.status === auditConst.status.checked) {
                     throw '该预付款期数据当前无法上报';
                 }
+                if (data.cur_amount === 0) {
+                    throw '本期金额不能为空';
+                }
                 await ctx.service.advanceAudit.start(ctx.advance.id, ctx.advance.times, data);
                 ctx.body = { err: 0, msg: '' };
             } catch (error) {

app/extend/helper.js

@@ -914,6 +914,7 @@ module.exports = {
 
     // 预付款详情页时间线所需格式
     formatDate(date) {
+        if (!date) return '';
         const year = date.getFullYear();
         let mon = date.getMonth() + 1;
         let day = date.getDate();

app/middleware/advance_check.js

@@ -51,7 +51,6 @@ module.exports = () => {
             this.advance = advance;
             yield next;
         } catch (err) {
-            console.log('err:', err);
             this.helper.log(err);
             // 输出错误到日志
             if (err.stack) {

app/middleware/tender_check.js

@@ -23,7 +23,7 @@ module.exports = options => {
     return function* tenderCheck(next) {
         try {
             // 读取标段数据
-            const tender = { id: parseInt(this.params.id), };
+            const tender = { id: parseInt(this.params.id) };
             if (!tender.id) {
                 throw '当前未打开标段';
             }
@@ -62,11 +62,14 @@ module.exports = options => {
                     const reviseAuditorsId = this.helper._.map(reviseAuditors, 'audit_id');
                     const materialAuditors = yield this.service.materialAudit.getAllAuditors(tender.id);
                     const materialAuditorsId = this.helper._.map(materialAuditors, 'aid');
+                    const advanceAuditors = yield this.service.advanceAudit.getAllAuditors(tender.id);
+                    const advanceAuditorsId = this.helper._.map(advanceAuditors, 'audit_id');
                     const tenderPermission = this.session.sessionUser.permission ? this.session.sessionUser.permission.tender : null;
                     if (auditorsId.indexOf(accountId) === -1 && tender.data.user_id !== accountId &&
                         (tenderPermission === null || tenderPermission === undefined || tenderPermission.indexOf('2') === -1) &&
                         stageAuditorsId.indexOf(accountId) === -1 && changeAuditorsId.indexOf(accountId) === -1 &&
-                        reviseAuditorsId.indexOf(accountId) === -1 && materialAuditorsId.indexOf(accountId) === -1) {
+                        reviseAuditorsId.indexOf(accountId) === -1 && materialAuditorsId.indexOf(accountId) === -1 &&
+                        advanceAuditorsId.indexOf(accountId) === -1) {
                         throw '您无权查看该项目';
                     }
                 }

app/public/js/advance_audit.js

@@ -104,6 +104,9 @@ $(document).ready(function () {
     $('#tm-submit').click(function() {
         const pay_ratio = parseInt($(`.pay-input[data-type=0]`).val())
         const cur_amount = parseInt($(`.pay-input[data-type=1]`).val())
+        if (!pay_ratio || !cur_amount) {
+            return toastr.error('请填写本期金额!')
+        }
         const prev_amount = prevAdvance && prevAdvance.prev_total_amount || 0
         const prev_total_amount = ZhCalc.add(cur_amount, prev_amount)
         const remark = $('#ad-remark').val() || null

app/service/advance_audit.js

@@ -465,6 +465,19 @@ module.exports = app => {
             }
             return auditor;
         }
+
+        /**
+         * 获取所有审核人
+         * @param {Number} tenderId 标段id
+         */
+        async getAllAuditors(tenderId) {
+            const sql = 'SELECT au.audit_id, au.tid FROM ' + this.tableName + ' au' +
+                '  LEFT JOIN ' + this.ctx.service.tender.tableName + ' t On au.tid = t.id' +
+                '  WHERE t.id = ?' +
+                '  GROUP BY  au.audit_id';
+            const sqlParam = [tenderId];
+            return this.db.query(sql, sqlParam);
+        }
     }
     return AdvanceAudit;
 };

app/view/advance/detail.ejs

@@ -34,7 +34,8 @@
                                 <td class="text-right">
                                     <div class="input-group input-group-sm">
                                         <input type="number" class="pay-input form-control nospin text-right" max="100"
-                                            min="1" placeholder="请填写支付比例，将自动计算本期金额" data-type="0">
+                                            min="1" placeholder="请填写支付比例，将自动计算本期金额" data-type="0"
+                                            value="<%- advance.pay_ratio %>">
                                         <div class="input-group-append"><span class="input-group-text">%</span></div>
                                     </div>
                                 </td>
@@ -42,7 +43,8 @@
                                 <td class="text-right">
                                     <div class="input-group input-group-sm">
                                         <input type="number" class="pay-input form-control nospin text-right" min="1"
-                                            placeholder="请填写本期金额，将自动计算支付比例" data-type="1">
+                                            placeholder="请填写本期金额，将自动计算支付比例" data-type="1"
+                                            value="<%- advance.cur_amount %>">
                                         <div class="input-group-append"><span class="input-group-text">元</span></div>
                                     </div>
                                 </td>
@@ -161,7 +163,7 @@
                                             审批流程
                                         </div>
                                         <ul class="list-group list-group-flush" id="auditors">
-                                            <% auditHistory && auditHistory[0] && auditHistory[0].length && auditHistory[0].forEach((item, idx) => { %>
+                                            <% ctx.advance.auditors2 && ctx.advance.auditors2.forEach((item, idx) => { %>
                                             <li class="list-group-item" auditorId="<%- item.audit_id %>">
                                                 <a href="" class="text-danger pull-right">移除</a><%- idx+1 %>
                                                 <%- item.name %>
@@ -212,244 +214,134 @@
                                 </td>
                                 <td width="70%">
                                     <% auditHistory.forEach((auditors, idx) => { %>
+                                    <!--收起历史流程-->
+                                    <% if(idx > 0 && idx === 1) { %>
+                                    <div class="text-right"><a href="javascript: void(0);" id="fold-btn" data-target="hide">收起历史审批流程</a></div>
+                                    <% } %>
+                                    <div class="<%- idx > 0 ? 'fold-btn' : '' %>">
                                         <div class="text-center text-muted"><%- idx+1 %>#</div>
                                         <ul class="timeline-list list-unstyled mt-2">
-                                            <% auditors.forEach((auditor, idx) => { %>
-                                                <% if (idx === 0) { %>
-                                                    <li class="timeline-list-item pb-2">
-                                                        <div class="timeline-item-date"><%- ctx.helper.formatDate(advance.create_time) %>
-                                                        </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="card">
-                                                                <div class="card-body p-3">
-                                                                    <div class="card-text">
-                                                                        <p class="mb-1"><span class="h5"><%- advance.user.name %></span><span
-                                                                                class="pull-right text-success">上报审批</span></p>
-                                                                        <p class="text-muted mb-0"><%- advance.user.role %></p>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    </li>
-                                                    <li class="timeline-list-item pb-2">
-                                                        <div class="timeline-item-date"><%- ctx.helper.formatDate(advance.create_time) %>
-                                                        </div>
-                                                        <div class="timeline-item-tail"></div>
-                                                        <div class="timeline-item-icon bg-success text-light">
-                                                            <i class="fa fa-check"></i>
-                                                        </div>
-                                                        <div class="timeline-item-content">
-                                                            <div class="card">
-                                                                <div class="card-body p-3">
-                                                                    <div class="card-text">
-                                                                        <p class="mb-1"><span class="h5"><%- auditor.name %></span><span
-                                                                                class="pull-right <%- auditConst.statusClass[auditor.status] %>"><%- auditConst.statusString[auditor.status] %></span></p>
-                                                                        <p class="text-muted mb-0"><%- auditor.role %></p>
-                                                                    </div>
-                                                                </div>
-                                                                <!--审批意见-->
-                                                                <% if (auditor.opinion) { %>
-                                                                    <div class="card-body p-3 border-top">
-                                                                        <p><%- auditor.opinion %></p>
-                                                                    </div>
-                                                                <% } %>
+                                            <% auditors.forEach((auditor, index) => { %>
+                                            <% if (index === 0) { %>
+                                            <li class="timeline-list-item pb-2">
+                                                <div class="timeline-item-date">
+                                                    <%- ctx.helper.formatDate(auditor.create_time) %>
+                                                </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="card">
+                                                        <div class="card-body p-3">
+                                                            <div class="card-text">
+                                                                <p class="mb-1"><span
+                                                                        class="h5"><%- advance.user.name %></span><span
+                                                                        class="pull-right text-success"><%- idx !== 0 ? '重新' : '' %>上报审批</span>
+                                                                </p>
+                                                                <p class="text-muted mb-0"><%- advance.user.role %></p>
                                                             </div>
                                                         </div>
-                                                    </li>
-                                                <% } else if(idx === auditor.length -1 ) {%>
-
-                                                <% } %>
-
-                                            <% }) %>
-                                        </ul>
-                                    <% }) %>
-                                    <!--审批次1-->
-                                    <div class="text-center text-muted">1#</div>
-                                    <ul class="timeline-list list-unstyled mt-2">
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:22:01</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="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">布尔</span><span
-                                                                    class="pull-right text-success">上报审批</span></p>
-                                                            <p class="text-muted mb-0">合同计量工程师</p>
-                                                        </div>
                                                     </div>
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:20:01</span>
-                                            </div>
-                                            <div class="timeline-item-tail"></div>
-                                            <div class="timeline-item-icon bg-success text-light">
-                                                <i class="fa fa-check"></i>
-                                            </div>
-                                            <div class="timeline-item-content">
-                                                <div class="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">张三</span><span
-                                                                    class="pull-right text-success">审批通过</span></p>
-                                                            <p class="text-muted mb-0">总监理工程师</p>
-                                                        </div>
-                                                    </div>
-                                                    <!--审批意见-->
-                                                    <div class="card-body p-3 border-top">
-                                                        <div class="">
-                                                            这是审批意见文本，内容不算很长。
-                                                        </div>
-                                                    </div>
+                                            </li>
+                                            <li class="timeline-list-item pb-2">
+                                                <div class="timeline-item-date">
+                                                    <%- ctx.helper.formatDate(auditor.end_time) %>
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:20:01</span>
-                                            </div>
-                                            <div class="timeline-item-tail"></div>
-                                            <div class="timeline-item-icon bg-warning text-light">
-                                                <i class="fa fa-level-up"></i>
-                                            </div>
-                                            <div class="timeline-item-content">
-                                                <div id="" class="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">王五</span><span
-                                                                    class="pull-right text-warning">审批退回 布尔</span></p>
-                                                            <p class="text-muted mb-0">项目办总工</p>
-                                                        </div>
-                                                    </div>
-                                                    <!--审批意见-->
-                                                    <div class="card-body p-3 border-top">
-                                                        <div class="">
-                                                            这是审批意见文本，内容不算很长。
-                                                        </div>
-                                                    </div>
+                                                <% if(index < auditors.length - 1) { %>
+                                                    <div class="timeline-item-tail"></div>
+                                                <% } %>
+                                                <% if(auditor.status === auditConst.status.checked) { %>
+                                                <div class="timeline-item-icon bg-success text-light">
+                                                    <i class="fa fa-check"></i>
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="timeline-list-item pb-2">
-                                            <!-- <div class="timeline-item-tail"></div> -->
-                                            <div class="timeline-item-icon bg-secondary text-light">
-                                            </div>
-                                            <div class="timeline-item-content">
-                                                <div id="" class="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">李四</span><span
-                                                                    class="pull-right text-warning"></span></p>
-                                                            <p class="text-muted mb-0">项目办主任</p>
-                                                        </div>
-                                                    </div>
+                                                <% } else if(auditor.status === auditConst.status.checkNo || auditor.status === auditConst.status.checkNoPre) {%>
+                                                <div class="timeline-item-icon bg-warning text-light">
+                                                    <i class="fa fa-level-up"></i>
                                                 </div>
-                                            </div>
-                                        </li>
-                                    </ul>
-                                    <!--收起历史流程-->
-                                    <div class="text-right"><a href="#">收起历史审批流程</a></div>
-                                    <!--审批次2-->
-                                    <div class="text-center text-muted">2#</div>
-                                    <ul class="timeline-list list-unstyled mt-2">
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:22:01</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="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">布尔</span><span
-                                                                    class="pull-right text-success">上报审批</span></p>
-                                                            <p class="text-muted mb-0">合同计量工程师</p>
-                                                        </div>
-                                                    </div>
+                                                <% } else if(auditor.status === auditConst.status.checking) { %>
+                                                <div class="timeline-item-icon bg-warning text-light">
+                                                    <i class="fa fa-ellipsis-h"></i>
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:22:01</span>
-                                            </div>
-                                            <div class="timeline-item-tail"></div>
-                                            <div class="timeline-item-icon bg-success text-light">
-                                                <i class="fa fa-check"></i>
-                                            </div>
-                                            <div class="timeline-item-content">
-                                                <div class="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">张三</span><span
-                                                                    class="pull-right text-success">审批通过</span></p>
-                                                            <p class="text-muted mb-0">总监理工程师</p>
-                                                        </div>
-                                                    </div>
-                                                    <!--审批意见-->
-                                                    <div class="card-body p-3 border-top">
-                                                        <div class="">
-                                                            这是审批意见文本，内容不算很长。
-                                                        </div>
-                                                    </div>
+                                                <% } else {%>
+                                                <div class="timeline-item-icon bg-secondary text-light">
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:22:01</span>
-                                            </div>
-                                            <div class="timeline-item-tail"></div>
-                                            <div class="timeline-item-icon bg-success text-light">
-                                                <i class="fa fa-check"></i>
-                                            </div>
-                                            <div class="timeline-item-content">
-                                                <div id="" class="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">王五</span><span
-                                                                    class="pull-right text-success">审批通过</span></p>
-                                                            <p class="text-muted mb-0">项目办总工</p>
+                                                <% } %>
+                                                <div class="timeline-item-content">
+                                                    <div class="card">
+                                                        <div class="card-body p-3">
+                                                            <div class="card-text">
+                                                                <p class="mb-1"><span
+                                                                        class="h5"><%- auditor.name %></span><span
+                                                                        class="pull-right <%- auditConst.statusClass[auditor.status] %>"><%- auditConst.statusString[auditor.status] %></span>
+                                                                </p>
+                                                                <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                            </div>
                                                         </div>
-                                                    </div>
-                                                    <!--审批意见-->
-                                                    <div class="card-body p-3 border-top">
-                                                        <div class="">
-                                                            这是审批意见文本，内容不算很长。
+                                                        <!--审批意见-->
+                                                        <% if (auditor.opinion) { %>
+                                                        <div class="card-body p-3 border-top">
+                                                            <p style="margin: 0;"><%- auditor.opinion %></p>
                                                         </div>
+                                                        <% } %>
                                                     </div>
                                                 </div>
-                                            </div>
-                                        </li>
-                                        <li class="timeline-list-item pb-2">
-                                            <div class="timeline-item-date">2020<span>06-01</span><span>13:22:01</span>
-                                            </div>
-                                            <!-- <div class="timeline-item-tail"></div> -->
-                                            <div class="timeline-item-icon bg-success text-light">
-                                                <i class="fa fa-check"></i>
-                                            </div>
-                                            <div class="timeline-item-content">
-                                                <div id="" class="card">
-                                                    <div class="card-body p-3">
-                                                        <div class="card-text">
-                                                            <p class="mb-1"><span class="h5">李四</span><span
-                                                                    class="pull-right text-success">审批通过</span></p>
-                                                            <p class="text-muted mb-0">项目办主任</p>
+                                            </li>
+                                            <% } else {%>
+                                            <li class="timeline-list-item pb-2">
+                                                <div class="timeline-item-date">
+                                                    <%- ctx.helper.formatDate(auditor.end_time) %>
+                                                </div>
+                                                <% if(index < auditors.length - 1) { %>
+                                                    <div class="timeline-item-tail"></div>
+                                                <% } %>
+                                                <% if(auditor.status === auditConst.status.checked) { %>
+                                                <div class="timeline-item-icon bg-success text-light">
+                                                    <i class="fa fa-check"></i>
+                                                </div>
+                                                <% } else if(auditor.status === auditConst.status.checkNo || auditor.status === auditConst.status.checkNoPre) {%>
+                                                <div class="timeline-item-icon bg-warning text-light">
+                                                    <i class="fa fa-level-up"></i>
+                                                </div>
+                                                <% } else if(auditor.status === auditConst.status.checking) { %>
+                                                <div class="timeline-item-icon bg-warning text-light">
+                                                    <i class="fa fa-ellipsis-h"></i>
+                                                </div>
+                                                <% } else { %>
+                                                <div class="timeline-item-icon bg-secondary text-light">
+                                                </div>
+                                                <% } %>
+                                                <div class="timeline-item-content">
+                                                    <div class="card">
+                                                        <div class="card-body p-3">
+                                                            <div class="card-text">
+                                                                <p class="mb-1"><span
+                                                                        class="h5"><%- auditor.name %></span>
+                                                                    <span
+                                                                        class="pull-right
+                                                                                    <%- auditConst.statusClass[auditor.status] %>"><%- auditor.status !== auditConst.status.uncheck ? auditConst.statusString[auditor.status] : ''%>
+                                                                        <%- auditor.status === auditConst.status.checkNo ? advance.user.name : '' %>
+                                                                        <%- auditor.status === auditConst.status.checkNoPre ? auditors[index-1].name : '' %>
+                                                                    </span>
+                                                                </p>
+                                                                <p class="text-muted mb-0"><%- auditor.role %></p>
+                                                            </div>
+                                                        </div>
+                                                        <!--审批意见-->
+                                                        <% if (auditor.opinion) { %>
+                                                        <div class="card-body p-3 border-top">
+                                                            <p style="margin: 0;"><%- auditor.opinion %></p>
                                                         </div>
+                                                        <% } %>
                                                     </div>
                                                 </div>
-                                            </div>
-                                        </li>
-                                    </ul>
+                                            </li>
+                                            <% } %>
+                                            <% }) %>
+                                        </ul>
+                                    </div>
+                                    <% }) %>
                                 </td>
                             </tr>
                         </tbody>
@@ -467,6 +359,18 @@
     const isEdited = JSON.parse('<%- isEdited %>');
     const advancePayTotal = parseInt('<%- advancePayTotal %>');
     const preUrl = '<%- preUrl %>';
+    $('#fold-btn').click(function() {
+        const type = $(this).data('target')
+        if (type === 'hide') {
+            $(this).data('target', 'show')
+            $('.fold-btn').slideUp();
+            $(this).text('展开历史记录流程')
+        } else {
+            $(this).data('target', 'hide')
+            $('.fold-btn').slideDown();
+            $(this).text('收起历史记录流程')
+        }
+    });
 </script>
 <% if(isEdited && ctx.session.sessionUser.accountId === ctx.advance.uid) { %>
 <script>

app/view/advance/index.ejs

@@ -29,7 +29,7 @@
                 </div>
             </div>
             <div>
-                <% if(!latestOrder || latestOrder.status === auditConst.status.checked) { %>
+                <% if(!latestOrder || (latestOrder.status === auditConst.status.checked && latestOrder.prev_total_amount < advancePayTotal)) { %>
                     <form action="<%- preUrl %>" method="POST">
                         <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                         <button type="submit" class="btn btn-primary btn-sm pull-right">开始新一期</button>

app/view/advance/modal_audit.ejs

@@ -57,7 +57,7 @@
                                                     <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                                 </h5>
                                                 <div class="ml-3">
-                                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].create_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                                 </div>
                                             </li>
                                             <li class="list-group-item">
@@ -107,7 +107,7 @@
                                         <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ctx.advance.auditors[0].begin_time) %></small> 上报</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ctx.advance.auditors[0].create_time) %></small> 上报</span>
                                     </div>
                                 </li>
                                 <% for (let iA = 0; iA < ctx.advance.auditors.length; iA++) { %>
@@ -198,7 +198,7 @@
                                                     <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                                 </h5>
                                                 <div class="ml-3">
-                                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].create_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                                 </div>
                                             </li>
                                             <li class="list-group-item">
@@ -248,7 +248,7 @@
                                         <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                     </h5>
                                     <div class="ml-3">
-                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ctx.advance.auditors[0].begin_time) %></small> 上报</span>
+                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ctx.advance.auditors[0].create_time) %></small> 上报</span>
                                     </div>
                                 </li>
                                 <% for (let iA = 0; iA < ctx.advance.auditors.length; iA++) { %>
@@ -363,7 +363,7 @@
                                             <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                         </h5>
                                         <div class="ml-3">
-                                            <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                            <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].create_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                         </div>
                                     </li>
                                     <li class="list-group-item">
@@ -417,7 +417,7 @@
                                             <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                         </h5>
                                         <div class="ml-3">
-                                            <span class="text-success"><small><%- ctx.helper.formatFullDate(auditors[iA].begin_time) %></small> <% if (ctx.advance.times > 1) { %>重新<% } %>上报</span>
+                                            <span class="text-success"><small><%- ctx.helper.formatFullDate(auditors[iA].create_time) %></small> <% if (ctx.advance.times > 1) { %>重新<% } %>上报</span>
                                         </div>
                                     </li>
                                     <li class="list-group-item">
@@ -509,7 +509,7 @@
                                                 <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                             </h5>
                                             <div class="ml-3">
-                                                <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].create_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                             </div>
                                         </li>
                                         <li class="list-group-item">
@@ -562,7 +562,7 @@
                                     <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                 </h5>
                                 <div class="ml-3">
-                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(auditors[iA].begin_time) %></small> <% if (ctx.advance.times > 1) { %>重新<% } %>上报</span>
+                                    <span class="text-success"><small><%- ctx.helper.formatFullDate(auditors[iA].create_time) %></small> <% if (ctx.advance.times > 1) { %>重新<% } %>上报</span>
                                 </div>
                             </li>
                             <li class="list-group-item">
@@ -652,7 +652,7 @@
                                                 <i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span>
                                             </h5>
                                             <div class="ml-3">
-                                                <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].create_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                             </div>
                                         </li>
                                         <li class="list-group-item">
@@ -704,7 +704,7 @@
         </div>
     </div>
     </div>
-    <% if (ctx.session.sessionUser.accountId === ctx.advance.user_id) { %>
+    <% if (ctx.session.sessionUser.accountId === ctx.advance.uid) { %>
     <!--重新上报-->
     <div class="modal fade" id="sp-list2" data-backdrop="static">
         <div class="modal-dialog modal-lg" role="document">
@@ -715,7 +715,7 @@
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-4 modal-height-500" style="overflow: auto">
-                            <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" id="hideSp">修改审批流程</a>
+                            <!-- <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" id="hideSp">修改审批流程</a> -->
                             <div class="card mt-3">
                                 <ul class="list-group list-group-flush">
                                     <li class="list-group-item">
@@ -745,7 +745,7 @@
                                                 <li class="list-group-item">
                                                     <h5 class="card-title"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> <%- ctx.advance.user.name %> <small class="text-muted"><%- ctx.advance.user.role %></small><span class="pull-right">原报</span></h5>
                                                     <div class="ml-3">
-                                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].begin_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
+                                                        <span class="text-success"><small><%- ctx.helper.formatFullDate(ah[iA].create_time) %></small> <% if (ctx.advance.auditHistory.indexOf(ah) > 0) { %>重新<% } %>上报</span>
                                                         <p class="card-text"></p>
                                                     </div>
 
@@ -820,7 +820,7 @@
                         </div>
                     </div>
                 </div>
-                <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return checkAuditorFrom()">
+                <form class="modal-footer" method="post" action="<%- preUrl %>/audit/start" onsubmit="return start()">
                     <input type="hidden" name="_csrf" value="<%= ctx.csrf %>">
                     <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
                     <button class="btn btn-primary btn-sm" type="submit">确认上报</button>
@@ -854,4 +854,22 @@
         }
         return false;
     }
+
+    function start() {
+        const pay_ratio = parseInt($(`.pay-input[data-type=0]`).val())
+        const cur_amount = parseInt($(`.pay-input[data-type=1]`).val())
+        if (!pay_ratio || !cur_amount) {
+            toastr.error('请填写本期金额!')
+            return false
+        }
+        const prev_amount = prevAdvance && prevAdvance.prev_total_amount || 0
+        const prev_total_amount = ZhCalc.add(cur_amount, prev_amount)
+        const remark = $('#ad-remark').val() || null
+        const data = {pay_ratio, cur_amount, prev_amount, prev_total_amount, remark, status: auditConst.status.checking}
+        postData('<%- preUrl %>/audit/start', data, (data) => {
+            window.location.reload()
+        }, () => {
+            window.location.reload()
+        })
+    }
 </script>