From 5847a4d5b117e39b152485eaa635cc9910ae7aba Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Fri, 26 Jan 2024 18:02:55 +0900
Subject: [PATCH] no message

---
 .../WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp  | 47 ++++++++++++++-----
 .../WEB-INF/jsp/fims/sprt/sprt01010-main.jsp  | 23 ++++-----
 src/main/webapp/WEB-INF/jsp/include/top.jsp   |  6 +--
 3 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
index 8817520f..8337abce 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp
@@ -66,12 +66,14 @@
 						data-maxlengthb="30" />
 				</div>
 				<div class="col-md-12">
-					<button type="button" id="btnViewCrdnList--${pageName}" class="btn btn-outline-dark float-end mx-2">
-					동일번호&nbsp;<span id="outputCrdnCount--${pageName}"></span>건
-					</button>
-					<button type="button" id="btnViewCvlcptDscsnList--${pageName}" class="btn btn-outline-dark float-end mx-2">
-					차량민원&nbsp;<span id="outputCvlcptDscsnCount--${pageName}"></span>건
-					</button>
+					<span class="float-end">
+						<button type="button" id="btnViewCrdnList--${pageName}" class="btn btn-outline-dark mx-2">
+						동일번호&nbsp;<span id="outputCrdnCount--${pageName}"></span>건
+						</button>
+						<button type="button" id="btnViewCvlcptDscsnList--${pageName}" class="btn btn-outline-dark mx-2">
+						차량민원&nbsp;<span id="outputCvlcptDscsnCount--${pageName}"></span>건
+						</button>
+					</span>
 				</div>
 				<div class="col-md-6">
 					<label for="vltnCd--${pageName}" class="w-px-130 bg-lighter pe-2 col-form-label text-sm-end">
