From 64786effe04738c064e8e837f4cea949f82141f1 Mon Sep 17 00:00:00 2001
From: wyh <mail>
Date: Thu, 12 Oct 2023 17:59:22 +0900
Subject: [PATCH] =?UTF-8?q?3=EB=8B=A8=EA=B3=84=20=EC=B2=AD=EA=B5=AC?=
 =?UTF-8?q?=EC=B7=A8=EC=A7=80,=20=EC=B2=AD=EA=B5=AC=EC=9B=90=EC=9D=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml  |  2 +
 .../web/kccadr/adjst/adjstReqRegistStep3.jsp  | 37 ++++++++-----------
 .../adjst/popup/adjstReqOpenExamplePop.jsp    | 27 ++++++++------
 .../adjst/popup/adjstReqOpenExamplePop2.jsp   | 11 +++---
 .../kccadr/kccadrCom/kccadrConstantsJsp.jsp   |  1 +
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml
index fd5bfc20..adbcbdc6 100644
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgr/AdjReqMgr_SQL_Mysql.xml
@@ -470,6 +470,8 @@
 			AGNT_YN AS agntYn,
 			RPPL_USR_TY AS rpplUsrTy,
 			ADR_OL_YN AS adrOlYn,
+			RPPL_RELATION AS rpplRelation,
+			RPPL_RELATION_ETC AS rpplRelationEtc,
 			RPPL_ID AS rpplId,
 			RPPL_NM AS rpplNm,
 			RPPL_BIZ_ID AS rpplBizId,
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp
index 0f925110..0f314edf 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReqRegistStep3.jsp
@@ -46,7 +46,7 @@
 	}
 </style>
 <%-- <un:useConstants var="KccadrConstants" className="kcc.kccadr.cmm.KccadrConstants" /> --%>
