From dada3444b34f5124e5e3b83b014b33042db3ddbc Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Thu, 8 Aug 2024 12:41:34 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp  | 28 ++++++++++++++-----
 .../WEB-INF/jsp/fims/crdn/crdn08010-main.jsp  | 17 +++++++----
 .../WEB-INF/jsp/fims/excl/excl01020-info.jsp  |  4 +--
 .../resources/js/fims/cmmn/fims-cmmnUtil.js   | 13 ++++++++-
 4 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
index c1c7b2d1..8dcd72ec 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp
@@ -915,12 +915,18 @@ $(document).ready(function(){
 					return;
 				}
 
+				let dialogName = "levyExclDialog";
+				let dialogId = dialogName+"-"+uuid();
+				
 				dialog.open({
-					id : "levyExclDialog--${pageName}",
+					id : dialogId,
 					title : "부과제외 정보",
 					content : resp,
 					size : "md",
-					init : () => {},
+					init : () => {
+						$("#"+dialogId).attr("name", dialogName);
+						$("#"+dialogId).attr("data-ref-doctx","${pageName}");
+					},
 					onClose : () => {}
 				});
 
@@ -961,12 +967,18 @@ $(document).ready(function(){
 					return;
 				}
 
+				let dialogName = "overTimeProcessDialog";
+				let dialogId = dialogName+"-"+uuid();
+				
 				dialog.open({
-					id : "overTimeProcessDialog--${pageName}",
+					id : dialogId,
 					title : "2시간 초과 처리",
 					content : resp,
 					size : "lg",
-					init : () => {},
+					init : () => {
+						$("#"+dialogId).attr("name", dialogName);
+						$("#"+dialogId).attr("data-ref-doctx","${pageName}");
+					},
 					onClose : () => {}
 				});
 			}
@@ -974,8 +986,8 @@ $(document).ready(function(){
 	}
 
 	$P.popupSavedCallback = (saved) => {
-		if($("#levyExclDialog--${pageName}").length > 0){
-			dialog.close("levyExclDialog--${pageName}");
+		if($P.refDlgId("levyExclDialog") != ""){
+			dialog.close($P.refDlgId("levyExclDialog"));
 		}
 
 		if(saved){
@@ -1005,7 +1017,9 @@ $(document).ready(function(){
 					, title: "사용자 검색"
 					, content: resp
 					, size: "lg"
-					, init: () => { setDialogZindex(); }
+					, init: () => { 
+						setDialogZindex(); 
+					}
 				});
 			}
 		});
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp
index d9b9494c..a554471a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp
@@ -61,7 +61,7 @@
 			</div>
 			<div class="card-datatable text-nowrap">
 		        <div class="dataTables_wrapper dt-bootstrap5 no-footer">
-					<div class="table-responsive ox-scroll oy-scroll h-px-600">
+					<div name="table-responsive" class="table-responsive ox-scroll oy-scroll h-px-600">
 						<table class="table-layout-fixed datatables-ajax table table-bordered dataTable no-footer">
 							<thead class="sticky-thead">
 								<tr name="exmptnVhclTheadTr">
@@ -347,18 +347,23 @@ $(document).ready(function(){
 		fetch(wctx.url("/resources/html/inputRsnDialog.html"))
         .then(function(resp) { return resp.text(); })
         .then(function(template) {
-             dialog.open({
-                   id: "inputDelRsnDialog--${pageName}"
+			let dialogName = "inputDelRsnDialog";
+			let dialogId = dialogName + "-" + uuid();
+            dialog.open({
+                   id: dialogId
                  , title: "삭제 사유 입력"
                  , size: "lg"
                  , content: template
-                 , init: () => { setDialogZindex(); }
+                 , init: () => { 
+					setDialogZindex();
+					$("#"+dialogId).attr("name", dialogName);
+					$("#"+dialogId).attr("data-ref-doctx","${pageName}");
+				 }
                  , onOK: () => {
 
                 	 $P.fnRemove($("#reason").val());
-
                  }
-             });
+            });
         });
 
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
index e6f03f2a..4710aa12 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
@@ -132,7 +132,7 @@
 
 		// 저장 callback
 		$P.control.onSave = (resp) => {
-			let dialogTitle = $("#" + $P.control.prefix + "Dialog--${openerPageName}").find("h5.modal-title").html();
+			let dialogTitle = $($("#frmEdit--${pageName}").parents(".modal")[0]).find("h5.modal-title").html();
 			let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, dialogTitle);
 
 			// 메시지 출력
@@ -143,7 +143,7 @@
 			});
 
 			if (resp.saved) {
-				dialog.close($P.control.prefix + "Dialog--${openerPageName}");
+				dialog.close($("#frmEdit--${pageName}").parents(".modal")[0].id);
 
 				if ("${savedCallbackFuncName}" != "") {
 					${savedCallbackFuncName}(resp.saved);
diff --git a/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js b/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js
index d2da0a57..342d270c 100644
--- a/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js
+++ b/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js
@@ -18,7 +18,18 @@ class DoctxFinder extends EventTarget {
 		return document.querySelector("[data-doctx='"+this.doctx+"']");
 	}
 	selfDlgId(){
-		return $(this.selfElement()).parents(".modal")[0].id;
+		if($(this.selfElement()).parents(".modal").length > 0){
+			return $(this.selfElement()).parents(".modal")[0].id;
+		} else {
+			return "";
+		}
+	}
+	refDlgId(dlgName){
+		if($(".modal[data-ref-doctx='"+this.doctx+"'][name='"+dlgName+"']").length > 0){
+			return $(".modal[data-ref-doctx='"+this.doctx+"'][name='"+dlgName+"']")[0].id;
+		} else {
+			return "";
+		}
 	}
 	$find(name){
 		return $(document.querySelector("[data-doctx='"+this.doctx+"']")).find("[name='"+name+"']");