@@ -878,7 +880,7 @@ $(document).ready(function(){
 
 	//차적조회
 	$("#vhrno--${pageName}").onEnterPress(async function(){
-
+		var taskSeCd = "${taskSeCd}";
 		var crdnYmd = $("#crdnYmd--${pageName}").val().replaceAll("-", "");
 		var vhrnoEl = event.target;
 		var vhrno = vhrnoEl.value;
@@ -909,7 +911,7 @@ $(document).ready(function(){
 		var resp = null;
 
 		//
-		resp = await countCrdnByVhrno(vhrno, "${taskSeCd}", sggCd);
+		resp = await countCrdnByVhrno(vhrno, taskSeCd, sggCd);
 		if(resp.crdnCount > 0){
 			$("#outputCrdnCount--${pageName}").html(resp.crdnCount);
 			$("#btnViewCrdnList--${pageName}").removeAttr("hidden");
@@ -918,7 +920,7 @@ $(document).ready(function(){
 		}
 		
 		//
-		resp = await countCvlcptDscsnByVhrno(vhrno, "${taskSeCd}", sggCd);
+		resp = await countCvlcptDscsnByVhrno(vhrno, taskSeCd, sggCd);
 		if(resp.cvlcptDscsnNocs.NOCS > 0){
 			$("#outputCvlcptDscsnCount--${pageName}").html(resp.cvlcptDscsnNocs.NOCS);
 			$("#btnViewCvlcptDscsnList--${pageName}").removeAttr("hidden");
@@ -996,7 +998,7 @@ $(document).ready(function(){
 		$("#addr--${pageName}").val(vehicle.road_nm_adres); //주소
 		$("#dtlAddr--${pageName}").val(vehicle.use_strnghld_adres_nm); //상세주소
 
-		if("${taskSeCd}" == "DPV"){
+		if(taskSeCd == "DPV"){
 			resp = await getVhclDisabledParkingInfo(vhrno);
 			
 			if(resp.parkingInfo.BOHUN_PARKING_PSBL_YN == "Y" || resp.parkingInfo.PARKING_PSBL_YN == "Y") {
@@ -1015,8 +1017,8 @@ $(document).ready(function(){
             url: wctx.url("/crdn/crdn06/010/main.do"),
             data: {
 				openType : "D",
-                vhrno : "",
-                taskSeCd : ""
+                vhrno : $("#vhrno--${pageName}").val(),
+                taskSeCd : "${taskSeCd}"
             },
             success: function(resp) {
             	dialog.open({
@@ -1035,7 +1037,26 @@ $(document).ready(function(){
 	
 	//민원내역 보기
 	$("#btnViewCvlcptDscsnList--${pageName}").on("click", function(){
-		
+		ajax.get({
+            url: wctx.url("/sprt/sprt04/010/main.do"),
+            data: {
+				openType : "D",
+                vhrno : $("#vhrno--${pageName}").val(),
+                taskSeCd : "${taskSeCd}"
+            },
+            success: function(resp) {
+            	dialog.open({
+					id : "cvlcptDscsnListdialog--${pageName}",
+					title : "민원상담 내역",
+					content : resp,
+					size : "xl",
+					init : () => {
+						setDialogZindex();
+					},
+					onClose : () => {}
+				});
+            }
+        });
 	});
 	
 	
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
index 08302c49..d374cde6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp
@@ -33,8 +33,7 @@ LoadScript("integrationSearchScript","/resources/js/fims/sprt/integrationSearch.
 /**************************************************************************
  * Global Variable
  **************************************************************************/
-var fastSearch = ${fastSearch};
-
+ 
 // 공통 코드
 var FIM054 = new CommonCodes(${FIM054}, true);
 
@@ -143,6 +142,8 @@ integrationSearchControl.downdataset.onSelectionChange = (selected) => {
  **************************************************************************/
 var integrationSearch = {};
 
+integrationSearch.fastSearch = ${fastSearch};
+
 integrationSearch.toast = new bootstrap.Toast(document.getElementById('divToast--${pageName}'), {
     animation: true,
     autohide: true,
@@ -844,15 +845,15 @@ $(document).ready(function() {
 
 	integrationSearch.fnResetAndChangeBiz("");
 	
-	if(fastSearch != null){
-		if(fastSearch.fastBy == "vhrno"){
-			$("#ischVhrno--${pageName}").val(fastSearch.fastTerm);
-		} else if(fastSearch.fastBy == "rtpyrNm"){
-			$("#ischRtpyrNm--${pageName}").val(fastSearch.fastTerm);
-		} else if(fastSearch.fastBy == "rtpyrNo"){
-			$("#ischRtpyrNo--${pageName}").val(fastSearch.fastTerm);
-		} else if(fastSearch.fastBy == "cvlcptAplcntNm"){
-			$("#ischCvlcptAplcntNm--${pageName}").val(fastSearch.fastTerm);
+	if(integrationSearch.fastSearch != null){
+		if(integrationSearch.fastSearch.fastBy == "vhrno"){
+			$("#ischVhrno--${pageName}").val(integrationSearch.fastSearch.fastTerm);
+		} else if(integrationSearch.fastSearch.fastBy == "rtpyrNm"){
+			$("#ischRtpyrNm--${pageName}").val(integrationSearch.fastSearch.fastTerm);
+		} else if(integrationSearch.fastSearch.fastBy == "rtpyrNo"){
+			$("#ischRtpyrNo--${pageName}").val(integrationSearch.fastSearch.fastTerm);
+		} else if(integrationSearch.fastSearch.fastBy == "cvlcptAplcntNm"){
+			$("#ischCvlcptAplcntNm--${pageName}").val(integrationSearch.fastSearch.fastTerm);
 		} else {
 			return;
 		}
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 4342e033..25a9023d 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -339,12 +339,12 @@ function fn_photoMask(flag, element){
 
 /*---------------------  통합조회 버튼 클릭 이벤트 ---------------------*/
 $("#btnFastSearch--top").on( "click", function() { 
-	doFastSearch();
+	fnGlobalFastSearch();
 });
 
-$("#fastTerm--top").onEnterPress(doFastSearch);
+$("#fastTerm--top").onEnterPress(fnGlobalFastSearch);
 
-function doFastSearch(){
+function fnGlobalFastSearch(){
 	closeTab("17");
 	
 	var itegrationSearchMenu = $("#menus").find("li[data-key='17'] a")[0];