diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp index c583d819..3d37a0aa 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp @@ -304,19 +304,21 @@ } // 주소 검색 - $P.fnSearchAddr = (title) => { - let popupWidth = 900; - let popupHeight = 700; - let popupX = (window.screen.width / 2) - (popupWidth / 2); - let popupY = (window.screen.height / 2) - (popupHeight / 2); - - window.open( - encodeURI(wctx.url("/resources/html/searchAddr.html" - + "?openerPageName=${pageName}" - )) - , "searchAddr" - , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY - ); + $P.fnSearchAddr = async(title) => { + + var resp = await fetch(wctx.url("/resources/html/searchAddr.html")); + var template = await resp.text(); + + dialog.open({ + id : "searchAddrDialog", + title: title, + size : "lg", + content: template, + init : () => { + $("#searchAddrCallback").val("pageObject['${pageName}'].callbackSearchAddr"); + } + }); + } // 첨부파일 조회 diff --git a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp index 7eadc6ab..86c02bd7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/payer/payer01020-info.jsp @@ -317,21 +317,20 @@ } // 우편번호 검색 - fnZip${pageName} = () => { - - var callbackFuncName = "fnZipReturn${pageName}"; - - var popupWidth = 900; - var popupHeight = 700; - - var popupX = (window.screen.width / 2) - (popupWidth / 2); - var popupY= (window.screen.height / 2) - (popupHeight / 2); - - window.open( - wctx.url("/resources/html/searchAddr.html"+"?callbackFuncName="+callbackFuncName) - ,"searchAddr" - ,'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY - ); + fnZip${pageName} = async() => { + + var resp = await fetch(wctx.url("/resources/html/searchAddr.html")); + var template = await resp.text(); + + dialog.open({ + id : "searchAddrDialog", + title: "주소검색", + size : "lg", + content: template, + init : () => { + $("#searchAddrCallback").val("fnZipReturn${pageName}"); + } + }); } // 우편번호 검색 결과 fnZipReturn${pageName} = (obj) => { diff --git a/src/main/webapp/resources/html/searchAddr.html b/src/main/webapp/resources/html/searchAddr.html index 12a688e2..0b4b7e11 100644 --- a/src/main/webapp/resources/html/searchAddr.html +++ b/src/main/webapp/resources/html/searchAddr.html @@ -1,37 +1,3 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -주소검색 - -
@@ -40,6 +6,7 @@
+
@@ -110,26 +77,7 @@
- - - - - - - - - - - - - - - - - - -