From c6cb5e9e5aca3b94bba1125b68cf18d6e866d00c Mon Sep 17 00:00:00 2001 From: dufrl Date: Wed, 17 Aug 2022 16:22:18 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=8B=A0=EB=B2=88=ED=98=B8=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sendNumMgt/components/NumberDetailPop.vue | 20 +++------ .../sendNumMgt/components/NumberRegPop.vue | 44 +++++++++++++------ .../ez/api/sendNumMgt/SendNumMgtService.java | 2 +- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/frontend/src/modules/sendNumMgt/components/NumberDetailPop.vue b/frontend/src/modules/sendNumMgt/components/NumberDetailPop.vue index 11c8250..28950d3 100644 --- a/frontend/src/modules/sendNumMgt/components/NumberDetailPop.vue +++ b/frontend/src/modules/sendNumMgt/components/NumberDetailPop.vue @@ -57,7 +57,7 @@ 제출서류
-

{{ item.docTitle }} ({{ formatFileSize(item.fileSize) }})

+

{{ item.docTitle }}

파일형식 : jpg, png, pdf, tiff (최대 5MB)

@@ -66,8 +66,8 @@ 사업자등록증
-

{{ item.docTitle }} ({{ formatFileSize(item.fileSize) }})

-

{{ item.docTitle }} ({{ formatFileSize(item.fileSize) }})

+

{{ item.docTitle }}

+

{{ item.docTitle }}

파일형식 : jpg, png, pdf, tiff (최대 5MB)

@@ -76,8 +76,8 @@ 본인 확인
-

{{ item.docTitle }} ({{ formatFileSize(item.fileSize) }})

-

{{ item.docTitle }} ({{ formatFileSize(item.fileSize) }})

+

{{ item.docTitle }}

+

{{ item.docTitle }}

파일형식 : jpg, png, pdf, tiff (최대 5MB)

@@ -136,15 +136,7 @@ export default { }, methods :{ - formatFileSize(bytes,decimalPoint) { - if(bytes == 0) return '0 Bytes'; - var k = 1000, - dm = decimalPoint || 2, - sizes = ['Bytes', 'KB', 'MB'], - i = Math.floor(Math.log(bytes) / Math.log(k)); - return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i]; - }, - + // 모달 띄우기 numberDetailPopOpen(props){ diff --git a/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue b/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue index 4335263..face291 100644 --- a/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue +++ b/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue @@ -99,7 +99,7 @@
-

통신서비스 이용증명원

+

*통신서비스 이용증명원

발신번호의 통신서비스 이용증명원

@@ -247,6 +247,21 @@ export default { this.formReset(); }, methods: { + + returnFileSize(number, event) { + if (number === 0){ + this.row.title = '발신번호 등록'; + this.row.msg1 = '첨부파일을 확인해 주세요'; + // this.getParent('NumberList').commonModalOpen(this.row) + this.$parent.$refs.commmonModal.alertModalOpen(this.row); + event.target.files[0] = ''; + return false; + } + if(number > 1) { + return (number/1048576).toFixed(2) + 'MB'; + } + }, + searchIdPop() { this.$refs.admnListPop.adminNmPopOpen(); }, @@ -335,7 +350,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('delegationNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.delegationFile = file; } @@ -366,7 +381,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('attorneyNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.attorneyFile = file; } @@ -398,7 +413,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('corporateCertificateNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size , event) + ')'}`; root.appendChild(button); this.corporateCertificateFile = file; } @@ -430,7 +445,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('delegatedBusinessNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.delegatedBusinessFile = file; } @@ -462,7 +477,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('authorizedBusinessNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size , event) + ')'}`; root.appendChild(button); this.authorizedBusinessFile = file; } @@ -494,7 +509,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('delegateCertificateNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.delegateCertificateFile = file; } @@ -526,7 +541,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('delegatedIdentificationNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.delegatedIdentificationFile = file; } @@ -558,7 +573,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('tenureNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.tenureFile = file; } @@ -589,7 +604,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('businessNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.businessFile = file; } @@ -620,7 +635,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('identificationCardNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.identificationCardFile = file; } @@ -651,7 +666,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('identificationEvidenceNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.identificationEvidenceFile = file; } @@ -684,8 +699,9 @@ export default { }) button.innerText = 'X' const root = document.getElementById('communicationNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); + //root.appendChild( `${this.returnFileSize(file.size)}`); this.communicationFile = file; } }, @@ -715,7 +731,7 @@ export default { }) button.innerText = 'X' const root = document.getElementById('otherBusinessNm'); - root.appendChild(text); + root.textContent = `${file.name} ${ '('+ this.returnFileSize(file.size, event) + ')'}`; root.appendChild(button); this.otherBusinessFile = file; } diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java index 4cbc4b0..ac981a0 100644 --- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java +++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java @@ -379,7 +379,7 @@ public class SendNumMgtService { // DOC FILE UPLOAD. String ext = FileIoUtils.getExtension(multipartFiles.get(j).getOriginalFilename()); // File Nm : [reg_req_no]_[doc_no]_[doc_tp_cd].확장자 - String fileNm = regReqNo + "_" + docTpCd.get(j).substring(1,2) + "_" + docTpCd.get(j) + "." + ext; + String fileNm = regReqNo + "_" + ("" + Integer.parseInt(docTpCd.get(j))) + "_" + docTpCd.get(j) + "." + ext; String titleNm = multipartFiles.get(j).getOriginalFilename(); long fileSize = multipartFiles.get(j).getSize();