From ef8ca6877ed69e0d7c1888498269e8a51aa81849 Mon Sep 17 00:00:00 2001 From: leebj Date: Thu, 8 Aug 2024 10:48:20 +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=EC=95=84=EC=9D=B4=EB=94=94=20=EC=B0=BE=EB=8A=94=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp | 2 +- src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp | 1 + src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01010-main.jsp | 8 +++----- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp | 6 +++--- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp | 5 +---- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01120-info.jsp | 2 +- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01140-info.jsp | 2 +- src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01150-info.jsp | 2 +- src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js | 3 +++ 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp index b704bfc4..fa2a31e1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp @@ -156,7 +156,7 @@ $(document).ready(function(){ focusClose(); } }); - dialog.close("overTimeProcessDialog--${openerPageName}"); + dialog.close($P.selfDlgId()); if ("${savedCallbackFuncName}" != "") { ${savedCallbackFuncName}(resp.saved); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp index fbffa9a2..1328073d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp @@ -484,6 +484,7 @@ $(document).ready(function(){ content : resp, size : "xxl", init : () => { + var parentRes = new Object(); var childReq = pageObject.childReq.pop(); 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 178a6dc1..ad886a2a 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 @@ -436,7 +436,7 @@ $(document).ready(function() { , size : "xl" , content : resp , init : () => { - $("#"+dialogId).find("input[name='dialogId']").val(dialogId); + var found = $("#"+dialogId).find("table template")[0].innerHTML; var trs = cur.inStrings(found, null); $("#"+dialogId).find("tbody").html(trs.join()); @@ -480,7 +480,7 @@ $(document).ready(function() { , content : resp , init : () => { - $("#"+dialogId).find("input[name='dialogId']").val(dialogId); + var found = $("#"+dialogId).find("table template")[0].innerHTML; var trs1 = upDataset.inStrings(found, null); var trs2 = downDataset.inStrings(found, null); @@ -522,7 +522,6 @@ $(document).ready(function() { , content : resp , init : () => { - $("#"+dialogId).find("input[name='dialogId']").val(dialogId); var found = $("#"+dialogId).find("table template")[0].innerHTML; var trs = upDataset.inStrings(found, null); $("#"+dialogId).find("tbody").html(trs.join()); @@ -599,7 +598,7 @@ $(document).ready(function() { content : resp, init : () => { - $("#"+dialogId).find("input[name='dialogId']").val(dialogId); + var found = $("#"+dialogId).find("table template")[0].innerHTML; var trs = upDataset.inStrings(found, null); $("#"+dialogId).find("tbody").html(trs.join()); @@ -654,7 +653,6 @@ $(document).ready(function() { content : resp, init : () => { - $("#"+dialogId).find("input[name='dialogId']").val(dialogId); var found = $("#"+dialogId).find("table template")[0].innerHTML; var trs = upDataset.inStrings(found, null); $("#"+dialogId).find("tbody").html(trs.join()); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp index 7a859838..819a56a8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01100-info.jsp @@ -41,7 +41,7 @@
- +
@@ -96,8 +96,8 @@ $(document).ready(function(){ success : (resp) => { if(resp.saved){ alert("저장되었습니다."); - var dialogId = $P.$find("frmEdit").find("input[name='dialogId']").val(); - dialog.close(dialogId); + + dialog.close($P.selfDlgId()); } } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp index 3c4a4df1..c0d378d8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01110-info.jsp @@ -68,10 +68,7 @@
- - - -
+ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01120-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01120-info.jsp index b5002b1b..66b4449b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01120-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01120-info.jsp @@ -65,7 +65,7 @@
- +
- +
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 6f183df0..d2da0a57 100644 --- a/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js +++ b/src/main/webapp/resources/js/fims/cmmn/fims-cmmnUtil.js @@ -17,6 +17,9 @@ class DoctxFinder extends EventTarget { selfElement(){ return document.querySelector("[data-doctx='"+this.doctx+"']"); } + selfDlgId(){ + return $(this.selfElement()).parents(".modal")[0].id; + } $find(name){ return $(document.querySelector("[data-doctx='"+this.doctx+"']")).find("[name='"+name+"']"); }