chominsoo4245 / mjon_git star
Forked from hylee / mjon_git
itn 2023-08-04
Merge branch 'jsp'
@743d2e2171fda63dae65b8b1cfd1f1c234491ab5
2f42d95
743d2e2
src/main/java/itn/let/uat/uia/web/EgovMypageController.java
--- src/main/java/itn/let/uat/uia/web/EgovMypageController.java
+++ src/main/java/itn/let/uat/uia/web/EgovMypageController.java
@@ -1003,8 +1003,10 @@
 
 				}else if("03".equals(cmpChangeManageVO.getHstSttus())) { //가장 마지막 기업회원전환이 반려 상태일 시
 
 					model.addAttribute("cmpChangeManageVO", cmpChangeManageVO);
 
 					return "web/user/membershipChangeReturn";
 
-				}
 
-				
+				}else if("02".equals(cmpChangeManageVO.getHstSttus())) { //가장 마지막 기업회원전환이 승인 상태일 시
 
+					model.addAttribute("cmpChangeManageVO", cmpChangeManageVO);
 
+					return "web/user/membershipChangeOk";
 
+				}				
 			}
 
 		}
2f42d95
743d2e2
src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp
@@ -481,8 +481,10 @@
 
 				</thead>
 
 				</table>
 
 				<div class="button_box" style="margin-top: 15px;">
 
-						<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
 
-						<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
 
+				<%-- 
+					<button type="button" class="btnType btnType20" onClick="fn_Update(); return false;" style="background-color: blue;">반려</button>
 
+					<button type="button" class="btnType btnType20" onClick="setRejectAreaCall('HIDE'); return false;">취소</button>
 
+				--%>
 
 				</div>
 
 			</form>
 
 		</div>
2f42d95
743d2e2
src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
--- src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfViewPhone.jsp
@@ -322,8 +322,10 @@
 
 					<td class="left" style="padding: 10px 0 10px 0; line-height: 1.6em;">${requiredDocuments}</td>
 
 					<td style="padding: 10px 0 10px 0; vertical-align: middle;">
 
 						<c:if test="${authYn eq 'H'}">
 
+							<%-- 
 							<button class="btnType1" onclick="updateAuthYn('<c:out value='${phmId}'/>', 'Y', '<c:out value='${userId}'/>'); return false;" style="background-color: blue;">인증완료</button>
 
 							<button class="btnType1" onclick="setRejectAreaCall('SHOW'); return false;" id="btnReject">반려 OPEN</button>
 
+							--%>
 
 						</c:if>
 
 					</td>
 
 				</tr>
 
