diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index e66e95af..9520f659 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -3494,7 +3494,8 @@ +
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp index d889caf3..7adf742c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp @@ -25,6 +25,8 @@ var msgResendAllGroupId = "${msgResendAllGroupId}"; var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}"; var msgResendAllReplaceYn = "${msgResendAllReplaceYn}"; +var enterSts = false; + $(document).ready(function(){ //문자 발송 화면 폼 불러오기 listMsgDataView(); @@ -957,6 +959,15 @@ function fn_sendMsgData(){ } + var chkCalltoCnt = $("input[name=chkCallTo]").length; + + if(Number(chkCalltoCnt) == 0){ + + alert("받는사람을 추가해 주세요."); + return false; + } + + //수신번호 리스트 체크하기 var numCnt = 0; var nameList = []; //치환문자 이름 @@ -1033,8 +1044,17 @@ function fn_sendMsgData(){ } - if(confirm("문자를 전송하시겠습니까?")){ + //엔터키로 문자 전송 바로 처리하기 : 엔터키와 엔터키 체크박스 둘다 조건 만족시 메시지 없이 전송처리 + var enterChk = $("#enterChk").is(':checked'); + if(!enterChk || !enterSts){ + if(!confirm("문자를 전송하시겠습니까?")){ + return false; + } + + } + + //if(confirm("문자를 전송하시겠습니까?")){ imgFilePath = []; $('.thumb_wrap').find('.thumb_img').each(function(idx, el) { @@ -1547,7 +1567,7 @@ function fn_sendMsgData(){ } - } + //} } diff --git a/src/main/webapp/publish/css/content.css b/src/main/webapp/publish/css/content.css index e667afa4..e1d7d057 100644 --- a/src/main/webapp/publish/css/content.css +++ b/src/main/webapp/publish/css/content.css @@ -532,7 +532,7 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email /* 문자 예약 */ .send_top .send_right .phone_bottom {position: absolute; bottom: 0; left: 0;} -.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0;} +.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0; position:relative;} .send_top .send_right .send_rev .rev_selected {background-color: #f5f5f5;padding: 15px 0 15px 10px;border: 1px solid #d6d8da;border-radius: 10px;} .send_top .send_right .send_rev .rev_radio input[type="radio"]+label {color: #555;margin-right: 8px;} .send_top .send_right .send_rev select+label {color: #555;font-weight: 300; font-size: 14px;} @@ -554,6 +554,8 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email .send_top .send_right .send_rev .send_content .rev_radio ul li input[type=radio] + label {vertical-align:top;} .send_top .send_right .send_rev .send_content .send_btn {display:flex;width:245px;justify-content:space-between;} .send_top .send_right .send_rev .send_content .send_btn button {width:calc(100%/2 - 4px);height:60px;} +.send_top .send_right .send_rev .use_enter {position:absolute; padding:3px 0 0 65px; display:flex;align-items:center;} +.send_top .send_right .send_rev .use_enter label {font-size:16px!important; padding:0 0 0 4px; font-weight:400!important;} /* sub1 엑셀 문자(대량 전송) */ .send_top .get_excel .send_right .phone {height: 93%; position: absolute; top: 0; right: 0;} diff --git a/src/main/webapp/publish/js/publish.js b/src/main/webapp/publish/js/publish.js index 6518c891..651cc796 100644 --- a/src/main/webapp/publish/js/publish.js +++ b/src/main/webapp/publish/js/publish.js @@ -53,7 +53,7 @@ var publishCommon = { if (chkCnt == 0) { - alert("받는사람을 추가해 주세요."); + //alert("받는사람을 추가해 주세요."); return false; }