tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rosewiper

Browse Source 
Conflicts:
	src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

문자발송 및 선거문자, 알림톡 발송 예약문자의 분할발송 건수 입력 변경
 - 기존 select box 방식에서 입력방식으로 변경
This commit is contained in:
rosewiper 2023-10-13 15:33:00 +09:00
commit 3210a2bfaf
6 changed files with 327 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
View File

@ -592,10 +592,10 @@ function sendTemplateInfo(){
divideChk = "N"
}
var divideCnt = $("select[name='divideCnt']").val();
//var divideCnt = $("select[name='frmDivideCnt']").val();
var divideCnt = $('#frmDivideCnt').val();
var divideTime = $("select[name='divideTime']").val();
$('#bizForm #divideChk').val(divideChk);
$('#bizForm #divideCnt').val(divideCnt);
$('#bizForm #divideTime').val(divideTime);
@ -1045,7 +1045,20 @@ function goToPayUserKaKaoView(){
location.href="/web/member/pay/PayUserWithKakaoList.do";
}
function checkNumber(event) {
var divideCnt = $('#frmDivideCnt').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;
}
</script>
@ -1518,13 +1531,8 @@ function goToPayUserKaKaoView(){
<div class="rev_bottom">
<input type="checkbox" id="inputDivideChk" name="inputDivideChk">
<label for="">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="frmDivideCnt" name="frmDivideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

26
src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
View File

@ -3163,6 +3163,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;
}
</script>
<div class="loading_layer">
<div class="loading_container">
@ -4207,13 +4224,8 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

26
src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
View File

@ -2807,6 +2807,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;
}
</script>
<div class="loading_layer">
@ -3756,13 +3773,8 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

258
src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
View File

