From 325fefdbdcca3fe107ab07ff394df35fea041cdd Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Tue, 21 Nov 2023 16:14:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20>=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B0=98=EA=B0=95=ED=99=94=20>=20qna=20=ED=8D=BC=EB=B8=94=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp     | 23 +++++--
 .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 67 ++++++++++---------
 2 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
index 14d877b4..3e2e12aa 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
@@ -217,14 +217,17 @@
 				<div class="tb_tit01">
 					<p>대상자 목록</p>
 				</div>			
-				<!-- list_top -->
-				<div class="list_top search-only">
+				
+				<div class="list_top">
 					<div class="list_top_1">
+						<div class="util_left">
+							<p>구분1</p>
+						</div>
 						<div class="util_right">
 							<select name="searchStatus" id="searchStatus" class="sel_type1">
 								<option value="trgt_nm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'trgt_nm' }">selected="selected"</c:if>>이름</option>
 								<option value="d_birth" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'd_birth' }">selected="selected"</c:if>>생년월일</option>
-								<option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>기간별</option>
+								<option value="frstRegistPnttm" <c:if test="${cndtnTrgtInfoMngVO.searchStatus == 'frstRegistPnttm' }">selected="selected"</c:if>>의뢰일자</option>
 							</select>
 							
 							<div id="calendar">
@@ -237,11 +240,21 @@
 								</div>
 							</div>
 							<input type="text" id="searchKeyword" name="searchKeyword" placeholder="이름을 입력해주세요." title="검색어 입력" class="search_input" value="<c:out value='${cndtnTrgtInfoMngVO.searchKeyword}'/>">
-							<button type="button" class="btn_type08" onclick="fncGoList(); return false;">검색</button>
 <!-- 							<button class="btn_type03" onclick="fncReset(this); return false;">초기화</button> -->
 						</div>
 					</div>
-				</div>		
+					<div class="list_top_2">
+						<div class="util_left">
+							<p>구분2</p>
+						</div>
+						<div class="util_right">
+							<ve:select codeId="VEA005" name="searchReqStateCd" id="searchReqStateCd" selectedValue="${cndtnTrgtInfoMngVO.searchReqStateCd }" defaultText="의뢰상태 선택" css="class='sel_type1'" />  
+							<ve:select codeId="VEA002" name="searchEduStateCd" id="searchEduStateCd" selectedValue="${cndtnTrgtInfoMngVO.searchEduStateCd }" defaultText="교육상태 선택" css="class='sel_type1'" />
+							성별 <ve:radio codeId="COM014" name="searchSex" id="searchSex" defaultValue="" defaultText="전체" selectedValue="${cndtnTrgtInfoMngVO.searchSex }" />  
+						</div>
+						
+					</div>
+				</div>
 				
 				<div class="list_util">
 					<p class="list_util_p"><span><c:out value="${paginationInfo.totalRecordCount}" /></span>건의 접수가 검색되었습니다.</p>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
index 2892cf92..a52b3877 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp
@@ -198,46 +198,45 @@
 		</div>
 		
 		
-	<div class="btn_wrap btn_layout01">
-		<div class="btn_left">
-		</div>
-		<div class="btn_center">
-		</div>
-		<div class="btn_right">
-			<button type="button" class="btnType04" data-info="prcsAplctPrd_0000220" data-tooltip="target_confirm_popup">교육문의</button>
-		</div>
-	</div>
 		
-		<div class="tb_tit02">
-			<div class="tb_tit02_left">
-				<div class="t_best">Q&A</div>
+	<!--Q&A 내용 있을때-->
+	<div class="q_wrap">
+		<div class="btn_wrap btn_layout01">
+			<div class="tb_tit02">
+				<div class="tb_tit02_left">
+					<div class="t_best q_title">Q&amp;A</div>
+				</div>
 			</div>
-			<div class="btn_wrap1">
-<%-- 				<button type="button" title="최근 교육 목록 더보기" class="con_more" onclick="location.href='<c:url value="/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.do" />'">더보기</button> --%>
+			<div class="btn_right">
+				<button type="button" class="btnType04" data-tooltip="target_confirm_popup">교육문의</button>
 			</div>
 		</div>
 		<div class="tb_list02">
-			<div class="faq_Wrap">
+			<div class="faq_wrap">
 				<ul class="faq">
 				<c:forEach var="list" items="${qnaList}" varStatus="status">
-						<li>
+						<li <c:if test="${status.index == 0}"> class='first' </c:if>>
 							<button type="button" title="답변 열기" class="question" onclick="faqOpen(this);">
 								<p class="qst_text"><span>질문</span>Q</p>
-								<p class="qst_cont">${list.qnaCn }</p>
+                                <div>
+									<p class="qst_cont">${list.qnaCn }</p>
+                                    <p class="date">${list.frstRegistPnttm }</p>
+                                </div>
 							</button>
+							
 							<div class="answer">
 								<div class="answer_in">
 									<p class="qst_text"><span>답변</span>A</p>
-									<p class="awr_cont">
 									<c:choose>
 										<c:when test="${not empty list.qnaAnswerCn }">
-											${list.qnaAnswerCn }
+											<p class="awr_cont">${list.qnaAnswerCn }</p>
+											<p class="date">${list.lastUpdtPnttm }</p>
 										</c:when>
 										<c:otherwise>
-											내용이 없습니다.
+											<p class="awr_cont">내용이 없습니다.</p>
 										</c:otherwise>
 									</c:choose>
-									</p>
+									
 								</div>
 							</div>
 						</li>
@@ -248,14 +247,14 @@
 				</ul>
 			</div>
 		</div>
-		
+	</div>
 
 	</form:form>
 </div>
 
 <form id="qnaForm" name="qnaForm" method="post">
 	<!-- 교육대상자 확인 -->
-	<div class="tooltip-wrap">
+	<div class="tooltip-wrap q_pop">
 		<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="target_confirm_popup" data-focus="target_confirm_popup" data-focus-prev="target_confirm_popup_close">
 			<div class="popup_tit">
 				<p>교육문의하기</p>
@@ -265,16 +264,18 @@
 				<div class="cont_body">
 					<div class="pop_tb_type01" style="overflow:visible;">
 						<table>
-							<colgroup>
-								<col style="width:27%;">
-								<col style="width:auto;">
-							</colgroup>
-							<tr>
-								<th>문의내용</th>
-								<td>
-									<textarea type="text" id="qnaCn" name="qnaCn" style="height: 220px;width: 100%;"></textarea>                               
-								</td>
-							</tr>
+							<thead>
+								<tr>
+									<th>문의내용</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<td>
+									<textarea type="text" id="qnaCn" name="qnaCn" style="height: 220px;width: 100%;"></textarea>
+									</td>
+								</tr>
+							</tbody>
 						</table>
 
 					</div>