Merge branch 'master' of http://yickso@vcs.iten.co.kr:9999/hylee/mjon_git
@4094fe485a9187f59d3f9710c5cad74249a60de3
--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberCmpHst_SQL_Mysql.xml
... | ... | @@ -201,6 +201,15 @@ |
| 201 | 201 |
UPDATE LETTNGNRLMBER SET |
| 202 | 202 |
MBER_STTUS = #mberSttus# |
| 203 | 203 |
, DEPT = #dept# |
| 204 |
+ <isNotEmpty property="mberNm"> |
|
| 205 |
+ , MBER_NM = #mberNm# |
|
| 206 |
+ </isNotEmpty> |
|
| 207 |
+ <isNotEmpty property="ceoNm"> |
|
| 208 |
+ , CEO_NM = #ceoNm# |
|
| 209 |
+ </isNotEmpty> |
|
| 210 |
+ <isNotEmpty property="bizNo"> |
|
| 211 |
+ , BIZ_NO = #bizNo# |
|
| 212 |
+ </isNotEmpty> |
|
| 204 | 213 |
<isNotEmpty property="atchFileId"> |
| 205 | 214 |
, ATCH_FILE_ID = #atchFileId# |
| 206 | 215 |
</isNotEmpty> |
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovMberCmpHstListByType.jsp
... | ... | @@ -109,7 +109,7 @@ |
| 109 | 109 |
|
| 110 | 110 |
|
| 111 | 111 |
// 기업회원 신청 승인/반려 처리 |
| 112 |
-function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum) {
|
|
| 112 |
+function setMberCmpHstStatusSave(hstSttus, cmphstId, hstType, mberId, managerNm, mbtlNum, mberNm, ceoNm, bizNo) {
|
|
| 113 | 113 |
var sMsg = ""; |
| 114 | 114 |
if (hstSttus == "02") {
|
| 115 | 115 |
sMsg = "승인"; |
... | ... | @@ -128,7 +128,9 @@ |
| 128 | 128 |
if(hstType == '02' && hstSttus == '02'){ //기업회원 전환 승인이라면 기존 mberNm -> managerNm 으로 수정
|
| 129 | 129 |
$("#managerNm").val(managerNm);
|
| 130 | 130 |
} |
| 131 |
- |
|
| 131 |
+ $("#mberNm").val(mberNm);
|
|
| 132 |
+ $("#ceoNm").val(ceoNm);
|
|
| 133 |
+ $("#bizNo").val(bizNo);
|
|
| 132 | 134 |
|
| 133 | 135 |
|
| 134 | 136 |
var form = document.listForm; |
... | ... | @@ -326,6 +328,9 @@ |
| 326 | 328 |
<input type="hidden" name="cmphstId" id="cmphstId" /> |
| 327 | 329 |
<input type="hidden" name="hstType" id="hstType" /> |
| 328 | 330 |
<input type="hidden" name="mberId" id="mberId" /> |
| 331 |
+ <input type="hidden" name="mberNm" id="mberNm" /> |
|
| 332 |
+ <input type="hidden" name="ceoNm" id="ceoNm" /> |
|
| 333 |
+ <input type="hidden" name="bizNo" id="bizNo" /> |
|
| 329 | 334 |
<input type="hidden" name="managerNm" id="managerNm" /> |
| 330 | 335 |
<input type="hidden" name="mbtlNum" id="mbtlNum" /> |
| 331 | 336 |
<input type="hidden" name="atchFileId" id="atchFileId" /> |
... | ... | @@ -546,7 +551,7 @@ |
| 546 | 551 |
</td> |
| 547 | 552 |
<td> |
| 548 | 553 |
<c:if test="${result.hstSttus eq '01'}">
|
| 549 |
- <button class="btnType btnType20" onclick="setMberCmpHstStatusSave('02','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>'); return false;">승인</button>
|
|
| 554 |
+ <button class="btnType btnType20" onclick="setMberCmpHstStatusSave('02','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>' ,'<c:out value="${result.mberNm}"/>' ,'<c:out value="${result.ceoNm}"/>' ,'<c:out value="${result.bizNo}"/>'); return false;">승인</button>
|
|
| 550 | 555 |
<%-- <button class="btnType btnType20" onclick="setMberCmpHstStatusSave('03','<c:out value="${result.cmphstId}"/>','<c:out value="${result.hstType}"/>','<c:out value="${result.mberId}"/>' ,'<c:out value="${result.managerNm}"/>' ,'<c:out value="${result.mbtlNum}"/>'); return false;">반려</button> --%>
|
| 551 | 556 |
<button class="btnType btnType20" onclick="returnPop('<c:out value="${result.cmphstId}"/>'); return false;">반려</button>
|
| 552 | 557 |
</c:if> |
--- 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)' 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/main/mainPage.jsp
+++ src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
... | ... | @@ -33,21 +33,38 @@ |
| 33 | 33 |
var evntPopCk = fnGetCookie('layer_evntPayPop');
|
| 34 | 34 |
var pointPopCk = fnGetCookie('layer_pointPop');
|
| 35 | 35 |
|
| 36 |
+ console.log("# 팝업 레이어 : START");
|
|
| 37 |
+ console.log("layer_evntPayPop : " + evntPopCk);
|
|
| 38 |
+ console.log("layer_pointPop : " + pointPopCk);
|
|
| 39 |
+ |
|
| 36 | 40 |
if(evntPopCk != null && pointPopCk != null){//팝업 쿠키가 모두 있는 경우 안보여준다.
|
| 41 |
+ console.log("eventLayerPop : STEP 1. 이벤트 팝업 쿠키가 모두 있는 경우 안보여준다.");
|
|
| 42 |
+ |
|
| 37 | 43 |
$(".eventLayerPop").css("display","none");
|
| 44 |
+ $(".eventLayerPop").hide();
|
|
| 38 | 45 |
}else if(evntPopCk == null && pointPopCk == null){// 이벤트 팝업 쿠키가 모두 없으면 팝업 보여주기
|
| 46 |
+ console.log("eventLayerPop : STEP 2. 이벤트 팝업 쿠키가 모두 없으면 팝업 보여주기.");
|
|
| 47 |
+ |
|
| 39 | 48 |
$(".eventLayerPop").css("display","block");
|
| 49 |
+ $(".eventLayerPop").show();
|
|
| 40 | 50 |
}else if(evntPopCk != null || pointPopCk != null){
|
| 51 |
+ console.log("eventLayerPop : STEP 3. 이벤트 팝업 쿠키가 하나라도 있으면 보여주기");
|
|
| 41 | 52 |
|
| 42 | 53 |
$(".eventLayerPop").css("display", "block");
|
| 54 |
+ $(".eventLayerPop").show();
|
|
| 43 | 55 |
if (fnGetCookie('layer_evntPayPop') != null) { //첫결제 이벤트 쿠키가 없으면 보여주기
|
| 56 |
+ console.log("이벤트 쿠키 있음 : HIDE");
|
|
| 57 |
+ |
|
| 44 | 58 |
$('.payEventPop').css("display","none");
|
| 59 |
+ $('.payEventPop').hide();
|
|
| 45 | 60 |
} |
| 46 | 61 |
|
| 47 | 62 |
if (fnGetCookie('layer_pointPop') != null) { //포인트 안내 팝업, 3일 안보기 체크
|
| 48 |
- $('.pointPop').css("display","none");
|
|
| 49 |
- } |
|
| 63 |
+ console.log("포인트 쿠키 있음 : HIDE");
|
|
| 50 | 64 |
|
| 65 |
+ $('.pointPop').css("display","none");
|
|
| 66 |
+ $('.pointPop').hide();
|
|
| 67 |
+ } |
|
| 51 | 68 |
} |
| 52 | 69 |
|
| 53 | 70 |
//레이어 팝업이 하나도 없으면 배경도 안보이도록 처리 |
... | ... | @@ -268,17 +285,27 @@ |
| 268 | 285 |
eventYn = true; |
| 269 | 286 |
</c:if> |
| 270 | 287 |
|
| 288 |
+ console.log("");
|
|
| 289 |
+ console.log("이벤트 팝업 호출 처리");
|
|
| 290 |
+ console.log("payCount : " + payCount);
|
|
| 291 |
+ console.log("eventYn : " + eventYn);
|
|
| 292 |
+ console.log("blineCode : " + blineCode);
|
|
| 293 |
+ |
|
| 271 | 294 |
if(payCount < 1 && eventYn && blineCode == 'N'){//결제내역이 하나도 없고, 이벤트가 진행중이면 팝업 호출
|
| 295 |
+ console.log("이벤트 팝업 함수 CALL");
|
|
| 272 | 296 |
remoteEventPayPop(payCount); |
| 273 | 297 |
}else{//이벤트 대상자가 아니면 첫결제 이벤트 팝업은 안보여준다.
|
| 274 |
- |
|
| 298 |
+ console.log("이벤트 팝업 : HIDE");
|
|
| 299 |
+ |
|
| 275 | 300 |
$('.payEventPop').css("display","none");
|
| 301 |
+ $('.payEventPop').hide();
|
|
| 276 | 302 |
|
| 277 | 303 |
if($(".layer_popup:visible").length == 0){
|
| 278 | 304 |
$(".layer_popup_wrap").hide();
|
| 279 | 305 |
} |
| 280 | 306 |
} |
| 281 | 307 |
|
| 308 |
+ console.log("# 팝업 레이어 : END");
|
|
| 282 | 309 |
}); |
| 283 | 310 |
|
| 284 | 311 |
function leadingZeros(n, digits) {
|
... | ... | @@ -950,9 +977,15 @@ |
| 950 | 977 |
//이벤트 팝업 호출 |
| 951 | 978 |
function remoteEventPayPop(payCount) {
|
| 952 | 979 |
if (fnGetCookie('layer_evntPayPop') != null) { //첫결제 이벤트 팝업 3일 안보기 체크
|
| 980 |
+ console.log("이벤트 쿠키 있음 : HIDE");
|
|
| 981 |
+ |
|
| 953 | 982 |
$('.payEventPop').css("display","none");
|
| 983 |
+ $('.payEventPop').hide();
|
|
| 954 | 984 |
}else{
|
| 985 |
+ console.log("이벤트 쿠키 없음 : SHOW");
|
|
| 986 |
+ |
|
| 955 | 987 |
$('.payEventPop').css("display","block");
|
| 988 |
+ $('.payEventPop').show();
|
|
| 956 | 989 |
} |
| 957 | 990 |
|
| 958 | 991 |
/* document.eventForm.payCount.value = payCount; |
--- 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)' 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)' 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
... | ... | @@ -3171,6 +3171,23 @@ |
| 3171 | 3171 |
} |
| 3172 | 3172 |
}); |
| 3173 | 3173 |
|
| 3174 |
+function checkNumber(event) {
|
|
| 3175 |
+ var divideCnt = $('#divideCnt').val();
|
|
| 3176 |
+ if(!(event.key >= 0 && event.key <= 9)) {
|
|
| 3177 |
+ return false; |
|
| 3178 |
+ } |
|
| 3179 |
+ |
|
| 3180 |
+ var totCnt = divideCnt + "" + event.key; |
|
| 3181 |
+ if(Number(totCnt) > 5000){
|
|
| 3182 |
+ |
|
| 3183 |
+ alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
|
|
| 3184 |
+ return false; |
|
| 3185 |
+ |
|
| 3186 |
+ } |
|
| 3187 |
+ |
|
| 3188 |
+ return true; |
|
| 3189 |
+} |
|
| 3190 |
+ |
|
| 3174 | 3191 |
</script> |
| 3175 | 3192 |
|
| 3176 | 3193 |
<div class="loading_layer"> |
... | ... | @@ -4146,14 +4163,8 @@ |
| 4146 | 4163 |
</div> |
| 4147 | 4164 |
<div class="rev_bottom"> |
| 4148 | 4165 |
<input type="checkbox" id="divideChk" name="divideChk"> |
| 4149 |
- <label for="divideChk">분할전송</label> |
|
| 4150 |
- <input type="text" class="dividType1"> <!-- 2023 10 13 수정 --> |
|
| 4151 |
- <!--<select class="selType1" id="divideCnt" name="divideCnt"> |
|
| 4152 |
- <option value="2">2</option> |
|
| 4153 |
- <option value="10">10</option> |
|
| 4154 |
- <option value="20">20</option> |
|
| 4155 |
- <option value="30">30</option> |
|
| 4156 |
- </select>--> |
|
| 4166 |
+ <label for="divideChk">분할전송</label> |
|
| 4167 |
+ <input type="text" class="dividType1" id="divideCnt" name="divideCnt" value="20" onkeypress='return checkNumber(event)' maxlength="4"/> |
|
| 4157 | 4168 |
<label for="divideCnt">건씩</label> <!-- 2023 10 13 수정 --> |
| 4158 | 4169 |
<select class="selType1" id="divideTime" name="divideTime"> |
| 4159 | 4170 |
<option value="5">05분</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)' 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/WEB-INF/jsp/web/user/membershipChangeReturn.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/membershipChangeReturn.jsp
... | ... | @@ -9,6 +9,11 @@ |
| 9 | 9 |
<script language=javascript> |
| 10 | 10 |
$(document).ready(function(){
|
| 11 | 11 |
$(".fileView").children('img').remove()
|
| 12 |
+ |
|
| 13 |
+ //사업자등록번호 입력 |
|
| 14 |
+ $("input[name=bizNo]").on("keyup", function() {
|
|
| 15 |
+ $(this).val(bizNo($(this).val().replace(/[^-\.0-9]/g,""))) |
|
| 16 |
+ }) |
|
| 12 | 17 |
}); |
| 13 | 18 |
|
| 14 | 19 |
|
... | ... | @@ -31,11 +36,36 @@ |
| 31 | 36 |
return false; |
| 32 | 37 |
} */ |
| 33 | 38 |
|
| 39 |
+ //사업자등록번호 체크 |
|
| 40 |
+ var numberMap = $("#bizNo").val().replace(/-/gi, '').split('').map(function (d){
|
|
| 41 |
+ return parseInt(d, 10); |
|
| 42 |
+ }); |
|
| 43 |
+ |
|
| 44 |
+ if(numberMap.length == 10){
|
|
| 45 |
+ var keyArr = [1, 3, 7, 1, 3, 7, 1, 3, 5]; |
|
| 46 |
+ var chk = 0; |
|
| 47 |
+ |
|
| 48 |
+ keyArr.forEach(function(d, i){
|
|
| 49 |
+ chk += d * numberMap[i]; |
|
| 50 |
+ }); |
|
| 51 |
+ |
|
| 52 |
+ chk += parseInt((keyArr[8] * numberMap[8])/ 10, 10); |
|
| 53 |
+ if(Math.floor(numberMap[9]) !== ( (10 - (chk % 10) ) % 10)){
|
|
| 54 |
+ alert("사업자 번호가 유효하지 않습니다.");
|
|
| 55 |
+ return false; |
|
| 56 |
+ } |
|
| 57 |
+ }else{
|
|
| 58 |
+ alert("사업자 번호가 유효하지 않습니다.");
|
|
| 59 |
+ return false; |
|
| 60 |
+ } |
|
| 34 | 61 |
|
| 35 | 62 |
if(doubleSubmitFlag){
|
| 36 | 63 |
alert("이미 재등록하셨습니다.");
|
| 37 | 64 |
return false; |
| 38 | 65 |
}else{
|
| 66 |
+ |
|
| 67 |
+ form.bizNo.value = form.bizNo.value.replace(/-/gi, "").trim(); |
|
| 68 |
+ |
|
| 39 | 69 |
var _fileForm2 = new Array(); |
| 40 | 70 |
var data = new FormData(form); |
| 41 | 71 |
_fileForm2.forEach(function(obj, idx) {
|
... | ... | @@ -75,6 +105,56 @@ |
| 75 | 105 |
$('#atFileBasicWriteWork').val(obj.value);
|
| 76 | 106 |
} |
| 77 | 107 |
|
| 108 |
+//사업자등록번호 - 넣기 |
|
| 109 |
+function bizNo(str){
|
|
| 110 |
+ str = str.replace(/[^0-9]/g, ''); |
|
| 111 |
+ var tmp = ''; |
|
| 112 |
+ if(str.length < 4){
|
|
| 113 |
+ return str; |
|
| 114 |
+ }else if(str.length < 7){
|
|
| 115 |
+ tmp += str.substr(0, 3); |
|
| 116 |
+ tmp += '-'; |
|
| 117 |
+ tmp += str.substr(3); |
|
| 118 |
+ return tmp; |
|
| 119 |
+ }else{
|
|
| 120 |
+ tmp += str.substr(0, 3); |
|
| 121 |
+ tmp += '-'; |
|
| 122 |
+ tmp += str.substr(3, 2); |
|
| 123 |
+ tmp += '-'; |
|
| 124 |
+ tmp += str.substr(5); |
|
| 125 |
+ return tmp; |
|
| 126 |
+ } |
|
| 127 |
+ return str; |
|
| 128 |
+} |
|
| 129 |
+ |
|
| 130 |
+//사업자등록번호 확인 |
|
| 131 |
+function bizNoCheck(){
|
|
| 132 |
+ var numberMap = $("#bizNo").val().replace(/-/gi, '').split('').map(function (d){
|
|
| 133 |
+ return parseInt(d, 10); |
|
| 134 |
+ }); |
|
| 135 |
+ |
|
| 136 |
+ if(numberMap.length == 10){
|
|
| 137 |
+ var keyArr = [1, 3, 7, 1, 3, 7, 1, 3, 5]; |
|
| 138 |
+ var chk = 0; |
|
| 139 |
+ |
|
| 140 |
+ keyArr.forEach(function(d, i){
|
|
| 141 |
+ chk += d * numberMap[i]; |
|
| 142 |
+ }); |
|
| 143 |
+ |
|
| 144 |
+ chk += parseInt((keyArr[8] * numberMap[8])/ 10, 10); |
|
| 145 |
+ console.log(chk); |
|
| 146 |
+ if(Math.floor(numberMap[9]) === ( (10 - (chk % 10) ) % 10)){
|
|
| 147 |
+ alert("사업자등록번호 확인이 완료되었습니다.");
|
|
| 148 |
+ return false; |
|
| 149 |
+ }else{
|
|
| 150 |
+ alert("사업자 번호가 유효하지 않습니다.");
|
|
| 151 |
+ return false; |
|
| 152 |
+ } |
|
| 153 |
+ } |
|
| 154 |
+ alert("사업자 번호가 유효하지 않습니다.");
|
|
| 155 |
+ return false; |
|
| 156 |
+} |
|
| 157 |
+ |
|
| 78 | 158 |
</script> |
| 79 | 159 |
<div class="inner"> |
| 80 | 160 |
<!-- send top --> |
... | ... | @@ -87,9 +167,9 @@ |
| 87 | 167 |
<input type="hidden" name="mberId" value="${cmpChangeManageVO.mberId}"/>
|
| 88 | 168 |
<input type="hidden" name="uniqId" value="${cmpChangeManageVO.uniqId}"/>
|
| 89 | 169 |
<input type="hidden" name="bizType" value="${cmpChangeManageVO.bizType}"/>
|
| 90 |
- <input type="hidden" name="mberNm" value="${cmpChangeManageVO.mberNm}"/>
|
|
| 170 |
+ <%-- <input type="hidden" name="mberNm" value="${cmpChangeManageVO.mberNm}"/>
|
|
| 91 | 171 |
<input type="hidden" name="ceoNm" value="${cmpChangeManageVO.ceoNm}"/>
|
| 92 |
- <input type="hidden" name="bizNo" value="${cmpChangeManageVO.bizNo}"/>
|
|
| 172 |
+ <input type="hidden" name="bizNo" value="${cmpChangeManageVO.bizNo}"/> --%>
|
|
| 93 | 173 |
<input type="hidden" name="managerNm" value="${loginVO.name}"/> <!-- 담당자 명 -->
|
| 94 | 174 |
<input type="hidden" name="atchFileSttus" id="atchFileSttus" value="${cmpChangeManageVO.atchFileSttus}"/>
|
| 95 | 175 |
<input type="hidden" name="workAtchFileSttus" id="workAtchFileSttus" value="${cmpChangeManageVO.workAtchFileSttus}"/>
|
... | ... | @@ -123,13 +203,15 @@ |
| 123 | 203 |
<div class="input_list_item"> |
| 124 | 204 |
<div class="input_left">회사명</div> |
| 125 | 205 |
<div class="input_right"> |
| 126 |
- <c:out value='${cmpChangeManageVO.mberNm}'/>
|
|
| 206 |
+ <%-- <c:out value='${cmpChangeManageVO.mberNm}'/> --%>
|
|
| 207 |
+ <input type="text" class="list_inputType1" name="mberNm" id="mberNm" value="<c:out value='${cmpChangeManageVO.mberNm}'/>" maxlength="30" />
|
|
| 127 | 208 |
</div> |
| 128 | 209 |
</div> |
| 129 | 210 |
<div class="input_list_item"> |
| 130 | 211 |
<div class="input_left">대표</div> |
| 131 | 212 |
<div class="input_right"> |
| 132 |
- <c:out value='${cmpChangeManageVO.ceoNm}'/>
|
|
| 213 |
+ <%-- <c:out value='${cmpChangeManageVO.ceoNm}'/> --%>
|
|
| 214 |
+ <input type="text" class="list_inputType1 onlyC" name="ceoNm" id="ceoNm" value="<c:out value='${cmpChangeManageVO.ceoNm}'/>" maxlength="50" />
|
|
| 133 | 215 |
</div> |
| 134 | 216 |
</div> |
| 135 | 217 |
<div class="input_list_item"> |
... | ... | @@ -143,7 +225,10 @@ |
| 143 | 225 |
<div class="input_left">사업자등록번호</div> |
| 144 | 226 |
<div class="input_right"> |
| 145 | 227 |
<label for="" class="label">사업자등록번호 입력</label> |
| 146 |
- <c:out value='${fn:substring(cmpChangeManageVO.bizNo, 0, 3)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 3, 5)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 5, 10)}'/>
|
|
| 228 |
+ <input type="text" class="list_inputType1" name="bizNo" id="bizNo" value="<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 0, 3)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 3, 5)}'/>-<c:out value='${fn:substring(cmpChangeManageVO.bizNo, 5, 10)}'/>" maxlength="12">
|
|
| 229 |
+ <div class="list_btn_wrap"> |
|
| 230 |
+ <button type="button" onclick="bizNoCheck(); return false;">사업자등록번호 확인</button> |
|
| 231 |
+ </div> |
|
| 147 | 232 |
</div> |
| 148 | 233 |
</div> |
| 149 | 234 |
<div class="input_list_item"> |
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?