fix: 修复预付款详情页计算数值异常的bug

app/controller/advance_controller.js

@@ -114,6 +114,7 @@ module.exports = app => {
                 const { status } = ctx.advance;
                 // 获取上一期预付款记录
                 const prevAdvance = await ctx.service.advance.getPreviousRecord(ctx.tender.id, ctx.advance.type);
+                console.log('prevAdvance', prevAdvance);
                 renderData.isEdited = status === uncheck || status === checkNo;
                 renderData.advance = ctx.advance;
                 renderData.advancePayTotal = advancePayTotal;

app/public/js/advance_audit.js

@@ -120,7 +120,7 @@ $(document).ready(function () {
 
     // 自动转换支付比例和本期金额
     $('.pay-input').on('input propertychange', function(e) {
-        let val = e.target.value
+        let val = parseInt(e.target.value)
         const p_amount = prevAdvance && prevAdvance.prev_total_amount || 0 // 截止本期金额
         const re_amount = ZhCalc.sub(advancePayTotal, p_amount)
         const min = parseInt($(this).attr('min'))

app/service/advance.js

@@ -95,6 +95,10 @@ module.exports = app => {
                 value: type,
                 operate: '=',
             });
+            this.sqlBuilder.setAndWhere('order', {
+                value: this.ctx.advance.order - 1,
+                operate: '=',
+            });
             this.sqlBuilder.orderBy = [['order', 'desc']];
             const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
             return await this.db.queryOne(sql, sqlParam);

app/view/advance/detail.ejs

@@ -64,11 +64,11 @@
                             <tr>
                                 <th>截止上期</th>
                                 <td class="text-right">
-                                    <h5><%- ctx.helper.formatMoney(advance.prev_amount) %></h5>
+                                    <h5><%- ctx.helper.formatMoney(prevAdvance.prev_total_amount) %></h5>
                                 </td>
                                 <th>截止本期金额</th>
                                 <td class="text-right">
-                                    <h5 id="p_total"><%- ctx.helper.formatMoney(advance.prev_total_amount) %></h5>
+                                    <h5 id="p_total"><%- ctx.helper.formatMoney(prevAdvance.prev_total_amount + advance.cur_amount) %></h5>
                                 </td>
                             </tr>
                             <tr>