From 3c8e608ccfa604c731a840edaf9c1f7b53a7736b Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Fri, 20 Dec 2024 12:53:48 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=86=8C=EB=A1=9D=20=EC=97=91?= =?UTF-8?q?=EC=85=80=20upload=20=ED=9B=84=20=EB=8B=AB=EA=B8=B0=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp | 5 +++-- .../webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp | 2 +- .../jsp/web/msgdata/include/msgDataIncludeExcel.jsp | 1 - src/main/webapp/js/MJUtill.js | 10 ++++++---- src/main/webapp/js/web/addr/event.js | 5 +++++ 5 files changed, 15 insertions(+), 8 deletions(-) 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 0e079e8e..a6d05299 100644 --- a/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/addr/AddrList.jsp @@ -141,7 +141,7 @@ function insertAddrAjax() { alert("해당 그룹에 중복된 번호가 있습니다."); return; } - //alert("저장 되었습니다."); + alert("저장 되었습니다."); listAddrGrp(); addrGroupLoadAjax(); @@ -275,7 +275,6 @@ $(document).on('click', '#btnAddrMassClose', function() { // 대량등록 닫기 function setAddrMassClose() { - $('#btnAddrMassClose').click(); var $objTabul = fn_utils_getTabulator(); $objTabul.clearData(); @@ -300,6 +299,8 @@ function setAddrMassClose() { addrGroupLoadAjax(); addrLoadAjax(); fn_errorPopClean(); // 에러 팝업 초기화 + + closeTooltip(); } // 주소록 탭마다 돌면서 총, 중복, 오류 건수 초기화 diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp index 7a81e699..cd7315a5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/addr/FaxAddrList.jsp @@ -122,7 +122,7 @@ function insertAddrAjax() { alert("해당 그룹에 중복된 번호가 있습니다."); return; } - //alert("저장 되었습니다."); + alert("저장 되었습니다."); listAddrGrp(); addrGroupLoadAjax(); diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp index bbc91221..b62125ff 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/include/msgDataIncludeExcel.jsp @@ -691,7 +691,6 @@ $(document).on('click', '#errorExcelBtn', function() { }); - diff --git a/src/main/webapp/js/MJUtill.js b/src/main/webapp/js/MJUtill.js index 504b3aef..72c4caef 100644 --- a/src/main/webapp/js/MJUtill.js +++ b/src/main/webapp/js/MJUtill.js @@ -375,7 +375,7 @@ function replTotalPriceSum(msg_short, msg_long, totRows){ $('.nowMsgCnt').text(numberWithCommas(msgCnt.toFixed())); //변환문자 건수 내용 표기 - totalCntTxt = "그림 : " + totRows + " 건";; + totalCntTxt = "그림 : " + numberWithCommas(totRows) + " 건";; }else{ @@ -391,7 +391,7 @@ function replTotalPriceSum(msg_short, msg_long, totRows){ $('#eachPrice').val(numberWithCommas(longPrice)); //변환문자 건수 내용 표기 - totalCntTxt = "장문 : " + msg_long + " 건"; + totalCntTxt = "장문 : " + numberWithCommas(msg_long) + " 건"; //변환장문 건수 Hidden 폼에 넣어주기 $('#longMsgCnt').val(msg_long); @@ -417,12 +417,12 @@ function replTotalPriceSum(msg_short, msg_long, totRows){ if(msg_long > 0){ //변환문자 건수 내용 표기 - totalCntTxt = totalCntTxt + "/ 단문 : " + msg_short + " 건"; + totalCntTxt = totalCntTxt + "/ 단문 : " + numberWithCommas(msg_short) + " 건"; }else{ //변환문자 건수 내용 표기 - totalCntTxt = "단문 : " + msg_short + " 건"; + totalCntTxt = "단문 : " + numberWithCommas(msg_short) + " 건"; } @@ -1091,3 +1091,5 @@ function setRowDupCnt(cnt){ $('#rowDupCnt').text(cnt) } + + diff --git a/src/main/webapp/js/web/addr/event.js b/src/main/webapp/js/web/addr/event.js index f298fd9b..83e39e46 100644 --- a/src/main/webapp/js/web/addr/event.js +++ b/src/main/webapp/js/web/addr/event.js @@ -450,4 +450,9 @@ function resetTableFieldsToDefault() { } +function closeTooltip(){ + $('.adr_popup01').hide(); + $('.mask').removeClass('on'); + $('body').removeAttr('style'); +}