diff --git a/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json b/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json
index fc1bcff..c16b278 100644
--- a/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json
+++ b/frontend/src/modules/calculate/service/mock/verificationExcelHeader.json
@@ -3,7 +3,7 @@
[
{
"key": "discount"
- ,"name": "할인율"
+ ,"name": "할인율(%)"
,"rowspan": 2
},
{
@@ -13,7 +13,7 @@
},
{
"key": "calUseAmt"
- ,"name": "청구금액 계산"
+ ,"name": "계산된 청구금액"
,"rowspan": 2
},
{
diff --git a/frontend/src/modules/calculate/views/Verification.vue b/frontend/src/modules/calculate/views/Verification.vue
index 9f31f06..ab2b909 100644
--- a/frontend/src/modules/calculate/views/Verification.vue
+++ b/frontend/src/modules/calculate/views/Verification.vue
@@ -28,7 +28,8 @@
총 {{totalCnt}}건
-
+
+
@@ -38,7 +39,9 @@
-
+
+
+
@@ -68,8 +71,10 @@
- | 할인율 |
- 유큐브 청구금액 |
+ 할인율(%) |
+ 유큐브 청구금액 |
+ 계산된 청구금액 |
+ 청구금액 일치여부 |
고객사 |
사업자번호 |
유큐브등록번호 |
@@ -108,6 +113,8 @@
|
|
+ {{item.calUseAmt}} |
+ {{item.billRslt}} |
{{item.custNm}} |
{{item.bizrno}} |
{{item.entrNo}} |
@@ -175,7 +182,8 @@ export default {
pageType: 'VERIFICATION',
totalCnt : 0,
noDataStr: '검색 결과가 없습니다.',
- excelHeader: []
+ excelHeader: [],
+ excelDownAble:false
};
},
components: {
@@ -194,7 +202,7 @@ export default {
},
methods: {
async verification() {
-
+ this.excelDownAble = false;
this.params = {
lmtYm: moment(this.lmtYm).format('YYYYMM')
}
@@ -236,11 +244,7 @@ export default {
this.excelHeader = res;
});
},
- async excuteVerification() {
-
- let today = moment().format('YYYYMMDDHHmmss');
- const saveFileName = `청구 검증_${today}.xls`;
-
+ excuteVerification() {
if (this.list.length <= 0) {
this.row.title = '청구 검증 실행';
this.row.msg1 = '조회된 데이터가 없습니다.';
@@ -256,7 +260,7 @@ export default {
return false;
}
- const data = this.list.map((item,index) => {
+ this.list = this.list.map((item,index) => {
if(item.discount.trim() == undefined || item.discount.trim() == null || item.discount.trim() == "" || item.discount.trim().toLowerCase() == "e"){
item.discount = 0;
@@ -274,17 +278,30 @@ export default {
if(item.calUseAmt == item.billAmt){
item.billRslt = "일치";
}
-
- return {...item};
+ return {...item}
});
+
+ this.excelDownAble = true;
+ },
+
+ async verificationExcel() {
+ let today = moment().format('YYYYMMDDHHmmss');
+ const saveFileName = `청구 검증_${today}.xls`;
+
+ if (!this.excelDownAble) {
+ this.row.title = '청구 검증 엑셀 다운로드';
+ this.row.msg1 = '청구 검증을 먼저 실행해 주세요.';
+ this.$refs.commmonModal.alertModalOpen(this.row);
+ return false;
+ }
let options = {
header: this.excelHeader,
dataOrder: 'header',
};
- xlsx.export(data, saveFileName, options).then(() => {});
- },
+ xlsx.export(this.list, saveFileName, options).then(() => {});
+ }
},
};