-<script src="/tabulator/jquery-ui-1.13.2.custom/jquery-ui.min.js"/>
+<!-- <script src="/tabulator/jquery-ui-1.13.2.custom/jquery-ui.min.js"/> -->
 <script type="text/javaScript" language="javascript">
 
 $( document ).ready(function(){
@@ -57,7 +57,6 @@ $( document ).ready(function(){
 	if(editData != ""){
 		AdjstReq.EDIT_DATA = eval("("+editData+")");
 	}
-	<%--AdjstReq.STATUS = '${not empty master ? master.statCd : ''}';--%>
 	AdjstReq.STATUS = "<c:out value="${not empty master ? master.statCd : ''}" />";
 
 	// 페이지 로드 업무 프로세스
@@ -140,15 +139,11 @@ function fn_adjstReq_preview() {
 					</td>
 				</tr>
 				<tr>
-					<th scope="row">
+					<th scope="row" class="callingdata_row">
 						<p class="req_text"><span>필수입력 항목</span>*</p>
-						<div class="hover_content_wrap" style="display: inline-block;">
-							신청취지
-							<div class="hover_content_box">
-	                       		조정을 통해 궁극적으로 얻고자 하는 결과
-	                       	</div>
-						</div>
+						<p>신청취지</p>
 						<button class="btnType01 btn_adr_search examBtn" data-tooltip="fee_info_popup" onclick="AdjstReq.openExamplePop('01'); return false;" title="예문 팝업 열림">예문</button>
+						<span>조정을 통해 궁극적으로<br> 얻고자 하는 결과</span>
 					</th>
 					<td>
 						<label for="reqCn1" class="label">신청취지 입력</label>
@@ -156,18 +151,14 @@ function fn_adjstReq_preview() {
 					</td>
 				</tr>
 				<tr>
-					<th scope="row">
+					<th scope="row" class="callingdata_row">
 						<p class="req_text"><span>필수입력 항목</span>*</p>
-						<div class="hover_content_wrap" style="display: inline-block;">
-							신청이유
-							<div class="hover_content_box">
-	                       		조정신청에 이르게 된 사건의 배경<br>(객관적 사실 위주로 기술)
-	                       	</div>
-						</div>
+						<p>신청 원인</p>
 						<button class="btnType01 btn_adr_search examBtn" data-tooltip="fee_info_popup" onclick="AdjstReq.openExamplePop('02'); return false;" title="예문 팝업 열림">예문</button>
+						<span>조정신청에 이르게 된 사건의 배경<br>(객관적 사실 위주로 기술)</span>
 					</th>
 					<td>
-						<label for="reqCn2" class="label">신청이유 입력</label>
+						<label for="reqCn2" class="label">신청 원인 입력</label>
 						<textarea name="reqCn2" id="reqCn2" cols="30" rows="10" cssClass="purpose_text"><c:out value='${master.reqCn2}' /></textarea>
 					</td>
 				</tr>
@@ -179,7 +170,8 @@ function fn_adjstReq_preview() {
 					</th>
 					<td id="uploadWarp" class="upload_area">
 						<label for="fileNm" class="label">첨부파일 선택</label>
-						<input type="text" id="fileNm" size="30" class="file_input" readonly><button type="button" class="btnType01 btn_add_file">파일 첨부하기</button>(*파일 종류 및 수량에 제한이 없습니다.)
+						<input type="text" id="fileNm" size="30" class="file_input" readonly>
+						<button type="button" class="btnType01 btn_add_file">파일 첨부하기</button>(파일 종류에 제한이 없습니다. 50MB 이하)
 						<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none;"/>
 						<div class="file_wrap file_upload_box no_img_box">
 							<table class="tbType02">
@@ -256,8 +248,9 @@ function fn_adjstReq_preview() {
 		</div>
 		<!-- 하단 버튼 -->
 		<div class="btn_wrap btn_layout03">
-<!-- 			<div class="btn_left"><button type="button" class="btnType04 btn_move" onclick="fncGoPrev();">2단계이동</button></div> -->
-			<div class="btn_left"><button type="button" class="btnType04 btn_move" onclick="AdjstReq.step3Save('<c:out value='${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}' />'); return false;">2단계이동</button></div>
+			<div class="btn_left">
+				<button type="button" class="btnType04 btn_move" onclick="AdjstReq.step3Save('<c:out value='${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}' />'); return false;">2단계이동</button>
+			</div>
 			<div class="btn_right">
 				<button type="button" class="btnType06 btn_preview" onclick="fn_adjstReq_preview(); return false;" title="새창열림">미리보기</button>
 				<c:choose>
@@ -271,8 +264,8 @@ function fn_adjstReq_preview() {
 				<div class="hover_content_wrap" style="display: inline-block;">
 					<button type="button" class="btnType02 btn_save" onClick="AdjstReq.step3Save('<c:out value='${KccadrConstants.ADR_MODE_SMT}' />'); return false;">조정신청서 제출</button>
 					<div class="hover_content_box">
-                   		 [조정신청서 제출 – 조정조사관 검토 – 수수료납부요청 – 수수료납부]의 절차가 완료되어야 조정신청 접수가 최종 완료됩니다.
-                   	</div>
+						[조정신청서 제출 – 조정조사관 검토 – 수수료납부요청 – 수수료납부]의 절차가 완료되어야 조정신청 접수가 최종 완료됩니다.
+					</div>
 				</div>
 			</div>
 		</div>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp
index ae0eeca1..8c942358 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp
@@ -33,23 +33,22 @@ $(document).ready(function(){
 		$(".mask").hide();
 	});
 	/* $(".popup_wrap").css("position","absolute"); */
-	$(".popup_wrap").draggable();
+	/* $(".popup_wrap").draggable(); */
 });
 
 // 신청취지 텍스트에 추가
-function addText(obj, exmpCd){
+function addText(exmpCd){
 	// 답변서 code == 04
 	if(exmpCd == '04')
 	{
-		$('#adrDocCn1').text(obj.text);
+		$('#adrDocCn1').val($('#exmpVal').val().trim().replaceAll("<br/>", "\r\n"));
 		$(".tooltip-close").trigger("click");
-		
 	}
 	else
 	{
-		$('#reqCn1').text($('#reqCn1').text().trim()+' '+obj.text);
+		$('#reqCn1').val($('#exmpVal').val().trim().replaceAll("<br/>", "\r\n"));
+		$(".tooltip-close").trigger("click");
 	}
-	
 }
 		
 </script>
@@ -66,7 +65,7 @@ function addText(obj, exmpCd){
 			<c:set var="titleText" value="답변서" />
 		</c:when>
 		<c:otherwise>
-			<c:set var="titleText" value="청구취지" />
+			<c:set var="titleText" value="신청취지" />
 		</c:otherwise>
 	</c:choose>
 
@@ -75,21 +74,25 @@ function addText(obj, exmpCd){
         <p>${titleText } 작성예시</p> <button class="btn_popup_close tooltip-close" data-focus="fee_info_popup_close" title="팝업 닫기"><i></i></button>
     </div>
     <div class="popup_cont">
-    	<c:forEach var="list" items="${exmpList}" varStatus="status" begin="1" end="1">
+    	<c:forEach var="list" items="${exmpList}" varStatus="status" begin="0" end="0">
 	   		<div class="work_flow_wrap">
 	        	<div class="work_tit">
-	        		<p>예문 예시</p>
+<!-- 	        		<p>예문 예시</p> -->
 <!-- 	        		<button type="button" title="열림" class="btn_open"><i></i></button> -->
 	        	</div>
 	        	<div class="work_cont">
 	        		<div class="text">
-        				<a href="javascript:;" onclick="addText(this, '${exmpCd}'); return false;" title="신청취지 입력"><c:out value="${list.exmpCn}"/></a>
+        				<a href="javascript:;" onclick="addText('${exmpCd}'); return false;" title="신청취지 입력">
+<%--         					<c:out value="${list.exmpCn}"/> --%>
+							<input type="hidden" id="exmpVal" value="<c:out value="${list.exmpCn}" escapeXml="false" />">
+        					<c:out value="${fn:replace(list.exmpCn, crlf , '<br/>')}" escapeXml="false" />
+       					</a>
         			</div>
 	        	</div>
 	        </div>
     	</c:forEach>
         <div class="btn_wrap">
-            <button class="btnType01 tooltip-close" data-focus="fee_info_popup_close" data-focus-next="fee_info_popup">닫기</button>
+            <button class="btnType01 " onclick="addText('${exmpCd}'); return false;"  data-focus-next="fee_info_popup">붙여넣기</button>
         </div>
     </div>
 <%--
@@ -103,7 +106,7 @@ function addText(obj, exmpCd){
 	        	</div>
 	        	<div class="work_cont">
 	        		<div class="text">
-        				<a href="javascript:;" onclick="addText(this, '${exmpCd}'); return false;" title="신청취지 입력"><c:out value="${list.exmpCn}"/></a>
+        				<a href="javascript:;" onclick="addText('${exmpCd}'); return false;" title="신청취지 입력"><c:out value="${list.exmpCn}"/></a>
         			</div>
 	        	</div>
 	        </div>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp
index 87946379..a1b4cc5f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop2.jsp
@@ -40,14 +40,14 @@ $(document).ready(function(){
 // 		console.log(exmpCd.replace(/(^0+)/, "")); 
 		var perId = '#reqCn'+exmpCd.replace(/(^0+)/, "");
 		console.log('perId : ', perId);
-		$(perId).val($('#exmpCn').text().trim());
+		$(perId).val($('#exmpVal').val().trim().replaceAll("<br/>", "\r\n"));
 		
 		var activeTarget = $('[data-tooltip-con="fee_info_popup"]');
 		activeTarget.remove();
 		$(".mask").hide();
 	});
 	
-	$(".popup_wrap").draggable();
+	/* $(".popup_wrap").draggable(); */
 })
 </script>
 </head>
@@ -59,9 +59,9 @@ $(document).ready(function(){
     </div>
     <div class="popup_cont">
         <c:if test="${not empty exmp.exmpCd}">
-            <div class="cont_tit03">
+            <%-- <div class="cont_tit03">
                 * <kc:code codeId="CC040" code="${exmp.exmpCd}"/>
-            </div>
+            </div> --%>
         </c:if>
         <table class="popup_tbType01 t_center">
             <colgroup>
@@ -73,6 +73,7 @@ $(document).ready(function(){
                     <td colspan="2" id="exmpCn" style="line-height: 30px; text-align: left;">
                         <c:choose>
                             <c:when test="${not empty exmp.exmpCn}">
+                            	<input type="hidden" id="exmpVal" value="<c:out value="${exmp.exmpCn}" escapeXml="false" />">
                                 <c:out value="${fn:replace(exmp.exmpCn, crlf , '<br/>')}" escapeXml="false" />
                             </c:when>
                             <c:otherwise>
@@ -85,7 +86,7 @@ $(document).ready(function(){
         </table>
         <div class="btn_wrap">
 <!--             <button class="btnType01 tooltip-close" data-focus="fee_info_popup_close" data-focus-next="fee_info_popup">닫기</button> -->
-			<button class="btnType01" id="redBtn" data-focus-next="fee_info_popup">사용</button>
+			<button class="btnType01" id="redBtn" data-focus-next="fee_info_popup">붙여넣기</button>
         </div>
     </div>
 </div>
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
index de988625..495e83c9 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp
@@ -571,6 +571,7 @@ var AdjstReq  = {
 	        if(mode == "${KccadrConstants.ADR_MODE_UPT}"){
 // 	            msg = "신청인 취지/원인 정보 수정 하시겠습니까?";
 	            msg = "입력하신 신청인 취지/원인 정보 수정 하시겠습니까?";
+	            endMsg = "저장이 완료되었습니다.";
 	        }else if(mode == "${KccadrConstants.ADR_MODE_SMT}"){
 	            msg = "조정신청서를 최종 제출하시겠습니까?";
 	            endMsg = "조정신청서 제출이 완료되었습니다.";