743d2e2
src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp (added)
+++ src/main/webapp/WEB-INF/jsp/web/user/membershipChangeOk.jsp
@@ -0,0 +1,122 @@
+	<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+
+<script src="https://t1.daumcdn.net/mapjsapi/bundle/postcode/prod/postcode.v2.js"></script>
+<script language=javascript>
+$(document).ready(function(){
+	$(".fileView").children('img').remove()
+});
+
+
+var doubleSubmitFlag = false; //중복 등록 방지를 위한 변수
+function membershipChange(){
+	
+	var form = document.mberManageVO;
+	
+	 if($("#atFileBasicWrite").val() == '' && $("#atchFileSttus").val() == 'N'){
+		alert("사업자등록증을 첨부해주세요.")
+		return false;
+	}
+	if($("#atFileBasicWriteWork").val() == '' && $("#workAtchFileSttus").val() == 'N' ){
+		alert("재직증명서를 첨부해주세요.")
+		return false;
+	}
+	 
+	/* if($("#atFileBasicWriteWork").val() == ''){
+		alert("재직증명서를 첨부해주세요.")
+		return false;
+	} */
+	
+
+	if(doubleSubmitFlag){
+		alert("이미 재등록하셨습니다.");
+		return false;
+	}else{	
+		var _fileForm2 = new Array();
+		var data = new FormData(form);
+		_fileForm2.forEach(function(obj, idx) {
+			if (obj) data.append("file"+idx, obj.fileObj);
+		});
+		$.ajax({
+			cache : false
+			,url : "<c:url value='/web/user/updateMembershipChangeAjax.do'/>"
+			,async:false
+			,type : 'POST'
+			,data : data
+			,dataType:'json'
+			,processData: false
+			,contentType: false
+			,success : function(returnData, status){
+				if(returnData.result == "success") {
+					alert("기업회원전환 재등록이 완료되었습니다.");
+					doubleSubmitFlag = true;
+					 location.href='/web/user/membershipChange.do'; //마이페이지로 이동
+				} else{ 
+					alert(returnData.message);
+					return;
+				}
+			}
+			,error : function(request , status, error){
+				alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+			}
+		});
+	}
+}
+
+function changeValue(obj){ 
+	$('#atFileBasicWrite').val(obj.value);
+}
+
+function changeValueWork(obj){ 
+	$('#atFileBasicWriteWork').val(obj.value);
+}
+
+</script>
+<div class="inner">
+	<!-- send top -->
+	<div class="send_top">
+		<!-- tab button -->
+		<%@include file="/WEB-INF/jsp/web/user/mypageHeader.jsp" %>
+		<!--// tab button -->
+		<!-- 마이페이지 - 기업회원 전환 -->
+		<form id="mberManageVO" name="mberManageVO" action="/web/user/login/usrJoinInsert.do" method="post" enctype="Multipart/form-data">
+			<input type="hidden" name="mberId" value="${cmpChangeManageVO.mberId}"/>
+			<input type="hidden" name="uniqId" value="${cmpChangeManageVO.uniqId}"/>
+			<input type="hidden" name="bizType" value="${cmpChangeManageVO.bizType}"/>
+			<input type="hidden" name="mberNm" value="${cmpChangeManageVO.mberNm}"/>
+			<input type="hidden" name="ceoNm" value="${cmpChangeManageVO.ceoNm}"/>
+			<input type="hidden" name="bizNo" value="${cmpChangeManageVO.bizNo}"/>
+			<input type="hidden" name="managerNm" value="${loginVO.name}"/> <!-- 담당자 명 -->
+			<input type="hidden" name="atchFileSttus" id="atchFileSttus" value="${cmpChangeManageVO.atchFileSttus}"/>
+			<input type="hidden" name="workAtchFileSttus" id="workAtchFileSttus" value="${cmpChangeManageVO.workAtchFileSttus}"/>
+			<!-- 재등록 전 기존 첨부파일 ID, atchFIleId를 사용하지 못하는 이유 - 첨부파일 다운로드 공통(selectBBSFileInfs.do)에서 이미 name="atchFileId" 사용 -->
+			<input type="hidden" name="beforeAtchFileId" id="beforeAtchFileId" value="${cmpChangeManageVO.atchFileId}"/>
+			<input type="hidden" name="beforeWorkAtchFileId" id="beforeWorkAtchFileId" value="${cmpChangeManageVO.workAtchFileId}"/>
+			
+			<div class="mypage_content current" id="tab5_2">
+				<div class="heading">
+					<h2>기업회원 전환</h2>
+				</div>
+				<div class="mem_cont_in">
+					<div class="text_top">
+						<p>
+							고객님이 신청한 기업회원 전환신청은  <strong>승인</strong>되었습니다.<br/>재로그인해주세요.
+						</p>
+					</div>
+					
+					<br /><br />
+					<div class="mem_btnWrap2">
+						<button type="button" class="mem_btn3" style="width: 100%;" onclick="location.href='/web/uat/uia/actionLogout.do'">로그아웃</button>
+					</div>
+				</div>
+			</div>
+			<!--// 마이페이지 - 비밀번호 변경 -->
+		</form>
+	</div>
+	<!--// send top --> 
+</div>
+<!--// content 영역 -->
Add a comment
List