diff --git a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java index 49b9d6ed..f9177592 100644 --- a/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java +++ b/src/main/java/cokr/xit/fims/crdn/web/Crdn06Controller.java @@ -66,12 +66,13 @@ public class Crdn06Controller extends ApplicationController { /** 단속 관리 메인화면을 연다. * @return fims/crdn/crdn06010-main */ - public ModelAndView crackdownManagementMain() { + public ModelAndView crackdownManagementMain(String openType, String taskSeCd) { ModelAndView mav = new ModelAndView(); mav.setViewName("fims/crdn/crdn06010-main"); - - mav.addObject("pageName", "crdn06010"); - + mav.addObject("pageName", "crdn06010" + ifEmpty(openType, ()-> "")); + if(!ifEmpty(taskSeCd, ()-> "").equals("")) { + mav.addObject("taskSeCd", taskSeCd); + } Map> commonCodes = getCodesOf("FIM002", "FIM003", "FIM005", "FIM010", "FIM022", "FIM026", "FIM034", "FIM054"); mav.addObject("FIM003List", commonCodes.get("FIM003")); diff --git a/src/main/java/cokr/xit/fims/task/web/CmnController.java b/src/main/java/cokr/xit/fims/task/web/CmnController.java index 748ea24a..9cc75fbe 100644 --- a/src/main/java/cokr/xit/fims/task/web/CmnController.java +++ b/src/main/java/cokr/xit/fims/task/web/CmnController.java @@ -146,8 +146,8 @@ public class CmnController { */ @Override @RequestMapping(name="단속 관리 메인", value=METHOD_URL.crackdownManagementMain) - public ModelAndView crackdownManagementMain() { - return super.crackdownManagementMain(); + public ModelAndView crackdownManagementMain(String openType, String taskSeCd) { + return super.crackdownManagementMain(openType, taskSeCd); } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index d4819c44..0a9251ac 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -492,8 +492,13 @@ $(document).ready(function(){ initDetailSearchButton("frmSearch--${pageName}"); var defaultBizValue = $("#layout-navbar input[name='taskSeCd']:checked").val(); - $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true); - $P.fnResetAndChangeBiz(defaultBizValue); + if("${taskSeCd}" == ""){ + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + defaultBizValue + "']").prop("checked",true); + $P.fnResetAndChangeBiz(defaultBizValue); + } else { + $("#frmSearch--${pageName} input[name='taskSeCd'][value='" + "${taskSeCd}" + "']").prop("checked",true); + $P.fnResetAndChangeBiz("${taskSeCd}"); + } fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드 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 6f9449c8..f0d07d30 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 @@ -1059,17 +1059,23 @@ $(document).ready(function(){ url: wctx.url("/crdn/crdn06/010/main.do"), data: { openType : "D", - vhrno : $("#vhrno--${pageName}").val(), - taskSeCd : "${taskSeCd}" + taskSeCd : "${taskSeCd}", + vhrno : $("#vhrno--${pageName}").val() }, success: function(resp) { dialog.open({ id : "crdnListdialog--${pageName}", title : "동일차량 단속 내역", content : resp, - size : "xl", + size : "xxl", init : () => { setDialogZindex(); + $(document).find("div.modal").last().on('shown.bs.modal', function () { + $("#crdnListdialog--${pageName}").find("[name='schCrdnYmdFrom']").set(""); + $("#crdnListdialog--${pageName}").find("[name='schCrdnYmdTo']").set(""); + $("#crdnListdialog--${pageName}").find("[name='vhrno']").set($("#vhrno--${pageName}").val()); + $("#crdnListdialog--${pageName}").find(".btn-search").eq(0).click(); + }); }, onClose : () => {} }); @@ -1083,17 +1089,23 @@ $(document).ready(function(){ url: wctx.url("/sprt/sprt04/010/main.do"), data: { openType : "D", - vhrno : $("#vhrno--${pageName}").val(), - taskSeCd : "${taskSeCd}" + taskSeCd : "${taskSeCd}", + vhrno : $("#vhrno--${pageName}").val() }, success: function(resp) { dialog.open({ id : "cvlcptDscsnListdialog--${pageName}", title : "민원상담 내역", content : resp, - size : "xl", + size : "xxl", init : () => { setDialogZindex(); + $(document).find("div.modal").last().on('shown.bs.modal', function () { + $("#cvlcptDscsnListdialog--${pageName}").find("[name='schDscsnYmdFrom']").set(""); + $("#cvlcptDscsnListdialog--${pageName}").find("[name='schDscsnYmdTo']").set(""); + $("#cvlcptDscsnListdialog--${pageName}").find("[name='schVhrno']").set($("#vhrno--${pageName}").val()); + $("#cvlcptDscsnListdialog--${pageName}").find(".btn-search").eq(0).click(); + }); }, onClose : () => {} });