Merge branch 'tolag'

src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java

@@ -1709,6 +1709,15 @@ public class AdjstReqWebController {
 		String reqCn1 = adjReqVO.getReqCn1().replaceAll("\r\n", "\\\\r\\\\n");				//신청취지
 		String reqCn2 = adjReqVO.getReqCn2().replaceAll("\r\n", "\\\\r\\\\n");				//신청원인
 		
+		// 조정신청 3step 미리보기 시 신청 취지/원인에 데이터가 없으면 'null data'로 찍혀서 공백을 띄어쓰기 한칸으로 넣기_이준호_221226
+		if("".equals(reqCn1)) {
+			reqCn1 = " ";
+		}
+		
+		if("".equals(reqCn2)) {
+			reqCn2 = " ";
+		}
+		
  		
 		if(!rpplNm.equals("")) {
 			

src/main/java/kcc/kccadr/certDoc/web/CertDocController.java

@@ -96,13 +96,13 @@ public class CertDocController {
 	/**
 	 * 송달문서조회용 SNS 로그인 페이지
 	 */
-	@RequestMapping("/web/kccadr/certDoc/snsLoginPage.do")
+	/*@RequestMapping("/web/kccadr/certDoc/snsLoginPage.do")
 	public String snsLoginPage(@ModelAttribute("dlvinfoVO") DlvinfoVO dlvinfoVO, ModelMap model) throws Exception {
 		
 		model.addAttribute("info", dlvinfoVO);
 		return "/web/kccadr/login/SsoLoginUsrSns";
 		
-	}
+	}*/
 	
 	/**
 	 * 송달문서조회용 SNS 로그인 callback 페이지

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp

@@ -513,7 +513,7 @@
 					</div>
 					
 					 <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -595,7 +595,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
 					<!-- //list_상세 -->
 					<div class="btn_wrap btn_layout01">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp

@@ -372,7 +372,7 @@ $(document).ready(function() {
                     <!-- //list_상세 -->
                     
                     <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -454,7 +454,7 @@ $(document).ready(function() {
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
 					<!-- //list_상세 -->
 					

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp

@@ -614,7 +614,7 @@
                     <!-- //list_상세 -->
                     
                      <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -696,7 +696,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
                     <div class="btn_wrap btn_layout01">
                         <div class="area_left">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp

@@ -429,7 +429,7 @@
                     <!-- //list_상세 -->
                     
                     <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -511,7 +511,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
                     <div class="btn_wrap btn_layout01">
                         <div class="area_left"></div>

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp

@@ -585,7 +585,7 @@
                     <!-- //list_상세 -->
 	                
 	                <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -667,7 +667,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
                     <div class="btn_wrap btn_layout01">
                         <div class="area_left">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp

@@ -788,7 +788,7 @@
                     </div>
                     <!-- //list_상세 -->
                      <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -870,7 +870,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
 					<!-- //list_상세 -->
                     <div class="btn_wrap btn_layout01">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp

@@ -596,7 +596,7 @@
                     </div>
                     <!-- //list_상세 -->
                     <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -678,7 +678,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 	                
 					<!-- //list_상세 -->
 					

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp

@@ -437,7 +437,7 @@
                     </div>
                     <!-- //list_상세 -->
                     <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -519,7 +519,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 					<!-- //list_상세 -->
 					
                     <div class="btn_wrap btn_layout01">

src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp

@@ -508,7 +508,7 @@
                     </div>
                     <!-- //list_상세 -->
                     <!-- list_상세 -->
-	                <c:if test="${dlvCnt > 0}">
+	                <%-- <c:if test="${dlvCnt > 0}">
 		                <br><br>
 		                <p>* 송달정보 URL로 전송하기</p>
 		                <br><br>
@@ -590,7 +590,7 @@
 	                        </table>
 	                    </div>
 	                    </c:if>
-	                </c:if>
+	                </c:if> --%>
 					<!-- //list_상세 -->
 					
                     <div class="btn_wrap btn_layout01">

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp

@@ -92,7 +92,7 @@
 	                result = false;
 	                return false;
 	            }
-	            if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) {
+	            /* if (isEmpty($('input[name=rpplEmail01]').eq(idx).val())) {
 	                alert('이메일1을 입력해 주세요.');
 	                $('input[name=rpplEmail01]').eq(idx).focus();
 	                result = false;
@@ -103,7 +103,7 @@
 	                $('input[name=rpplEmail02]').eq(idx).focus();
 	                result = false;
 	                return false;
-	            }
+	            } */
 	            if (isEmpty($('select[name=rpplPhone01]').eq(idx).val())) {
 	                alert('연락처1를 입력해 주세요.');
 	                $('select[name=rpplPhone01]').eq(idx).focus();
@@ -317,18 +317,18 @@
 								</tr>
 								<tr>
 									<th scope="row">
-										<p class="req_text">
+										<!-- <p class="req_text">
 											<span>필수입력 항목</span>
 											*
-										</p>
+										</p> -->
 										<p>이메일</p>
 									</th>
 									<td>
 										<input type="hidden" name="rpplEmail_<c:out value='${status.index }' />">
 										<!-- <label for="" class="label">이메일아이디 입력</label> -->
-										<input type="text" name="rpplEmail01" title="이메일 아이디 입력" class="input_email" placeholder="이메일 입력" size="20" value="aaaaa<c:out value="${status.index }" />">
+										<input type="text" name="rpplEmail01" title="이메일 아이디 입력" class="input_email" placeholder="이메일 입력" size="20" value="aaaaa<c:out value="${status.index }" />" onkeyup="onlyAlphabetNumberEmail(this)">
 										@ <!-- <label for="" class="label">이메일공급자 입력</label> -->
-										<input type="text" name="rpplEmail02" title="이메일공급자 입력" class="input_email" placeholder="예) naver.com" size="20" value="bbbb<c:out value="${status.index }" />">
+										<input type="text" name="rpplEmail02" title="이메일공급자 입력" class="input_email" placeholder="예) naver.com" size="20" value="bbbb<c:out value="${status.index }" />" onkeyup="onlyAlphabetNumberEmail(this)">
 										<!-- <label for="" class="label">이메일공급자 선택</label> -->
 										<!-- <select name="rpplEmail03" onchange="emailSelect(this);" title="이메일공급자 선택" class="email_select">
 											<option value="">직접입력</option>
@@ -368,9 +368,9 @@
 											<option value="019">019</option>
 										</select>
 										<!-- - <label for="" class="label">핸드폰 가운데자리 입력</label> -->
-										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" title="핸드폰 가운데자리 입력" maxlength="4" name="rpplPhone02" value="123<c:out value="${status.index }" />">
+										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" title="핸드폰 가운데자리 입력" maxlength="4" name="rpplPhone02" value="123<c:out value="${status.index }" />" onkeyup="onlyNumber(this)">
 										- <!-- <label for="" class="label">핸드폰 마지막자리 입력</label> -->
-										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" title="핸드폰 마지막자리 입력" maxlength="4" name="rpplPhone03" value="123<c:out value="${status.index }" />">
+										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" title="핸드폰 마지막자리 입력" maxlength="4" name="rpplPhone03" value="123<c:out value="${status.index }" />" onkeyup="onlyNumber(this)">
 										<input type="hidden" name="rpplPhone_<c:out value='${status.index }' />">
 									</td>
 								</tr>

src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp

@@ -383,18 +383,18 @@ function fn_submit(){
 								</tr>
 								<tr>
 									<th scope="row">
-										<p class="req_text">
+										<!-- <p class="req_text">
 											<span>필수입력 항목</span>
 											*
-										</p>
+										</p> -->
 										<p>이메일</p>
 									</th>
 									<td>
 										<input type="hidden" name="rpplEmail_${status.index }" value="<c:out value="${item.rpplEmail }" />">
 										<label for="" class="label">이메일아이디 입력</label>
-										<input type="text" name="rpplEmail01" class="input_email" placeholder="이메일 입력" size="20" value="<c:out value="${item.rpplEmail01 }" />">
+										<input type="text" name="rpplEmail01" class="input_email" placeholder="이메일 입력" size="20" value="<c:out value="${item.rpplEmail01 }" />" onkeyup="onlyAlphabetNumberEmail(this)">
 										@ <label for="" class="label">이메일공급자 입력</label>
-										<input type="text" name="rpplEmail02" class="input_email" placeholder="예) naver.com" size="20" value="<c:out value="${item.rpplEmail02 }" />">
+										<input type="text" name="rpplEmail02" class="input_email" placeholder="예) naver.com" size="20" value="<c:out value="${item.rpplEmail02 }" />" onkeyup="onlyAlphabetNumberEmail(this)">
 										<label for="" class="label">이메일공급자 선택</label>
 										<%-- <select name="rpplEmail03" onchange="emailSelect(this);" class="email_select">
 											<option value="">직접입력</option>
@@ -434,9 +434,9 @@ function fn_submit(){
 											<option <c:if test="${item.rpplPhone01=='019' }">selected="selected"</c:if> value="019">019</option>
 										</select>
 										- <label for="" class="label">핸드폰 가운데자리 입력</label>
-										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" maxlength="4" name="rpplPhone02" value="<c:out value="${item.rpplPhone02 }" />">
+										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" maxlength="4" name="rpplPhone02" value="<c:out value="${item.rpplPhone02 }" />" onkeyup="onlyNumber(this)">
 										- <label for="" class="label">핸드폰 마지막자리 입력</label>
-										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" maxlength="4" name="rpplPhone03" value="<c:out value="${item.rpplPhone03 }" />">
+										<input class="input_phone" placeholder="연락처 입력" type="text" size="15" maxlength="4" name="rpplPhone03" value="<c:out value="${item.rpplPhone03 }" />" onkeyup="onlyNumber(this)">
 										<input type="hidden" name="rpplPhone_${status.index }" value="<c:out value="${item.rpplPhone }" />">
 									</td>
 								</tr>

src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp

@@ -525,9 +525,11 @@ var AdjstReq  = {
 	    },
 	    step3Save : function(mode, previewYn, adrSeq){
 	    	// previewYn : 조정신청등록 3단계 미리보기 버튼 클릭시 > 3단계 저장 처리후 팝업오픈
-	        if(!this.validStep(this.STEP)){
+	    	if(previewYn != 'Y'){
-	            return false;
+		        if(!this.validStep(this.STEP)){
-	        }
+		            return false;
+		        }
+	    	}
 	    	
 	        var data = new FormData($("#"+this.STEP)[0]);
 	        //첨부파일 등록 처리
@@ -549,12 +551,13 @@ var AdjstReq  = {
 
 	        // 등록 구분 코드 삽입..
 	        data.append("mode" , mode);
-
+	        if(previewYn != 'Y'){
-	        if(!confirm(msg)){
+		        if(!confirm(msg)){
-	        	if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 
+		        	if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지 
-                	AdjstReq.fncGoPrev();
+	                	AdjstReq.fncGoPrev();
-                }
+	                }
-	            return false;
+		            return false;
+		        }
 	        }
 
 	        var depth = this.expDivision(this.STEP);
@@ -572,7 +575,9 @@ var AdjstReq  = {
 	            cache: false,
 	            success: function (returnData, status) {
 	                if(returnData.result == 'SUCCESS'){
-	                    alert(endMsg);
+	                	if(previewYn != 'Y'){
+	                    	alert(endMsg);
+	                	}
 	                    $("#atchFileId").val(returnData.rsVO.atchFileId);
 	                    if(mode == "${KccadrConstants.ADR_MODE_SMT}"){
 	                        AdjstReq.fncGoMyAdjstListPage();