Преглед на файлове

fix: 修复预付款当前期修改了预付款总额截至本期金额计算不正确的bug

lanjianrong преди 4 години
родител
ревизия
5d4c7fa89c
променени са 1 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 3 3
      app/view/advance/detail.ejs

+ 3 - 3
app/view/advance/detail.ejs

@@ -34,7 +34,7 @@
                                 <td class="text-right" width="405">
                                     <div class="input-group input-group-sm">
                                         <input type="number" class="pay-input form-control nospin text-right"
-                                            max="<%- max_pr %>" min="1" placeholder="请填写支付比例,将自动计算本期金额" data-type="0"
+                                            max="<%- max_pr %>" min="1" step="0.01" placeholder="请填写支付比例,将自动计算本期金额" data-type="0"
                                             value="<%- advance.status === auditConst.status.uncheck || advance.status === auditConst.status.checkNo ? advance.pay_ratio : (advance.cur_amount && ctx.helper.mul(ctx.helper.div(advance.cur_amount, advancePayTotal), 100, 2) || 0) %>">
                                         <div class="input-group-append"><span class="input-group-text">%</span></div>
                                     </div>
@@ -44,7 +44,7 @@
                                     <div class="input-group input-group-sm">
                                         <input type="number" class="pay-input form-control nospin text-right" min="1"
                                             placeholder="请填写本期金额,将自动计算支付比例" data-type="1"
-                                            value="<%- advance.status === auditConst.status.uncheck || advance.status === auditConst.status.checkNo ? ctx.helper.mul(advancePayTotal, ctx.helper.div(advance.pay_ratio, 100, decimal), decimal) : (advance.cur_amount && advance.cur_amount.toFixed(decimal)) %>">
+                                            value="<%- advance.status === auditConst.status.uncheck || advance.status === auditConst.status.checkNo ? ctx.helper.mul(advancePayTotal, ctx.helper.div(advance.pay_ratio, 100)).toFixed(decimal) : (advance.cur_amount && advance.cur_amount.toFixed(decimal)) %>">
                                         <div class="input-group-append"><span class="input-group-text">元</span></div>
                                     </div>
                                 </td>
@@ -68,7 +68,7 @@
                                 </td>
                                 <th class="text-center">截止本期金额</th>
                                 <td class="text-right" id="p_total2" width="405">
-                                    <%- ctx.helper.formatMoney((prevAdvance && prevAdvance.prev_total_amount + advance.cur_amount || (advance.cur_amount || 0)), ',', decimal) %>元
+                                    <%- ctx.helper.formatMoney(advance.status === auditConst.status.uncheck || advance.status === auditConst.status.checkNo ? ctx.helper.add(ctx.helper.mul(advancePayTotal, ctx.helper.div(advance.pay_ratio, 100, decimal), decimal), (prevAdvance && prevAdvance.prev_total_amount || 0)) : (prevAdvance && prevAdvance.prev_total_amount + advance.cur_amount || (advance.cur_amount || 0)), ',', decimal) %>元
                                 </td>
                             </tr>
                             <tr>