From a7a7b5e023d724a60d7d529e787ce103b3aac49a Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 18 Apr 2025 09:29:24 +0900
Subject: [PATCH] # WARNING: head commit changed in the meantime

Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet
---
 .../seed/_extra/gtm/trublprocessmng/rceptEdit.jsp  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
index 483fd452..3b47f63b 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp
@@ -3660,7 +3660,7 @@ function nanumCall_bef(p_no, p_name, p_fileKey){
 function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4,
 		obj5, obj6, obj7, obj8, obj9, obj10, obj11, obj12, obj13, obj14, obj15){
 
-	//alert(jobID+":"+codeNo+":"+nanumSubject);
+	alert(jobID+":"+codeNo+":"+nanumSubject);
 	//alert(obj4+":"+obj5);
 	//alert(obj6+":"+obj7);
 	
@@ -5255,9 +5255,9 @@ function docOpen(obj) {
 					
 				<div class="bottom_area" style="display:flex;width:100%;gap:8px;">
 			        <button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileReqPopOpen('${caseNo}');">요구현황</button>
-<%-- 			        <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpenNew('${caseNo}');">요구현황N</button> --%>
+			        <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpenNew('${caseNo}');">요구현황N</button>
 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
-<%-- 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpenNew('${caseNo}');">출석현황N</button> --%>
+					<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpenNew('${caseNo}');">출석현황N</button>
 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="cfrnctrnsferPop();">협의회이관</button>
 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default dayLength">기간연장</button>
 <%-- 					<button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}','X-1');">요구현황(작업중)</button> --%>
@@ -5286,9 +5286,9 @@ function docOpen(obj) {
                  <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCall('31', '분쟁조정 기간연장 보고서');" style="background-color: #008299">기간연장 보고서</button>
                  <div class="bottom_area" style="display:flex;gap:8px;">
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpen('${caseNo}');">요구현황</button>
-<%-- 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpenNew('${caseNo}');">요구현황N</button> --%>
+			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpenNew('${caseNo}');">요구현황N</button>
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
-<%-- 			         <button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpenNew('${caseNo}');">출석현황N</button> --%>
+			         <button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpenNew('${caseNo}');">출석현황N</button>
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fr" onclick="cfrnctrnsferPop();">협의회이관</button>
 			         <button type="button" class="btn-default btn btn_text btn_36 gray_border fr dayLength">기간연장</button>
 <%-- 			         <button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button> --%>
@@ -5306,9 +5306,9 @@ function docOpen(obj) {
 	          <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" id="finalCheckOp1" onclick="nanumCallGeneral('16', '(피)신청인의 분쟁종료 요청사실 보고');">공정위 선보고용 종료통지</button>
 	          <button type="button" class="btn-default btn btn_text btn_36 blue_border fl" onclick="nanumCall('32', '당사자용 선보고 종료통지');">당사자용 선보고 종료통지</button>
 	          <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpen('${caseNo}');">요구현황</button>
-<%-- 	          <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpenNew('${caseNo}');">요구현황N</button> --%>
+	          <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="fileReqPopOpenNew('${caseNo}');">요구현황N</button>
 	          <button type="button" class="btn-default btn btn_text btn_36 gray_border fl" onclick="atendReqPopOpen('${caseNo}');">출석현황</button>
-<%-- 	          <button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpenNew('${caseNo}');">출석현황N</button> --%>
+	          <button type="button" class="btn btn_text btn_36 subgray_border btn-default" onclick="atendReqPopOpenNew('${caseNo}');">출석현황N</button>
 <%-- 	          <button type="button" class="btn btn_text btn_36 subgray_border btn-default"onclick="fileFirstPopOpen('${caseNo}');">요구현황(작업중)</button> --%>
 			</div>
         </c:if>