diff --git a/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json b/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json index c16b278..7cf8e59 100644 --- a/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json +++ b/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json @@ -63,11 +63,11 @@ }, { "name": "결과" - ,"colspan": 5 + ,"colspan": 6 }, { "name": "이전 달", - "colspan": 9 + "colspan": 8 }, { "name": "사용금액" @@ -85,6 +85,11 @@ ,"name": "일할 정액요금" ,"format": "Format_00" }, + { + "key": "extncAmt" + ,"name": "소멸금액" + ,"format": "Format_00" + }, { "key": "nowCfwdAmt" ,"name": "신규 이월금액" @@ -109,11 +114,6 @@ ,"name": "이월금액" ,"format": "Format_00" }, - { - "key": "extncAmt" - ,"name": "소멸금액" - ,"format": "Format_00" - }, { "key": "extcChrgAmt" ,"name": "소멸충전금액" diff --git a/frontend/src/modules/calculate/views/Verification.vue b/frontend/src/modules/calculate/views/Verification.vue index ab2b909..c66d510 100644 --- a/frontend/src/modules/calculate/views/Verification.vue +++ b/frontend/src/modules/calculate/views/Verification.vue @@ -83,19 +83,19 @@ 일할대상 상태 성공건수 - 결과 - 이전 달 + 결과 + 이전 달 사용금액 과금금액 일할 정액요금 + 소멸금액 신규 이월금액 예상 이월금액 이월 일치여부 정액요금 이월금액 - 소멸금액 소멸충전금액 이월충전금액 소멸충전복원 @@ -125,12 +125,12 @@ {{item.succCnt}} {{item.mrtUseAmt}} {{item.lmtPerUseDay}} + {{item.extncAmt}} {{item.nowCfwdAmt}} {{item.estCfwdAmt}} {{item.rsltStr}} {{item.fxLmtAmt}} {{item.cfwdAmt}} - {{item.extncAmt}} {{item.extcChrgAmt}} {{item.cfwdChrgAmt}} {{item.extcChrgRsrt}}