@ -3197,6 +3197,251 @@ function checkNumber(event) {
</div>
</div>
<!-- 재전송 문자내용 팝업 data-tooltip: rev_popup01 작업중-->
<div class="tooltip-wrap" style="z-index:999;">
<div class="popup-com adr_layer rev_popup01" tabindex="0" data-tooltip-con="rev_popup01"
data-focus="rev_popup01" data-focus-prev="rev_popup01-close" style="width: 440px;">
<div class="popup_heading">
<p>문자내용</p>
<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img
src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
</div>
<div class="layer_in">
<div class="rev_pop_in">
<div class="rev_pop_middle clearfix">
<span>발송일시 : 2021-05-28 16:52:30</span>
<span class="msg_com msg_photo">MMS</span>
</div>
<div class="rev_pop_txt">
<ul>
<li><img src="/publish/images/content/thumb1.jpg" alt="발송된 그림문자 미리보기"></li>
<li><img src="/publish/images/content/thumb2.jpg" alt="발송된 그림문자 미리보기"></li>
<li><img src="/publish/images/content/thumb3.jpg" alt="발송된 그림문자 미리보기"></li>
</ul>
<div>
<p class="deny_receipt">(광고) 무료거부 080-888-8282</p>
<p class="rev_cont">안녕하세요. 문자온미용실 입니다.<br>
여름 맞이 이벤트 입니다.<br>
7월부터 8월까지 모든 염색 10만원(시세이도 및 탈색은 별도)
</p>
</div>
</div>
</div>
<div class="popup_btn_wrap2" style="justify-content: center;">
<button type="button" class="tooltip-close" data-focus="rev_popup01-close"
data-focus-next="rev_popup01">닫기</button>
</div>
</div>
</div>
</div>
<!--// 재전송 문자내용 팝업 -->
<!-- 재전송 작업중-->
<div class="tooltip-wrap">
<div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close">
<div class="popup_heading">
<p><span>전송내역</p>
<button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
</div>
<div class="layer_in">
<!-- 전송내역 불러오기 -->
<div class="tb_wrap" style="min-height:400px;">
<table class="tType4">
<colgroup>
<col style="">
<col style="">
<col style="">
<col style="">
<col style="">
<col style="">
<col style="">
<col style="">
</colgroup>
<thead>
<tr>
<th>발송일시
<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png"
alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png"
alt="내림차순으로 분류"></button></div>
</th>
<th>형태
<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png"
alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png"
alt="내림차순으로 분류"></button></div>
</th>
<th>발송방식
<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png"
alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png"
alt="내림차순으로 분류"></button></div>
</th>
<th>내용</th>
<th>받는사람
<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png"
alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png"
alt="내림차순으로 분류"></button></div>
</th>
<th>발신번호
<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png"
alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png"
alt="내림차순으로 분류"></button></div>
</th>
<th>발송건수
<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png"
alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png"
alt="내림차순으로 분류"></button></div>
</th>
<th>재전송 선택
</th>
</tr>
</thead>
<tbody>
<tr>
<td>2023-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button>
</td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" type="button">상세보기</button>
<div class="history_hover">
<p>(광고) 하이~ 무료 거부 08010000008 빨리빨리대리전★☎ 1588-8282 시원한 맥주한잔 후엔 10% 적립! 불러주시면 빨리 달려갑니다! (광고) 하이~
무료 거부 08010000008 빨리빨리대리전★☎ 1588-8282 시원한 맥주한잔 후엔 10% 적립! 불러주시면 빨리 달려갑니다!</p>
</div>
</td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" type="button">상세보기</button>
</td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
<tr>
<td>2021-06-10 17:50</td>
<td>그림</td>
<td>WEB</td>
<td><button class="btnType btnType20" type="button">상세보기</button>
</td>
<td>010-1547-5895 외 1명</td>
<td>010-5897-7895</td>
<td>8</td>
<td><button class="btnType btnType24" type="button">재전송</button></td>
</tr>
</tbody>
</table>
</div>
<!--// 전송내역 불러오기 -->
<!-- pagination -->
<ul class="pagination">
<li class="page_first"><button><img src="/publish/images/content/page_first.png"
alt="첫페이지"></button></li>
<li class="page_prev"><button><img src="/publish/images/content/page_prev.png"
alt=""></button></li>
<li class="on"><button>1</button></li>
<li><button>2</button></li>
<li><button>3</button></li>
<li><button>4</button></li>
<li><button>5</button></li>
<li><button>6</button></li>
<li><button>7</button></li>
<li><button>8</button></li>
<li><button>9</button></li>
<li><button>10</button></li>
<li class="page_next"><button><img src="/publish/images/content/page_next.png"
alt=""></button></li>
<li class="page_last"><button><img src="/publish/images/content/page_last.png"
alt="마지막페이지"></button></li>
</ul><!-- pagination -->
<div class="popup_btn_wrap2">
<button type="button" class="tooltip-close" data-focus="popup02-close" data-focus-next="popup02">닫기</button>
</div>
</div>
</div>
</div>
<!--// 재전송 -->
<div class="tooltip-wrap">
<div class="popup-com history_layer popup03" tabindex="0" data-tooltip-con="popup03" data-focus="popup03" data-focus-prev="popup03-close">
<div class="popup_heading">
@ -3824,6 +4069,9 @@ function checkNumber(event) {
<div class="btn_popup_wrap">
<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
</div>
<div class="btn_popup_wrap">
<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2">재전송</button>
</div>
<div class="btn_popup_wrap check_validity_wrap">
<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
<div class="error_hover_cont send_hover_cont">
@ -4024,14 +4272,8 @@ function checkNumber(event) {
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<input type="text" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<!-- <select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select> -->
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label> <!-- 2023 10 13 수정 -->
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

26
src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
View File

@ -2891,6 +2891,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;
}
</script>
<div class="loading_layer">
@ -3514,13 +3531,8 @@ $(".btn_event_cash").off().on("click", function(){
<div class="rev_bottom">
<input type="checkbox" id="divideChk" name="divideChk">
<label for="divideChk">분할전송</label>
<select class="selType1" id="divideCnt" name="divideCnt">
<option value="2">2</option>
<option value="10">10</option>
<option value="20">20</option>
<option value="30">30</option>
</select>
<label for="divideCnt">건</label>
<input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/>
<label for="divideCnt">건씩</label>
<select class="selType1" id="divideTime" name="divideTime">
<option value="5">05분</option>
<option value="10">10분</option>

2
src/main/webapp/publish/css/content.css
View File

@ -529,6 +529,8 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email
.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;}
.send_top .send_right .send_rev input+label {color: #555;font-weight: 300; font-size: 14px;} /*2023 10 13 추가*/
.send_top .send_right .send_rev input.dividType1 {width:50px; border:1px solid #d5d5d5; padding:4px 0 4px 10px; color:#777; } /*2023 10 13 추가*/
.send_top .send_right .send_rev input[type="checkbox"]+label {color: #555;font-weight: 300; font-size: 14px;}
.send_top .send_right .send_rev .rev_top span {color: #555;font-weight: 300; font-size: 14px;}
.send_top .send_right .send_rev .rev_top .selBox {display: inline-block;}