From d4a155d30e70dd709dc2c16e33d8331bbe285b04 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 23 Jun 2023 08:54:33 +0900
Subject: [PATCH] =?UTF-8?q?html=EC=9A=94=EC=86=8C=20id=20=EC=A4=91?=
 =?UTF-8?q?=EB=B3=B5=EB=90=9C=20=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  | 45 ++++++++++---------
 .../WEB-INF/jsp/fims/crdn/crdn06030-main.jsp  |  9 ++--
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
index 0f00463c..23065042 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp
@@ -59,21 +59,16 @@
 				                            </select>
 				                        </div>
 				                        <div class="col-12">
-				                            <label class="form-label fw-bold form-search-title">자료상태</label>
-				                            <select id="crdnSttsCd--${pageName}" name="crdnSttsCd" class="form-select">
-				                            	<option value="">전체</option>
-				                            	<c:forEach items="${FIM010List}" var="item">
-				                            		<option value="${item.code}">${item.value}</option>
-				                            	</c:forEach>
-				                            </select>
-				                                
-				                            <select id="schOpt--${pageName}" name="schOpt" class="form-select">
-				                                <option value="vhrno">차량번호</option>
-				                            </select>
-				                            <input type="text" id="schWord--${pageName}" name="schWord" class="form-control" value="" />
-
-				                            <span class="flr">
-				                                <button type="button" class="btn btn-open-detail btn-sm" data-bs-toggle="collapse" data-bs-target="#searchDetail">
+				                            <label class="form-label fw-bold form-search-title">차량번호</label>
+				                            <input type="text" id="vhrno--${pageName}" name="vhrno" class="form-control" />
+				                        </div>
+				                        <div class="col-12">
+				                        	<input type="hidden" id="by--${pageName}" name="by" />
+											<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
+											<input type="text" id="term--${pageName}" name="term" class="form-control" />
+				                        	<span class="flr">
+				                                <button type="button" class="btn btn-open-detail btn-sm" 
+				                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
 				                                    <i class="bx bx-chevron-down"></i>
 				                                    상세조회조건
 				                                </button>
@@ -86,10 +81,16 @@
 				                </div>
 				            </div>
 				        </div>
-				        <div id="searchDetail" class="container-search container-search-detail collapse">
+				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 				            <div class="row">
 					            <div class="col-12">
-					                <span class="me-5">상세조회조건</span>
+					                <label class="form-label fw-bold form-search-title">자료상태</label>
+		                            <select id="crdnSttsCd--${pageName}" name="crdnSttsCd" class="form-select">
+		                            	<option value="">전체</option>
+		                            	<c:forEach items="${FIM010List}" var="item">
+		                            		<option value="${item.code}">${item.value}</option>
+		                            	</c:forEach>
+		                            </select>
 					            </div>
 					        </div>
 				        </div>
@@ -98,7 +99,7 @@
 
 				    <div>
 				        <span class="container-page-btn">
-				            <div id="totCnt">전체 ㅣ <span></span></div>
+				            <div id="totCnt--${pageName}">전체 ㅣ <span></span></div>
 				            <span class="container-window-btn-right">
 				                선택 | n건
 				                <a href="#" class="btn btn-blue" id="" title="업무처리1">업무 처리1</a>
@@ -112,7 +113,7 @@
 				        <div id="DataTables_Table_0_wrapper--${pageName}" class="dataTables_wrapper dt-bootstrap5 no-footer">
 							<div id="table-responsive--${pageName}" class="table-responsive" 
 								style="max-width: 1200px;overflow-x: scroll;height:400px;overflow-y: scroll;border-width: 1px">
-								<table id="DataTables_Table_0"
+								<table id="DataTables_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer" 
 									aria-describedby="DataTables_Table_0_info"
 									>
@@ -241,7 +242,9 @@ $(document).ready(function(){
 		
 		return {
 			taskSeCd: form.find("[name='taskSeCd']:checked").val()
-			,[form.find("[name='schOpt']").val()]: form.find("[name='schWord']").val()
+			,vhrno : form.find("[name='vhrno']").val()
+			,by : form.find("[name='by']").val()
+			,term : form.find("[name='term']").val()
 		    ,schDateOpt: form.find("[name='schDateOpt']").val()
 		    ,schDateFrom: form.find("[name='schDateFrom']").val()
 		    ,schDateTo: form.find("[name='schDateTo']").val()
@@ -284,6 +287,8 @@ $(document).ready(function(){
 	    { header: 'interfaceSeqN', 	name: 'INTERFACE_SEQN', 	 hidden: true }
 	];
 	thisPO.gridOptions = {
+		by : 'by--${pageName}',
+		byOutput : 'byOutput--${pageName}',
 	    theadTr: 'crdnTheadTr--${pageName}',
 	    rowHeader: 'No.',
 	    trDataKey: 'CRDN_ID',
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index ac39b0b9..109e55e1 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -52,7 +52,8 @@
 											<input type="text" id="byOutput--${pageName}" class="form-control" readonly value="동적 검색" />
 											<input type="text" id="term--${pageName}" name="term" class="form-control" />
 				                        	<span class="flr">
-				                                <button type="button" class="btn btn-open-detail btn-sm" data-bs-toggle="collapse" data-bs-target="#searchDetail">
+				                                <button type="button" class="btn btn-open-detail btn-sm" 
+				                                	data-bs-toggle="collapse" data-bs-target="#searchDetail--${pageName}">
 				                                    <i class="bx bx-chevron-down"></i>
 				                                    상세조회조건
 				                                </button>
@@ -65,7 +66,7 @@
 				                </div>
 				            </div>
 				        </div>
-				        <div id="searchDetail" class="container-search container-search-detail collapse">
+				        <div id="searchDetail--${pageName}" class="container-search container-search-detail collapse">
 				            <div class="row">
 					            <div class="col-12">
 					                <span class="me-5">상세조회 조건</span>
@@ -78,7 +79,7 @@
 				    <div>
 				        <span class="container-page-btn">
 				            <a href="#" class="btn btn-blue" id="btnUpdateToConfirmData--${pageName}" title="개별 확인 자료로 수정">개별 확인 자료로 수정</a>
-				            <div id="totCnt">전체 ㅣ <span></span></div>
+				            <div id="totCnt--${pageName}">전체 ㅣ <span></span></div>
 				            <span class="container-window-btn-right">
 				                선택 | n건
 				            </span>
@@ -90,7 +91,7 @@
 				        <div id="DataTables_Table_0_wrapper--${pageName}" class="dataTables_wrapper dt-bootstrap5 no-footer">
 							<div id="table-responsive--${pageName}" class="table-responsive" 
 								style="max-width: 1200px;overflow-x: scroll;height:400px;overflow-y: scroll;border-width: 1px">
-								<table id="DataTables_Table_0"
+								<table id="DataTables_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer" 
 									aria-describedby="DataTables_Table_0_info"
 									>