diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp index 089f3a82..e17439f1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp @@ -28,6 +28,16 @@ $(document).ready(function(){ // addrMassTab(1); // 중복 휴대폰번호 버튼 노출여부 + + + // excel 오류정보 테스트 + $('#errorExcelBtn').click(function(){ + if($tableError.getDataCount()<1){ + alert('오류 정보가 없습니다.'); + return false; + } + $tableError.download("xlsx", "error_data.xlsx"); + }); }); // 메인 화면 좌측메뉴 최신화 @@ -213,7 +223,8 @@ function setAddrMassClose() { //location.reload(); listAddrGrp(); addrGroupLoadAjax(); - addrLoadAjax(); + addrLoadAjax(); + errorPopClean(); // 에러 팝업 초기화 } // 주소록 그룹 중복체크 @@ -651,6 +662,7 @@ function fn_tabToggle(tabNum){
+
@@ -694,6 +706,39 @@ function fn_tabToggle(tabNum){
+ + + + +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp index 69789caf..94ae5456 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/include/addrListforExcel.jsp @@ -314,6 +314,7 @@ $(document).on('drop', function (e){ //파일 드래그앤드롭 종료 function excelFileChange(file) { + errorPopClean(); // 에러 popup 초기화 if (file) { fn_loadAddActive(); var reader = new FileReader(); @@ -495,6 +496,7 @@ $(document).on("click", "#duplicationChkAll", function(e) { } */ +
@@ -549,13 +551,17 @@ $(document).on("click", "#duplicationChkAll", function(e) {

- 총 0건 / 중복 0건 + 총 0건 + / 중복 0건 + / 오류 0건 + +

+   - + -

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index a80e44a7..b95842f3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -7,6 +7,8 @@ + + <% pageContext.setAttribute("newLineChar", "\r\n"); %>