From 761055c02e9b67a438d1837683988ce01078f53b Mon Sep 17 00:00:00 2001 From: jjh Date: Mon, 14 Aug 2023 16:36:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=AF=BC=EC=9B=90=20=EC=A0=91=EC=88=98=20?= =?UTF-8?q?=EC=9E=90=EB=A3=8C=20=EC=97=90=EC=84=9C=20=EB=B6=80=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=EB=A5=BC=20=ED=98=B8=EC=B6=9C=ED=96=88?= =?UTF-8?q?=EC=9D=84=EB=95=8C=20=EB=93=B1=EB=A1=9D=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=ED=95=98=EB=8A=94=20create=20URL=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java | 5 +++-- src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp | 5 ++--- src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java index f7cd460b..f841fd5b 100644 --- a/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java +++ b/src/main/java/cokr/xit/fims/excl/web/Excl01Controller.java @@ -78,7 +78,7 @@ public class Excl01Controller extends ApplicationController { * } */ @RequestMapping(name = "부과제외 정보 조회", value = "/020/info.do") - public ModelAndView getLevyExclInfo(Excl01Query req) { + public ModelAndView getLevyExclInfo(String openerPageName, Excl01Query req) { DataObject levyExclInfo = excl01Service.getLevyExclInfo(req); if (req.getLevyExclId() == null && !levyExclInfo.string("LEVY_EXCL_ID").equals("")) { @@ -99,7 +99,8 @@ public class Excl01Controller extends ApplicationController { addCodes(commonCodes, mav, "FIM021", "FIM022", "FIM054"); return mav - .addObject("pageName", "excl01020") + .addObject("openerPageName", openerPageName) // 호출했던 Page Name + .addObject("pageName", "excl01020") // .addObject("FIM021List", commonCodes.get("FIM021")) // 부과 제외 구분 코드(LEVY_EXCL_SE_CD) .addObject("FIM022List", commonCodes.get("FIM022")) // 부과 제외 사유 코드(LEVY_EXCL_RSN_CD) .addObject("FIM054List", commonCodes.get("FIM054")) // 업무 구분 코드(TASK_SE_CD) diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index 159af05f..7aad4f81 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -287,9 +287,8 @@ , appendData : true , urls : { load : wctx.url(prefixUrl + "/010/list.do") // 검색 - , getInfo : wctx.url(prefixUrl + "/020/info.do") // 등록 및 수정 팝업 - , create : wctx.url(prefixUrl + "/020/create.do") // 신규 등록 - , update : wctx.url(prefixUrl + "/020/update.do") // 자료 수정 +// , getInfo : wctx.url(prefixUrl + "/020/info.do") // 등록 및 수정 팝업 + , getInfo : wctx.url(prefixUrl + "/020/info.do?openerPageName=${pageName}") // 등록 및 수정 팝업 // , remove : wctx.url(prefixUrl + "/010/remove.do") // 자료 삭제 , remove : wctx.url(prefixUrl + "/010/removes.do") // 선택(체크) 자료 삭제 } 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 f575faaf..e757aeb5 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 @@ -73,6 +73,8 @@ // 공통 코드 var FIM021 = new CommonCodes(${FIM021}, true); var FIM022 = new CommonCodes(${FIM022}, true); + // 호출한 Page Name + var openerPageName = "${openerPageName}"; /************************************************************************** * DatasetControl @@ -114,6 +116,11 @@ let item = ${pageName}Control.getCurrent("item"); let create = isEmpty(info.levyExclId); + // 민원 접수 관리에서 호출했다면.. URL 주소를 변경한다. + if (create && openerPageName == "cvlc01020-info") { + ${pageName}Control.urls.create = "/cvlc/cvlc01/020/save.do"; + } + ajax.post({ url : !create ? ${pageName}Control.urls.update : ${pageName}Control.urls.create , data : info