From 126d2b0f83141f4ab895466d95a32d48f0220aa2 Mon Sep 17 00:00:00 2001 From: Jeon Date: Tue, 11 Jul 2023 14:36:37 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B2=AD=EA=B5=AC=20=EB=B9=84=EA=B5=90=20?= =?UTF-8?q?=EA=B8=88=EC=95=A1=20=EA=B3=84=EC=82=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calculate/service/mock/verificationExcelHeader.json | 2 +- frontend/src/modules/calculate/views/Verification.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json b/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json index c2e7271..fc1bcff 100644 --- a/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json +++ b/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json @@ -97,7 +97,7 @@ }, { "key": "rsltStr" - ,"name": "일치여부" + ,"name": "이월 일치여부" }, { "key": "fxLmtAmt" diff --git a/frontend/src/modules/calculate/views/Verification.vue b/frontend/src/modules/calculate/views/Verification.vue index e96a389..9f31f06 100644 --- a/frontend/src/modules/calculate/views/Verification.vue +++ b/frontend/src/modules/calculate/views/Verification.vue @@ -87,7 +87,7 @@ 일할 정액요금 신규 이월금액 예상 이월금액 - 일치여부 + 이월 일치여부 정액요금 이월금액 소멸금액 @@ -266,7 +266,7 @@ export default { item.billAmt = 0; } - item.calUseAmt = (Number(item.lmtPerUseDay)+Number(item.mrtUseAmt)); + item.calUseAmt = (Number(item.lmtPerUseDay)+Number(item.mrtUseAmt.replaceAll(",",""))); item.calUseAmt = item.calUseAmt - (item.calUseAmt*(Number(item.discount)/100)); item.calUseAmt = Math.floor(item.calUseAmt/10) * 10; @@ -274,6 +274,7 @@ export default { if(item.calUseAmt == item.billAmt){ item.billRslt = "일치"; } + return {...item}; });