Merge branch 'master' into rosewiper
Conflicts: src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp 문자발송 및 선거문자, 알림톡 발송 예약문자의 분할발송 건수 입력 변경 - 기존 select box 방식에서 입력방식으로 변경
@3210a2bfaf9e89fccb0c54751a3b7a51ad834350
--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
... | ... | @@ -592,9 +592,9 @@ |
| 592 | 592 |
divideChk = "N" |
| 593 | 593 |
} |
| 594 | 594 |
|
| 595 |
- var divideCnt = $("select[name='divideCnt']").val();
|
|
| 595 |
+ //var divideCnt = $("select[name='frmDivideCnt']").val();
|
|
| 596 |
+ var divideCnt = $('#frmDivideCnt').val();
|
|
| 596 | 597 |
var divideTime = $("select[name='divideTime']").val();
|
| 597 |
- |
|
| 598 | 598 |
|
| 599 | 599 |
$('#bizForm #divideChk').val(divideChk);
|
| 600 | 600 |
$('#bizForm #divideCnt').val(divideCnt);
|
... | ... | @@ -1045,7 +1045,20 @@ |
| 1045 | 1045 |
location.href="/web/member/pay/PayUserWithKakaoList.do"; |
| 1046 | 1046 |
} |
| 1047 | 1047 |
|
| 1048 |
- |
|
| 1048 |
+function checkNumber(event) {
|
|
| 1049 |
+ var divideCnt = $('#frmDivideCnt').val();
|
|
| 1050 |
+ if(!(event.key >= 0 && event.key <= 9)) {
|
|
| 1051 |
+ return false; |
|
| 1052 |
+ } |
|
| 1053 |
+ |
|
| 1054 |
+ var totCnt = divideCnt + "" + event.key; |
|
| 1055 |
+ if(Number(totCnt) > 5000){
|
|
| 1056 |
+ alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
|
|
| 1057 |
+ return false; |
|
| 1058 |
+ } |
|
| 1059 |
+ |
|
| 1060 |
+ return true; |
|
| 1061 |
+} |
|
| 1049 | 1062 |
|
| 1050 | 1063 |
</script> |
| 1051 | 1064 |
|
... | ... | @@ -1518,13 +1531,8 @@ |
| 1518 | 1531 |
<div class="rev_bottom"> |
| 1519 | 1532 |
<input type="checkbox" id="inputDivideChk" name="inputDivideChk"> |
| 1520 | 1533 |
<label for="">분할전송</label> |
| 1521 |
- <select class="selType1" id="divideCnt" name="divideCnt"> |
|
| 1522 |
- <option value="2">2</option> |
|
| 1523 |
- <option value="10">10</option> |
|
| 1524 |
- <option value="20">20</option> |
|
| 1525 |
- <option value="30">30</option> |
|
| 1526 |
- </select> |
|
| 1527 |
- <label for="divideCnt">건</label> |
|
| 1534 |
+ <input type="text" class="dividType1" id="frmDivideCnt" name="frmDivideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/> |
|
| 1535 |
+ <label for="divideCnt">건씩</label> |
|
| 1528 | 1536 |
<select class="selType1" id="divideTime" name="divideTime"> |
| 1529 | 1537 |
<option value="5">05분</option> |
| 1530 | 1538 |
<option value="10">10분</option> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
... | ... | @@ -3163,6 +3163,23 @@ |
| 3163 | 3163 |
} |
| 3164 | 3164 |
}); |
| 3165 | 3165 |
|
| 3166 |
+function checkNumber(event) {
|
|
| 3167 |
+ var divideCnt = $('#divideCnt').val();
|
|
| 3168 |
+ if(!(event.key >= 0 && event.key <= 9)) {
|
|
| 3169 |
+ return false; |
|
| 3170 |
+ } |
|
| 3171 |
+ |
|
| 3172 |
+ var totCnt = divideCnt + "" + event.key; |
|
| 3173 |
+ if(Number(totCnt) > 5000){
|
|
| 3174 |
+ |
|
| 3175 |
+ alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
|
|
| 3176 |
+ return false; |
|
| 3177 |
+ |
|
| 3178 |
+ } |
|
| 3179 |
+ |
|
| 3180 |
+ return true; |
|
| 3181 |
+} |
|
| 3182 |
+ |
|
| 3166 | 3183 |
</script> |
| 3167 | 3184 |
<div class="loading_layer"> |
| 3168 | 3185 |
<div class="loading_container"> |
... | ... | @@ -4207,13 +4224,8 @@ |
| 4207 | 4224 |
<div class="rev_bottom"> |
| 4208 | 4225 |
<input type="checkbox" id="divideChk" name="divideChk"> |
| 4209 | 4226 |
<label for="divideChk">분할전송</label> |
| 4210 |
- <select class="selType1" id="divideCnt" name="divideCnt"> |
|
| 4211 |
- <option value="2">2</option> |
|
| 4212 |
- <option value="10">10</option> |
|
| 4213 |
- <option value="20">20</option> |
|
| 4214 |
- <option value="30">30</option> |
|
| 4215 |
- </select> |
|
| 4216 |
- <label for="divideCnt">건</label> |
|
| 4227 |
+ <input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/> |
|
| 4228 |
+ <label for="divideCnt">건씩</label> |
|
| 4217 | 4229 |
<select class="selType1" id="divideTime" name="divideTime"> |
| 4218 | 4230 |
<option value="5">05분</option> |
| 4219 | 4231 |
<option value="10">10분</option> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
... | ... | @@ -2807,6 +2807,23 @@ |
| 2807 | 2807 |
} |
| 2808 | 2808 |
}); |
| 2809 | 2809 |
|
| 2810 |
+function checkNumber(event) {
|
|
| 2811 |
+ var divideCnt = $('#divideCnt').val();
|
|
| 2812 |
+ if(!(event.key >= 0 && event.key <= 9)) {
|
|
| 2813 |
+ return false; |
|
| 2814 |
+ } |
|
| 2815 |
+ |
|
| 2816 |
+ var totCnt = divideCnt + "" + event.key; |
|
| 2817 |
+ if(Number(totCnt) > 5000){
|
|
| 2818 |
+ |
|
| 2819 |
+ alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
|
|
| 2820 |
+ return false; |
|
| 2821 |
+ |
|
| 2822 |
+ } |
|
| 2823 |
+ |
|
| 2824 |
+ return true; |
|
| 2825 |
+} |
|
| 2826 |
+ |
|
| 2810 | 2827 |
</script> |
| 2811 | 2828 |
|
| 2812 | 2829 |
<div class="loading_layer"> |
... | ... | @@ -3756,13 +3773,8 @@ |
| 3756 | 3773 |
<div class="rev_bottom"> |
| 3757 | 3774 |
<input type="checkbox" id="divideChk" name="divideChk"> |
| 3758 | 3775 |
<label for="divideChk">분할전송</label> |
| 3759 |
- <select class="selType1" id="divideCnt" name="divideCnt"> |
|
| 3760 |
- <option value="2">2</option> |
|
| 3761 |
- <option value="10">10</option> |
|
| 3762 |
- <option value="20">20</option> |
|
| 3763 |
- <option value="30">30</option> |
|
| 3764 |
- </select> |
|
| 3765 |
- <label for="divideCnt">건</label> |
|
| 3776 |
+ <input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/> |
|
| 3777 |
+ <label for="divideCnt">건씩</label> |
|
| 3766 | 3778 |
<select class="selType1" id="divideTime" name="divideTime"> |
| 3767 | 3779 |
<option value="5">05분</option> |
| 3768 | 3780 |
<option value="10">10분</option> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -3196,6 +3196,251 @@ |
| 3196 | 3196 |
<div class="text">Loading</div> |
| 3197 | 3197 |
</div> |
| 3198 | 3198 |
</div> |
| 3199 |
+ |
|
| 3200 |
+<!-- 재전송 문자내용 팝업 data-tooltip: rev_popup01 작업중--> |
|
| 3201 |
+ <div class="tooltip-wrap" style="z-index:999;"> |
|
| 3202 |
+ <div class="popup-com adr_layer rev_popup01" tabindex="0" data-tooltip-con="rev_popup01" |
|
| 3203 |
+ data-focus="rev_popup01" data-focus-prev="rev_popup01-close" style="width: 440px;"> |
|
| 3204 |
+ <div class="popup_heading"> |
|
| 3205 |
+ <p>문자내용</p> |
|
| 3206 |
+ <button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img |
|
| 3207 |
+ src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 3208 |
+ </div> |
|
| 3209 |
+ <div class="layer_in"> |
|
| 3210 |
+ <div class="rev_pop_in"> |
|
| 3211 |
+ <div class="rev_pop_middle clearfix"> |
|
| 3212 |
+ <span>발송일시 : 2021-05-28 16:52:30</span> |
|
| 3213 |
+ <span class="msg_com msg_photo">MMS</span> |
|
| 3214 |
+ </div> |
|
| 3215 |
+ <div class="rev_pop_txt"> |
|
| 3216 |
+ <ul> |
|
| 3217 |
+ <li><img src="/publish/images/content/thumb1.jpg" alt="발송된 그림문자 미리보기"></li> |
|
| 3218 |
+ <li><img src="/publish/images/content/thumb2.jpg" alt="발송된 그림문자 미리보기"></li> |
|
| 3219 |
+ <li><img src="/publish/images/content/thumb3.jpg" alt="발송된 그림문자 미리보기"></li> |
|
| 3220 |
+ </ul> |
|
| 3221 |
+ <div> |
|
| 3222 |
+ <p class="deny_receipt">(광고) 무료거부 080-888-8282</p> |
|
| 3223 |
+ <p class="rev_cont">안녕하세요. 문자온미용실 입니다.<br> |
|
| 3224 |
+ 여름 맞이 이벤트 입니다.<br> |
|
| 3225 |
+ 7월부터 8월까지 모든 염색 10만원(시세이도 및 탈색은 별도) |
|
| 3226 |
+ </p> |
|
| 3227 |
+ </div> |
|
| 3228 |
+ </div> |
|
| 3229 |
+ </div> |
|
| 3230 |
+ <div class="popup_btn_wrap2" style="justify-content: center;"> |
|
| 3231 |
+ <button type="button" class="tooltip-close" data-focus="rev_popup01-close" |
|
| 3232 |
+ data-focus-next="rev_popup01">닫기</button> |
|
| 3233 |
+ </div> |
|
| 3234 |
+ </div> |
|
| 3235 |
+ </div> |
|
| 3236 |
+ </div> |
|
| 3237 |
+ <!--// 재전송 문자내용 팝업 --> |
|
| 3238 |
+ |
|
| 3239 |
+ |
|
| 3240 |
+<!-- 재전송 작업중--> |
|
| 3241 |
+ <div class="tooltip-wrap"> |
|
| 3242 |
+ <div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close"> |
|
| 3243 |
+ <div class="popup_heading"> |
|
| 3244 |
+ <p><span>전송내역</p> |
|
| 3245 |
+ <button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 3246 |
+ </div> |
|
| 3247 |
+ <div class="layer_in"> |
|
| 3248 |
+ <!-- 전송내역 불러오기 --> |
|
| 3249 |
+ |
|
| 3250 |
+ <div class="tb_wrap" style="min-height:400px;"> |
|
| 3251 |
+ <table class="tType4"> |
|
| 3252 |
+ <colgroup> |
|
| 3253 |
+ <col style=""> |
|
| 3254 |
+ <col style=""> |
|
| 3255 |
+ <col style=""> |
|
| 3256 |
+ <col style=""> |
|
| 3257 |
+ <col style=""> |
|
| 3258 |
+ <col style=""> |
|
| 3259 |
+ <col style=""> |
|
| 3260 |
+ <col style=""> |
|
| 3261 |
+ </colgroup> |
|
| 3262 |
+ <thead> |
|
| 3263 |
+ <tr> |
|
| 3264 |
+ <th>발송일시 |
|
| 3265 |
+ <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" |
|
| 3266 |
+ alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" |
|
| 3267 |
+ alt="내림차순으로 분류"></button></div> |
|
| 3268 |
+ </th> |
|
| 3269 |
+ <th>형태 |
|
| 3270 |
+ <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" |
|
| 3271 |
+ alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" |
|
| 3272 |
+ alt="내림차순으로 분류"></button></div> |
|
| 3273 |
+ </th> |
|
| 3274 |
+ <th>발송방식 |
|
| 3275 |
+ <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" |
|
| 3276 |
+ alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" |
|
| 3277 |
+ alt="내림차순으로 분류"></button></div> |
|
| 3278 |
+ </th> |
|
| 3279 |
+ <th>내용</th> |
|
| 3280 |
+ <th>받는사람 |
|
| 3281 |
+ <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" |
|
| 3282 |
+ alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" |
|
| 3283 |
+ alt="내림차순으로 분류"></button></div> |
|
| 3284 |
+ </th> |
|
| 3285 |
+ <th>발신번호 |
|
| 3286 |
+ <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" |
|
| 3287 |
+ alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" |
|
| 3288 |
+ alt="내림차순으로 분류"></button></div> |
|
| 3289 |
+ </th> |
|
| 3290 |
+ <th>발송건수 |
|
| 3291 |
+ <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" |
|
| 3292 |
+ alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" |
|
| 3293 |
+ alt="내림차순으로 분류"></button></div> |
|
| 3294 |
+ </th> |
|
| 3295 |
+ <th>재전송 선택 |
|
| 3296 |
+ </th> |
|
| 3297 |
+ </tr> |
|
| 3298 |
+ </thead> |
|
| 3299 |
+ <tbody> |
|
| 3300 |
+ <tr> |
|
| 3301 |
+ <td>2023-06-10 17:50</td> |
|
| 3302 |
+ <td>그림</td> |
|
| 3303 |
+ <td>WEB</td> |
|
| 3304 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button> |
|
| 3305 |
+ </td> |
|
| 3306 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3307 |
+ <td>010-5897-7895</td> |
|
| 3308 |
+ <td>8</td> |
|
| 3309 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3310 |
+ </tr> |
|
| 3311 |
+ <tr> |
|
| 3312 |
+ <td>2021-06-10 17:50</td> |
|
| 3313 |
+ <td>그림</td> |
|
| 3314 |
+ <td>WEB</td> |
|
| 3315 |
+ <td><button class="btnType btnType20" type="button">상세보기</button> |
|
| 3316 |
+ <div class="history_hover"> |
|
| 3317 |
+ <p>(광고) 하이~ 무료 거부 08010000008 빨리빨리대리전★☎ 1588-8282 시원한 맥주한잔 후엔 10% 적립! 불러주시면 빨리 달려갑니다! (광고) 하이~ |
|
| 3318 |
+ 무료 거부 08010000008 빨리빨리대리전★☎ 1588-8282 시원한 맥주한잔 후엔 10% 적립! 불러주시면 빨리 달려갑니다!</p> |
|
| 3319 |
+ </div> |
|
| 3320 |
+ </td> |
|
| 3321 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3322 |
+ <td>010-5897-7895</td> |
|
| 3323 |
+ <td>8</td> |
|
| 3324 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3325 |
+ </tr> |
|
| 3326 |
+ <tr> |
|
| 3327 |
+ <td>2021-06-10 17:50</td> |
|
| 3328 |
+ <td>그림</td> |
|
| 3329 |
+ <td>WEB</td> |
|
| 3330 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td> |
|
| 3331 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3332 |
+ <td>010-5897-7895</td> |
|
| 3333 |
+ <td>8</td> |
|
| 3334 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3335 |
+ </tr> |
|
| 3336 |
+ <tr> |
|
| 3337 |
+ <td>2021-06-10 17:50</td> |
|
| 3338 |
+ <td>그림</td> |
|
| 3339 |
+ <td>WEB</td> |
|
| 3340 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td> |
|
| 3341 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3342 |
+ <td>010-5897-7895</td> |
|
| 3343 |
+ <td>8</td> |
|
| 3344 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3345 |
+ </tr> |
|
| 3346 |
+ <tr> |
|
| 3347 |
+ <td>2021-06-10 17:50</td> |
|
| 3348 |
+ <td>그림</td> |
|
| 3349 |
+ <td>WEB</td> |
|
| 3350 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td> |
|
| 3351 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3352 |
+ <td>010-5897-7895</td> |
|
| 3353 |
+ <td>8</td> |
|
| 3354 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3355 |
+ </tr> |
|
| 3356 |
+ <tr> |
|
| 3357 |
+ <td>2021-06-10 17:50</td> |
|
| 3358 |
+ <td>그림</td> |
|
| 3359 |
+ <td>WEB</td> |
|
| 3360 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td> |
|
| 3361 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3362 |
+ <td>010-5897-7895</td> |
|
| 3363 |
+ <td>8</td> |
|
| 3364 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3365 |
+ </tr> |
|
| 3366 |
+ <tr> |
|
| 3367 |
+ <td>2021-06-10 17:50</td> |
|
| 3368 |
+ <td>그림</td> |
|
| 3369 |
+ <td>WEB</td> |
|
| 3370 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td> |
|
| 3371 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3372 |
+ <td>010-5897-7895</td> |
|
| 3373 |
+ <td>8</td> |
|
| 3374 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3375 |
+ </tr> |
|
| 3376 |
+ <tr> |
|
| 3377 |
+ <td>2021-06-10 17:50</td> |
|
| 3378 |
+ <td>그림</td> |
|
| 3379 |
+ <td>WEB</td> |
|
| 3380 |
+ <td><button class="btnType btnType20" data-tooltip="rev_popup03" type="button">상세보기</button></td> |
|
| 3381 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3382 |
+ <td>010-5897-7895</td> |
|
| 3383 |
+ <td>8</td> |
|
| 3384 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3385 |
+ </tr> |
|
| 3386 |
+ <tr> |
|
| 3387 |
+ <td>2021-06-10 17:50</td> |
|
| 3388 |
+ <td>그림</td> |
|
| 3389 |
+ <td>WEB</td> |
|
| 3390 |
+ <td><button class="btnType btnType20" type="button">상세보기</button> |
|
| 3391 |
+ </td> |
|
| 3392 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3393 |
+ <td>010-5897-7895</td> |
|
| 3394 |
+ <td>8</td> |
|
| 3395 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3396 |
+ </tr> |
|
| 3397 |
+ <tr> |
|
| 3398 |
+ <td>2021-06-10 17:50</td> |
|
| 3399 |
+ <td>그림</td> |
|
| 3400 |
+ <td>WEB</td> |
|
| 3401 |
+ <td><button class="btnType btnType20" type="button">상세보기</button> |
|
| 3402 |
+ </td> |
|
| 3403 |
+ <td>010-1547-5895 외 1명</td> |
|
| 3404 |
+ <td>010-5897-7895</td> |
|
| 3405 |
+ <td>8</td> |
|
| 3406 |
+ <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 3407 |
+ </tr> |
|
| 3408 |
+ </tbody> |
|
| 3409 |
+ </table> |
|
| 3410 |
+ </div> |
|
| 3411 |
+ |
|
| 3412 |
+ <!--// 전송내역 불러오기 --> |
|
| 3413 |
+ |
|
| 3414 |
+ <!-- pagination --> |
|
| 3415 |
+ <ul class="pagination"> |
|
| 3416 |
+ <li class="page_first"><button><img src="/publish/images/content/page_first.png" |
|
| 3417 |
+ alt="첫페이지"></button></li> |
|
| 3418 |
+ <li class="page_prev"><button><img src="/publish/images/content/page_prev.png" |
|
| 3419 |
+ alt=""></button></li> |
|
| 3420 |
+ <li class="on"><button>1</button></li> |
|
| 3421 |
+ <li><button>2</button></li> |
|
| 3422 |
+ <li><button>3</button></li> |
|
| 3423 |
+ <li><button>4</button></li> |
|
| 3424 |
+ <li><button>5</button></li> |
|
| 3425 |
+ <li><button>6</button></li> |
|
| 3426 |
+ <li><button>7</button></li> |
|
| 3427 |
+ <li><button>8</button></li> |
|
| 3428 |
+ <li><button>9</button></li> |
|
| 3429 |
+ <li><button>10</button></li> |
|
| 3430 |
+ <li class="page_next"><button><img src="/publish/images/content/page_next.png" |
|
| 3431 |
+ alt=""></button></li> |
|
| 3432 |
+ <li class="page_last"><button><img src="/publish/images/content/page_last.png" |
|
| 3433 |
+ alt="마지막페이지"></button></li> |
|
| 3434 |
+ </ul><!-- pagination --> |
|
| 3435 |
+ |
|
| 3436 |
+ <div class="popup_btn_wrap2"> |
|
| 3437 |
+ <button type="button" class="tooltip-close" data-focus="popup02-close" data-focus-next="popup02">닫기</button> |
|
| 3438 |
+ </div> |
|
| 3439 |
+ </div> |
|
| 3440 |
+ </div> |
|
| 3441 |
+ </div> |
|
| 3442 |
+<!--// 재전송 --> |
|
| 3443 |
+ |
|
| 3199 | 3444 |
|
| 3200 | 3445 |
<div class="tooltip-wrap"> |
| 3201 | 3446 |
<div class="popup-com history_layer popup03" tabindex="0" data-tooltip-con="popup03" data-focus="popup03" data-focus-prev="popup03-close"> |
... | ... | @@ -3824,6 +4069,9 @@ |
| 3824 | 4069 |
<div class="btn_popup_wrap"> |
| 3825 | 4070 |
<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button> |
| 3826 | 4071 |
</div> |
| 4072 |
+ <div class="btn_popup_wrap"> |
|
| 4073 |
+ <button type="button" data-tooltip="popup05" class="btnType btnType7 tab2">재전송</button> |
|
| 4074 |
+ </div> |
|
| 3827 | 4075 |
<div class="btn_popup_wrap check_validity_wrap"> |
| 3828 | 4076 |
<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button> |
| 3829 | 4077 |
<div class="error_hover_cont send_hover_cont"> |
... | ... | @@ -4024,14 +4272,8 @@ |
| 4024 | 4272 |
<div class="rev_bottom"> |
| 4025 | 4273 |
<input type="checkbox" id="divideChk" name="divideChk"> |
| 4026 | 4274 |
<label for="divideChk">분할전송</label> |
| 4027 |
- <input type="text" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/> |
|
| 4028 |
- <!-- <select class="selType1" id="divideCnt" name="divideCnt"> |
|
| 4029 |
- <option value="2">2</option> |
|
| 4030 |
- <option value="10">10</option> |
|
| 4031 |
- <option value="20">20</option> |
|
| 4032 |
- <option value="30">30</option> |
|
| 4033 |
- </select> --> |
|
| 4034 |
- <label for="divideCnt">건</label> |
|
| 4275 |
+ <input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/> |
|
| 4276 |
+ <label for="divideCnt">건씩</label> <!-- 2023 10 13 수정 --> |
|
| 4035 | 4277 |
<select class="selType1" id="divideTime" name="divideTime"> |
| 4036 | 4278 |
<option value="5">05분</option> |
| 4037 | 4279 |
<option value="10">10분</option> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
... | ... | @@ -2891,6 +2891,23 @@ |
| 2891 | 2891 |
} |
| 2892 | 2892 |
}); |
| 2893 | 2893 |
|
| 2894 |
+function checkNumber(event) {
|
|
| 2895 |
+ var divideCnt = $('#divideCnt').val();
|
|
| 2896 |
+ if(!(event.key >= 0 && event.key <= 9)) {
|
|
| 2897 |
+ return false; |
|
| 2898 |
+ } |
|
| 2899 |
+ |
|
| 2900 |
+ var totCnt = divideCnt + "" + event.key; |
|
| 2901 |
+ if(Number(totCnt) > 5000){
|
|
| 2902 |
+ |
|
| 2903 |
+ alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
|
|
| 2904 |
+ return false; |
|
| 2905 |
+ |
|
| 2906 |
+ } |
|
| 2907 |
+ |
|
| 2908 |
+ return true; |
|
| 2909 |
+} |
|
| 2910 |
+ |
|
| 2894 | 2911 |
</script> |
| 2895 | 2912 |
|
| 2896 | 2913 |
<div class="loading_layer"> |
... | ... | @@ -3514,13 +3531,8 @@ |
| 3514 | 3531 |
<div class="rev_bottom"> |
| 3515 | 3532 |
<input type="checkbox" id="divideChk" name="divideChk"> |
| 3516 | 3533 |
<label for="divideChk">분할전송</label> |
| 3517 |
- <select class="selType1" id="divideCnt" name="divideCnt"> |
|
| 3518 |
- <option value="2">2</option> |
|
| 3519 |
- <option value="10">10</option> |
|
| 3520 |
- <option value="20">20</option> |
|
| 3521 |
- <option value="30">30</option> |
|
| 3522 |
- </select> |
|
| 3523 |
- <label for="divideCnt">건</label> |
|
| 3534 |
+ <input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' style="width:60px;" maxlength="4"/> |
|
| 3535 |
+ <label for="divideCnt">건씩</label> |
|
| 3524 | 3536 |
<select class="selType1" id="divideTime" name="divideTime"> |
| 3525 | 3537 |
<option value="5">05분</option> |
| 3526 | 3538 |
<option value="10">10분</option> |
--- src/main/webapp/publish/css/content.css
+++ src/main/webapp/publish/css/content.css
... | ... | @@ -529,6 +529,8 @@ |
| 529 | 529 |
.send_top .send_right .send_rev .rev_selected {background-color: #f5f5f5;padding: 15px 0 15px 10px;border: 1px solid #d6d8da;border-radius: 10px;}
|
| 530 | 530 |
.send_top .send_right .send_rev .rev_radio input[type="radio"]+label {color: #555;margin-right: 8px;}
|
| 531 | 531 |
.send_top .send_right .send_rev select+label {color: #555;font-weight: 300; font-size: 14px;}
|
| 532 |
+.send_top .send_right .send_rev input+label {color: #555;font-weight: 300; font-size: 14px;} /*2023 10 13 추가*/
|
|
| 533 |
+.send_top .send_right .send_rev input.dividType1 {width:50px; border:1px solid #d5d5d5; padding:4px 0 4px 10px; color:#777; } /*2023 10 13 추가*/
|
|
| 532 | 534 |
.send_top .send_right .send_rev input[type="checkbox"]+label {color: #555;font-weight: 300; font-size: 14px;}
|
| 533 | 535 |
.send_top .send_right .send_rev .rev_top span {color: #555;font-weight: 300; font-size: 14px;}
|
| 534 | 536 |
.send_top .send_right .send_rev .rev_top .selBox {display: inline-block;}
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?