From 84f26927eff666eabf5690233484ae5ef487e6fb Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 10 Jul 2023 14:49:51 +0900
Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xit/fims/crdn/web/Crdn06Controller.java   |  1 +
 .../WEB-INF/jsp/fims/crdn/crdn06010-main.jsp  |  2 +-
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp  | 83 +++++++++++--------
 3 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
index e3cc6623..674d87e0 100644
--- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
+++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java
@@ -46,6 +46,7 @@ public class Crdn06Controller extends ApplicationController {
 		ModelAndView mav = new ModelAndView();
 		mav.setViewName("fims/crdn/crdn06020-main");
 		mav.addObject("pageName", "crdn06020-main");
+		mav.addObject("module", "type='module'");
 
 		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM002", "FIM003", "FIM010", "FIM026","FIM054");
 		mav.addObject("FIM002List", commonCodes.get("FIM002"));
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 0bcbdb8d..266f7bcc 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
@@ -123,7 +123,7 @@
 				    </template>
 
 				    <div>
-				        <span class="container-page-btn">
+				        <div class="container-page-btn">
 				            <div class="d-flex flex-row justify-content-between">
 								<label id="crdnPaging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
 				                 <ul id="crdnPaging--${pageName}" class="pagination pagination-primary">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 7ea2a967..91e7a931 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -59,7 +59,7 @@
 		                            <input type="text" id="vhrno--${pageName}" name="vhrno" class="form-control" />
 		                        </div>
 		                        <div class="col-4">
-		                        	<span class="sameVehicleInspectionArea">
+		                        	<span class="area-samevehicleinspection">
 			                        	<label class="form-label fw-bold form-search-title">단속건수</label>
 			                        	<input type="text" name="schCrdnCntFrom" class="form-control w-px-50" placeholder="2" />
 			                        	~ <input type="text" name="schCrdnCntTo" class="form-control w-px-50"/>
@@ -70,11 +70,11 @@
 		                        		<input type="checkbox" name="schExclEnd" class="form-check-input" />
 		                        		서손자료제외
 									</label>
-		                        	<label class="sameVehicleInspectionArea">
+		                        	<label class="area-samevehicleinspection">
 		                        		<input type="checkbox" name="schOnlySamePlace" class="form-check-input" />
 		                        		동일장소만조회
 									</label>
-									<label class="photoInspectionArea">
+									<label class="area-photoinspection">
 		                        		<input type="checkbox" name="schOnlyUnpay" class="form-check-input" />
 		                        		미납만조회
 									</label>
@@ -125,30 +125,47 @@
 					        </div>
 				        </div>
 				    </form>
-
+					<!-- 업무별 조회조건  -->
 					<template id="taskSearchOption--${pageName}">
 						<span class="pvs">
-							<label class="photoInspectionArea">
+							<label class="area-photoinspection">
                         		<input type="checkbox" name="schExclTimeout" class="form-check-input" />
                         		2시간초과제외
 							</label>
 						</span>
 					</template>
 
-				    <div class="photoInspectionArea">
-				        <span class="container-page-btn">
-				        	<div class="d-flex flex-row justify-content-between">
-								<label id="photoInspectionPaging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
-				                 <ul id="photoInspectionPaging--${pageName}" class="pagination pagination-primary">
-				                 </ul>
-							</div>
-				            <span class="container-window-btn-right">
-								<a href="#" id="btnInstLevyExcl--${pageName}" class="btn btn-blue" title="비부과 등록">비부과 등록</a>
 
-				            </span>
-				        </span>
-				    </div>
-					<div class="card-datatable text-nowrap photoInspectionArea">
+			        <div class="container-page-btn">
+			        	<div class="d-flex flex-row justify-content-between">
+							<label id="photoInspectionPaging--${pageName}PagingInfo" 
+								class="dataTables_info area-photoinspection" role="status" aria-live="polite"></label>
+			                 <ul id="photoInspectionPaging--${pageName}" class="pagination pagination-primary area-photoinspection">
+			                 </ul>
+						</div>
+						<div class="d-flex flex-row justify-content-between">
+							<label id="sameVehicleInspectionMainPaging--${pageName}PagingInfo" 
+								class="dataTables_info area-samevehicleinspection" role="status" aria-live="polite"></label>
+			                 <ul id="sameVehicleInspectionMainPaging--${pageName}" class="pagination pagination-primary area-samevehicleinspection">
+			                 </ul>
+						</div>
+			            <span class="container-window-btn-right">
+							<a href="#" id="btnInstLevyExcl--${pageName}" class="btn btn-blue" title="비부과 등록">비부과 등록</a>
+							<span id="buttonByTaskArea--${pageName}">
+
+							</span>
+			            </span>
+			        </div>
+
+					<!-- 업무별 버튼 -->
+				    <template id="taskButton--${pageName}">
+						<span class="pvs">
+							<a href="#" id="btnInstTimeout--${pageName}" class="btn btn-blue" title="2시간초과 등록"
+								onclick="">2시간초과 등록</a>
+						</span>
+					</template>
+
+					<div class="card-datatable text-nowrap area-photoinspection">
 				        <div id="photoInspection_Table_0_wrapper--${pageName}" class="dataTables_wrapper dt-bootstrap5 no-footer">
 							<div id="photoInspection-responsive--${pageName}" class="table-responsive"
 								style="overflow-x: scroll;height:200px;overflow-y: scroll;">
@@ -199,7 +216,7 @@
 						</div>
 				    </div>
 
-					<div style="height:200px" class="photoInspectionArea">
+					<div style="height:200px" class="area-photoinspection">
 						선택자료
 						<table style="width: 100%;height: 150px;">
 							<colgroup>
@@ -218,7 +235,7 @@
 							</tbody>
 						</table>
 					</div>
-					<div style="height:200px" class="photoInspectionArea">
+					<div style="height:200px" class="area-photoinspection">
 						비교자료(선택자료의 다음 자료가 보여집니다.)
 						<table style="width: 100%;height: 150px;">
 							<colgroup>
@@ -238,19 +255,15 @@
 						</table>
 					</div>
 
-					<div class="sameVehicleInspectionArea">
+					<div class="">
 				        <span class="container-page-btn">
-				        	<div class="d-flex flex-row justify-content-between">
-								<label id="sameVehicleInspectionMainPaging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
-				                 <ul id="sameVehicleInspectionMainPaging--${pageName}" class="pagination pagination-primary">
-				                 </ul>
-							</div>
+
 				            <span class="container-window-btn-right">
 
 				            </span>
 				        </span>
 				    </div>
-					<div class="sameVehicleInspectionArea">
+					<div class="area-samevehicleinspection">
 						<div class="card-datatable text-nowrap" style="display: inline-flex;">
 					        <div id="sameVehicleInspectionMain_Table_0_wrapper--${pageName}" class="dataTables_wrapper dt-bootstrap5 no-footer">
 								<div id="sameVehicleInspectionMain-responsive--${pageName}" class="table-responsive"
@@ -340,7 +353,7 @@
 </div>
 
 <script type="module" src="<c:url value='/resources/js/fims/crdn/inspection.js?${ver}'/>"></script>
-<script type="module">
+<script ${module}>
 import InspectionControl from "<c:url value='/resources/js/fims/crdn/inspection.js?${ver}'/>";
 /**************************************************************************
  * Global Variable
@@ -443,10 +456,14 @@ $(document).ready(function(){
 		$P.sameVehicleControl.sub.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do");
 
 		var cssForTask = taskSeCd.toLowerCase();
-
+		//업무별 조회조건
 		var searchOption = document.getElementById("taskSearchOption--${pageName}").content.querySelector("."+cssForTask)?.outerHTML;
 		if(!searchOption) searchOption = "";
 		$("#searchByTaskArea--${pageName}").html(searchOption);
+		//업무별 버튼
+		var buttons = document.getElementById("taskButton--${pageName}").content.querySelector("."+cssForTask)?.outerHTML;
+		if(!buttons) buttons = "";
+		$("#buttonByTaskArea--${pageName}").html(buttons);
 
 		$('#btnPhotoInspection--${pageName}').trigger("click");
 	}
@@ -586,8 +603,8 @@ $(document).ready(function(){
     $('#btnReset--${pageName}').on('click', () => $P.fnReset()); //초기화버튼
     $('#btnPhotoInspection--${pageName}').on('click', () => {
 
-    	$(".photoInspectionArea").show();
-    	$(".sameVehicleInspectionArea").hide();
+    	$(".area-photoinspection").show();
+    	$(".area-samevehicleinspection").hide();
 
 		$('#btnPhotoInspection--${pageName}').addClass("active");
 		$('#btnSameVehicleInspection--${pageName}').removeClass("active");
@@ -595,8 +612,8 @@ $(document).ready(function(){
     });
     $('#btnSameVehicleInspection--${pageName}').on('click', () => {
 
-    	$(".sameVehicleInspectionArea").show();
-    	$(".photoInspectionArea").hide();
+    	$(".area-samevehicleinspection").show();
+    	$(".area-photoinspection").hide();
 
 		$('#btnSameVehicleInspection--${pageName}').addClass("active");
 		$('#btnPhotoInspection--${pageName}').removeClass("active");