From b1e6b6b6e9d43df6d7002908abd1903054f22446 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Tue, 6 Feb 2024 12:00:18 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=A0=EA=B1=B0=EB=AC=B8=EC=9E=90=2020?=
 =?UTF-8?q?=EA=B1=B4=20=EC=97=94=ED=84=B0=ED=82=A4=20=EB=AC=B8=EC=9E=90?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=20=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/msgcampain/tw/MsgTWDataSMLView.jsp    |  8 +++++--
 .../jsp/web/msgcampain/tw/MsgTWDataView.jsp   | 22 +++++++++++++++++--
 src/main/webapp/publish/js/publish.js         |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
index 8b89b6eb..6e6cafbd 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
@@ -9,7 +9,7 @@
 <script type="text/javascript" src="<c:url value='/js/txtSpecialReplace.js?date=202304250001'/>"></script>
 
 <!--  -->
-<script type="text/javascript" src="<c:url value='/publish/js/publish.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/publish/js/publish.js?date=202402060001'/>"></script>
 
 <style>
 /* .send_top .send_right .phone_bottom{display:flex;align-items:center;} */
@@ -4538,7 +4538,11 @@ function getMjMsgSentListAll(pageNo) {
 		                        <button type="button" class="btnType btnType10" onclick="javascript:fnTestSend(); return false;">테스트발송</button>
 		                    </div>		                    
 	                    </div>
-	                    <!-- Enter키로 발송하기 <div class="use_enter"><input type="checkbox" id=""><label for="">Enter키로 발송하기</label></div>-->
+	                    <!-- 엔터키로 발송 체크박스 -->
+	                    <div class="use_enter">
+	                    	<input type="checkbox" id="enterChk" name="enterChk">
+	                    	<label for="enterChk">Enter키로 발송하기</label>
+	                    </div>
                         <div class="rev_selected">
                             <div class="rev_top">
                		            <span>날짜 :</span>
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 c20a7b5a..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
@@ -959,6 +959,15 @@ function fn_sendMsgData(){
 		
 	}
 	
+	var chkCalltoCnt =  $("input[name=chkCallTo]").length;
+	
+	if(Number(chkCalltoCnt) == 0){
+		
+		alert("받는사람을 추가해 주세요.");
+		return false;
+	}
+	
+	
 	//수신번호 리스트 체크하기
 	var numCnt = 0;
 	var nameList = [];		//치환문자 이름
@@ -1035,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) {
@@ -1549,7 +1567,7 @@ function fn_sendMsgData(){
 			
 		}
 		
-	}
+	//}
 	
 }
 
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;
 
     }