From c956288f9a60b91244f40d6ac7a6520140100f97 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Fri, 13 Oct 2023 14:39:16 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B8=B0=EC=97=85=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EC=A0=84=ED=99=98=20=EC=9E=AC=EC=9A=94=EC=B2=AD=EC=8B=9C=20?= =?UTF-8?q?=EA=B8=B0=EC=97=85=EB=AA=85,=20=EB=8C=80=ED=91=9C=EB=AA=85,=20?= =?UTF-8?q?=EC=82=AC=EC=97=85=EC=9E=90=EB=93=B1=EB=A1=9D=EB=B2=88=ED=98=B8?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=EC=9E=85=EB=A0=A5=20=EB=90=98=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=20=EC=B2=98=EB=A6=AC=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=EB=B0=9C=EC=86=A1=20=ED=99=94=EB=A9=B4=20=EC=98=88?= =?UTF-8?q?=EC=95=BD=20=EB=B6=84=ED=95=A0=EB=B0=9C=EC=86=A1=20=EA=B1=B4?= =?UTF-8?q?=EC=88=98=20=EC=9E=85=EB=A0=A5=EB=B0=A9=EC=8B=9D=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml | 9 ++ .../cmm/uss/umt/EgovMberCmpHstListByType.jsp | 11 ++- .../jsp/web/msgdata/MsgDataSMLView.jsp | 22 ++++- .../jsp/web/user/membershipChangeReturn.jsp | 95 ++++++++++++++++++- 4 files changed, 127 insertions(+), 10 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml index 193a45e1..96a4c4ea 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml @@ -201,6 +201,15 @@ UPDATE LETTNGNRLMBER SET MBER_STTUS = #mberSttus# , DEPT = #dept# + + , MBER_NM = #mberNm# + + + , CEO_NM = #ceoNm# + + + , BIZ_NO = #bizNo# + , ATCH_FILE_ID = #atchFileId# diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp index 3b3e5a39..5b8cef27 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp @@ -109,7 +109,7 @@ function biznoPop(p_bizno) { // 기업회원 신청 승인/반려 처리 -function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum) { +function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum, mberNm, ceoNm, bizNo) { var sMsg = ""; if (hstSttus == "02") { sMsg = "승인"; @@ -128,7 +128,9 @@ function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, if(hstType == '02' && hstSttus == '02'){ //기업회원 전환 승인이라면 기존 mberNm -> managerNm 으로 수정 $("#managerNm").val(managerNm); } - + $("#mberNm").val(mberNm); + $("#ceoNm").val(ceoNm); + $("#bizNo").val(bizNo); var form = document.listForm; @@ -326,6 +328,9 @@ function fnSetCalMonth(val) { + + + @@ -546,7 +551,7 @@ function fnSetCalMonth(val) { - + <%-- --%> 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 cd6b91b3..8e01e3b5 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3171,6 +3171,23 @@ $(".btn_event_cash").off().on("click", function(){ } }); +function checkNumber(event) { + var divideCnt = $('#divideCnt').val(); + if(!(event.key >= 0 && event.key <= 9)) { + return false; + } + + var totCnt = divideCnt + "" + event.key; + if(Number(totCnt) > 5000){ + + alert("분할전송 건수는 5,000건을 초과할 수 없습니다."); + return false; + + } + + return true; +} +
@@ -4007,12 +4024,13 @@ $(".btn_event_cash").off().on("click", function(){
- + - + <%-- - + --%> @@ -123,13 +203,15 @@ function changeValueWork(obj){
회사명
- + <%-- --%> +
대표
- + <%-- --%> +
@@ -143,7 +225,10 @@ function changeValueWork(obj){
사업자등록번호
- -- + +
+ +
From f8d9b1898df36d978a3b05848c995862acd24fc8 Mon Sep 17 00:00:00 2001 From: itn Date: Fri, 13 Oct 2023 15:04:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20=EC=BD=98=EC=86=94=EB=A1=9C=EA=B7=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 39 +++++++++++++++++-- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index 0bfc2d82..1a11febb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -33,21 +33,38 @@ $(document).ready(function() { var evntPopCk = fnGetCookie('layer_evntPayPop'); var pointPopCk = fnGetCookie('layer_pointPop'); + console.log("# 팝업 레이어 : START"); + console.log("layer_evntPayPop : " + evntPopCk); + console.log("layer_pointPop : " + pointPopCk); + if(evntPopCk != null && pointPopCk != null){//팝업 쿠키가 모두 있는 경우 안보여준다. + console.log("eventLayerPop : STEP 1. 이벤트 팝업 쿠키가 모두 있는 경우 안보여준다."); + $(".eventLayerPop").css("display","none"); + $(".eventLayerPop").hide(); }else if(evntPopCk == null && pointPopCk == null){// 이벤트 팝업 쿠키가 모두 없으면 팝업 보여주기 + console.log("eventLayerPop : STEP 2. 이벤트 팝업 쿠키가 모두 없으면 팝업 보여주기."); + $(".eventLayerPop").css("display","block"); + $(".eventLayerPop").show(); }else if(evntPopCk != null || pointPopCk != null){ + console.log("eventLayerPop : STEP 3. 이벤트 팝업 쿠키가 하나라도 있으면 보여주기"); $(".eventLayerPop").css("display", "block"); + $(".eventLayerPop").show(); if (fnGetCookie('layer_evntPayPop') != null) { //첫결제 이벤트 쿠키가 없으면 보여주기 + console.log("이벤트 쿠키 있음 : HIDE"); + $('.payEventPop').css("display","none"); + $('.payEventPop').hide(); } if (fnGetCookie('layer_pointPop') != null) { //포인트 안내 팝업, 3일 안보기 체크 - $('.pointPop').css("display","none"); - } + console.log("포인트 쿠키 있음 : HIDE"); + $('.pointPop').css("display","none"); + $('.pointPop').hide(); + } } //레이어 팝업이 하나도 없으면 배경도 안보이도록 처리 @@ -268,17 +285,27 @@ $(document).ready(function() { eventYn = true; + console.log(""); + console.log("이벤트 팝업 호출 처리"); + console.log("payCount : " + payCount); + console.log("eventYn : " + eventYn); + console.log("blineCode : " + blineCode); + if(payCount < 1 && eventYn && blineCode == 'N'){//결제내역이 하나도 없고, 이벤트가 진행중이면 팝업 호출 + console.log("이벤트 팝업 함수 CALL"); remoteEventPayPop(payCount); }else{//이벤트 대상자가 아니면 첫결제 이벤트 팝업은 안보여준다. - + console.log("이벤트 팝업 : HIDE"); + $('.payEventPop').css("display","none"); + $('.payEventPop').hide(); if($(".layer_popup:visible").length == 0){ $(".layer_popup_wrap").hide(); } } + console.log("# 팝업 레이어 : END"); }); function leadingZeros(n, digits) { @@ -950,9 +977,15 @@ function popScrCloseSetting(){ //이벤트 팝업 호출 function remoteEventPayPop(payCount) { if (fnGetCookie('layer_evntPayPop') != null) { //첫결제 이벤트 팝업 3일 안보기 체크 + console.log("이벤트 쿠키 있음 : HIDE"); + $('.payEventPop').css("display","none"); + $('.payEventPop').hide(); }else{ + console.log("이벤트 쿠키 없음 : SHOW"); + $('.payEventPop').css("display","block"); + $('.payEventPop').show(); } /* document.eventForm.payCount.value = payCount; From 8f55eb843a132871c12969b0dd5a4d5e3b724333 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Fri, 13 Oct 2023 16:11:15 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1,=20?= =?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90,=20=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=ED=86=A1=EB=B0=9C=EC=86=A1=20=ED=99=94=EB=A9=B4=20=EC=98=88?= =?UTF-8?q?=EC=95=BD=EB=B0=9C=EC=86=A1=20=EA=B8=B0=EB=8A=A5=EC=9D=98=20?= =?UTF-8?q?=EB=B6=84=ED=95=A0=EA=B1=B4=EC=88=98=20=EC=9E=85=EB=A0=A5=20?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=20style=20=ED=83=9C=EA=B7=B8=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp | 2 +- .../WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp | 2 +- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp | 2 +- .../WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp index 6a274f6c..92a5288c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp @@ -1531,7 +1531,7 @@ function checkNumber(event) {
- + - + - + - + - +