Kaynağa Gözat

fix: 预付款当前期截止上期金额不应改变

lanjianrong 5 yıl önce
ebeveyn
işleme
7eda4447b7

+ 1 - 2
app/controller/advance_controller.js

@@ -144,10 +144,9 @@ module.exports = app => {
                 // 最大支付比例
                 const max_pr = ctx.helper.mul(ctx.helper.div(ctx.helper.sub(advancePayTotal, (prevAdvance && prevAdvance.prev_total_amount || 0)), advancePayTotal, 10), 100);
                 // 特殊处理金额的显示(formatMoney)
-                let s1 = parseFloat(ctx.advance.prev_amount).toString().split('.')[1];
+                const s1 = parseFloat(ctx.advance.prev_amount).toString().split('.')[1];
                 let s2 = parseFloat(ctx.advance.prev_total_amount).toString().split('.')[1];
                 if (isEdited) {
-                    s1 = parseFloat(ctx.advance.prev_amount.toFixed(this.decimal)).toString().split('.')[1];
                     s2 = parseFloat(ctx.advance.prev_total_amount.toFixed(this.decimal)).toString().split('.')[1];
                 }
                 const prev_amount = ctx.helper.formatMoney(ctx.advance.prev_amount, ',', s1 && s1.length || 0);

+ 1 - 1
app/service/advance.js

@@ -38,7 +38,7 @@ module.exports = app => {
                 item.pay_ratio = this.ctx.helper.mul(this.ctx.helper.div(item.cur_amount, advancePayTotal), 100, 2) || 0;
                 if (item.status === auditConst.status.uncheck || item.status === auditConst.status.checkNo) {
                     const s1 = item.cur_amount && parseFloat(item.cur_amount.toFixed(decimal)).toString().split('.')[1];
-                    const s2 = parseFloat(item.prev_amount.toFixed(decimal)).toString().split('.')[1];
+                    const s2 = parseFloat(item.prev_amount).toString().split('.')[1];
                     const s3 = parseFloat(item.prev_total_amount.toFixed(decimal)).toString().split('.')[1];
                     item.cur_amount = this.ctx.helper.formatMoney(item.cur_amount, ',', s1 && s1.length || 0);
                     item.prev_amount = this.ctx.helper.formatMoney(item.prev_amount, ',', s2 && s2.length || 0);