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 04eaef64..44bf3909 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 @@ -517,8 +517,8 @@ $(document).ready(function(){ $("#byOutput--${pageName}").val("동적 검색"); $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-7).date); $('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.photoInspectionControl.setData([]); - $P.sameVehicleMainControl.setData([]); + $P.photoInspectionControl.dataset.setData([]); + $P.sameVehicleMainControl.dataset.setData([]); }; $P.fnResetAndChangeBiz = (taskSeCd) => { @@ -597,8 +597,8 @@ $(document).ready(function(){ $P.photoInspectionControl.untilPageNum = $P.photoInspectionControl.query.pageNum; $P.photoInspectionControl.query.fetchSize = $P.photoInspectionControl.defaultFetchSize * $P.photoInspectionControl.query.pageNum; $P.photoInspectionControl.beforeCurrent = { - key : $P.photoInspectionControl.getCurrent()["CRDN_ID"], - index : $P.photoInspectionControl.getCurrent()["ROW_NUM"] - 1 + key : $P.photoInspectionControl.dataset.getCurrent()["CRDN_ID"], + index : $P.photoInspectionControl.dataset.getCurrent()["ROW_NUM"] - 1 }; Apply.fromDatasetControl.load($P.photoInspectionControl, 1).then((resp)=>{ @@ -641,8 +641,8 @@ $(document).ready(function(){ $P.sameVehicleMainControl.untilPageNum = $P.sameVehicleMainControl.query.pageNum; $P.sameVehicleMainControl.query.fetchSize = $P.sameVehicleMainControl.defaultFetchSize * $P.sameVehicleMainControl.query.pageNum; $P.sameVehicleMainControl.beforeCurrent = { - key : $P.sameVehicleMainControl.getCurrent()["CRDN_ID_LIST"], - index : $P.sameVehicleMainControl.getCurrent()["ROW_NUM"] - 1 + key : $P.sameVehicleMainControl.dataset.getCurrent()["CRDN_ID_LIST"], + index : $P.sameVehicleMainControl.dataset.getCurrent()["ROW_NUM"] - 1 }; Apply.fromDatasetControl.load($P.sameVehicleMainControl, 1).then((resp)=>{ @@ -939,7 +939,7 @@ $(document).ready(function(){ } dialog.open({ - id : "levyExcldialog", + id : "levyExclDialog--${pageName}", title : "부과제외 정보", content : resp, size : "md", @@ -997,6 +997,10 @@ $(document).ready(function(){ } $P.popupSavedCallback = (saved) => { + if($("#levyExclDialog--${pageName}").length > 0){ + dialog.close("levyExclDialog--${pageName}"); + } + if(saved){ $P.refreshInspectionList(); } 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 fd43bafa..f62021fe 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 @@ -168,7 +168,7 @@ $(document).ready(function(){ * 초기화 **************************************************************************/ var crdnInfo = ${crdnInfo}; - $P.crdnControl.setData([crdnInfo]); + $P.crdnControl.dataset.setData([crdnInfo]); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp index 883d4f70..9a8e817f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp @@ -189,7 +189,7 @@ $(document).ready(function(){ $("#byOutput--${pageName}").val("동적 검색"); $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); $('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.crdnControl.setData([]); + $P.crdnControl.dataset.setData([]); } $P.getParams = () => { @@ -330,7 +330,7 @@ $(document).ready(function(){ } $P.save = () => { - if(!$P.crdnControl.getCurrent()) { + if(!$P.crdnControl.dataset.getCurrent()) { dialog.alert({ content : "선택된 자료가 없습니다.", init : function(){ @@ -346,7 +346,7 @@ $(document).ready(function(){ focusOK(); }, onOK : () => { - var info = { 'crdnId' : $P.crdnControl.getCurrent()["CRDN_ID"] }; + var info = { 'crdnId' : $P.crdnControl.dataset.getCurrent()["CRDN_ID"] }; ajax.post({ url : $P.crdnControl.urls.update, data : info, diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index 4c0a3aec..cd0b575e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -139,35 +139,6 @@ $(document).ready(function(){ $P.crdnControl.urls.newInfoByFile = ""; $P.crdnControl.urls.newInfoByHand = ""; - $P.crdnControl.newInfo = (type) => { - var url = ""; - if(type == "file") url = $P.crdnControl.urls.newInfoByFile; - if(type == "hand") url = $P.crdnControl.urls.newInfoByHand; - - var dialogId = ""; - if(type == "file") dialogId = "filedialog"; - if(type == "hand") dialogId = "manualdialog"; - - var title = ""; - if(type == "file") title = "단속파일 등록"; - if(type == "hand") title = "단속자료 수기 등록"; - - - ajax.get({ - url : url, - data : {}, - success : (resp) => { - dialog.open({ - id: dialogId, - title: title, - content:resp, - size: "xxl", - init:() => {} - }); - } - }); - }; - /************************************************************************** * Dataset.on **************************************************************************/ @@ -189,7 +160,7 @@ $(document).ready(function(){ **************************************************************************/ $P.fnReset = () => { $("#regDt--${pageName}").datepicker('setDate', new Date()); - $P.crdnControl.setData([]); + $P.crdnControl.dataset.setData([]); } $P.fnResetAndChangeBiz = (taskSeCd) => { @@ -273,17 +244,46 @@ $(document).ready(function(){ } $("#crdnTbody--${pageName}").setCurrentRow(dataKey); - $P.crdnControl.setCurrent(dataKey); + $P.crdnControl.dataset.setCurrent(dataKey); Apply.toDataset.current($P.crdnControl.dataset, dataKey); } + $P.newInfo = (type) => { + var url = ""; + if(type == "file") url = $P.crdnControl.urls.newInfoByFile; + if(type == "hand") url = $P.crdnControl.urls.newInfoByHand; + + var dialogId = ""; + if(type == "file") dialogId = "fileDialog"; + if(type == "hand") dialogId = "manualDialog"; + + var title = ""; + if(type == "file") title = "단속파일 등록"; + if(type == "hand") title = "단속자료 수기 등록"; + + + ajax.get({ + url : url, + data : {}, + success : (resp) => { + dialog.open({ + id: dialogId, + title: title, + content:resp, + size: "xxl", + init:() => {} + }); + } + }); + }; + /************************************************************************** * element.on **************************************************************************/ $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $("#btnSearch--${pageName}").on("click", () => $P.searchCrdnList()); - $("#btnInsertByFile--${pageName}").on('click', () => { $P.crdnControl.newInfo("file"); }); - $("#btnInsertByHand--${pageName}").on('click', () => { $P.crdnControl.newInfo("hand"); }); + $("#btnInsertByFile--${pageName}").on('click', () => { $P.newInfo("file"); }); + $("#btnInsertByHand--${pageName}").on('click', () => { $P.newInfo("hand"); }); fnMakeResizableTable($("#table-responsive--${pageName}")[0]); fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollCrdnList); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp index d748474a..b1a089ce 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05020-info.jsp @@ -298,7 +298,7 @@ $(document).ready(function(){ //서버에 등록된 파일 조회 $P.searchFileList = () => { - $P.parsedInfoControl.setData([]); + $P.parsedInfoControl.dataset.setData([]); ajax.post({ url : wctx.url("/${taskSeCd}/crdn/crdn05/020/list.do"), @@ -306,7 +306,7 @@ $(document).ready(function(){ taskSeCd : $("#taskSeCd--${pageName}").val() }, success : (resp) => { - $P.parsedInfoControl.setData(resp); + $P.parsedInfoControl.dataset.setData(resp); } }); } @@ -370,7 +370,7 @@ $(document).ready(function(){ return; } - $P.parsedInfoControl.setCurrent(dataKey); + $P.parsedInfoControl.dataset.setCurrent(dataKey); }; $P.createCrdn = () => { @@ -426,7 +426,7 @@ $(document).ready(function(){ }; $P.deleteFile = () => { - var current = $P.parsedInfoControl.getCurrent(); + var current = $P.parsedInfoControl.dataset.getCurrent(); if(current == null) return; var fileName = current.FILE_NAME; @@ -505,7 +505,7 @@ $(document).ready(function(){ } }); - $P.parsedInfoControl.setData([]); + $P.parsedInfoControl.dataset.setData([]); }); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index 450ca1ec..aac5a610 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -498,7 +498,7 @@ $(document).ready(function(){ focusClose(); } }); - dialog.close("manualdialog"); + dialog.close("manualDialog"); } } 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 1ac0243f..9012286c 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 @@ -349,7 +349,7 @@ $(document).ready(function(){ $("#byOutput--${pageName}").val("동적 검색"); $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-365).date); $('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.crdnControl.setData([]); + $P.crdnControl.dataset.setData([]); } $P.fnResetAndChangeBiz = (taskSeCd) => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn07010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn07010-main.jsp index bd8e545a..be8ec122 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn07010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn07010-main.jsp @@ -342,13 +342,13 @@ $(document).ready(function(){ searchForm.find("input[type='text']").val(""); searchForm.find("input[type='hidden']").val(""); - $P.useTeamControl.setData([]); + $P.useTeamControl.dataset.setData([]); var editForm = $("#frmEdit--${pageName}"); editForm.find("input[type='text']").val(""); editForm.find("input[type='hidden']").val(""); - $P.delTeamControl.setData([]); + $P.delTeamControl.dataset.setData([]); } $P.fnResetAndChangeBiz = (taskSeCd) => { @@ -415,7 +415,7 @@ $(document).ready(function(){ } $P.clickUseTeamList = (dataKey) => { - $P.useTeamControl.setCurrent(dataKey); + $P.useTeamControl.dataset.setCurrent(dataKey); } $P.fnSave = () => { @@ -436,7 +436,7 @@ $(document).ready(function(){ } $P.fnRemove = () => { - var dataKey = $P.useTeamControl.getCurrent()["TEAM_ID"]; + var dataKey = $P.useTeamControl.dataset.getCurrent()["TEAM_ID"]; ajax.get({ url : $P.useTeamControl.urls.remove, data : { @@ -464,7 +464,7 @@ $(document).ready(function(){ }, success:(resp) => { - $P.delTeamControl.setData(resp); + $P.delTeamControl.dataset.setData(resp); } }); 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 c8cdeb88..2416e441 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 @@ -179,64 +179,6 @@ $(document).ready(function(){ $P.exmptnVhclControl.defaultFetchSize = FETCH_XS; $P.exmptnVhclControl.untilPageNum = 0; $P.exmptnVhclControl.beforeCurrent = null; - - $P.exmptnVhclControl.newInfo = () => { - ajax.get({ - url : $P.exmptnVhclControl.urls.newInfo, - data: {}, - success:(resp) => { - dialog.open({ - id: "exmptnvhcldialog", - title: "면제차량 등록", - content:resp, - size: "lg", - init:() => { - var parentRes = new Object(); - var childReq = pageObject.childReq.pop(); - - for(var reqKey in childReq) { - if($P.provide[reqKey]){ - parentRes[reqKey] = $P.provide[reqKey]; - } else { - parentRes[reqKey] = function(){}; - } - } - - pageObject.parentRes.push(parentRes); - } - }); - } - }); - }; - - $P.exmptnVhclControl.getInfo = (param) => { - ajax.get({ - url : $P.exmptnVhclControl.urls.getInfo, - data: param, - success:(resp) => { - dialog.open({ - id: "exmptnvhcldialog", - title: "면제차량 수정", - content:resp, - size: "lg", - init:() => { - var parentRes = new Object(); - var childReq = pageObject.childReq.pop(); - - for(var reqKey in childReq) { - if($P.provide[reqKey]){ - parentRes[reqKey] = $P.provide[reqKey]; - } else { - parentRes[reqKey] = function(){}; - } - } - - pageObject.parentRes.push(parentRes); - } - }); - } - }); - }; /************************************************************************** * Dataset.on @@ -261,7 +203,7 @@ $(document).ready(function(){ searchForm.find("input[type='text']").val(""); searchForm.find("input[type='hidden']").val(""); - $P.exmptnVhclControl.setData([]); + $P.exmptnVhclControl.dataset.setData([]); } $P.getParams = () => { @@ -367,10 +309,67 @@ $(document).ready(function(){ }); return; } - $P.exmptnVhclControl.getInfo({"exmptnVhclId" : dataKey}); + $P.getInfo({"exmptnVhclId" : dataKey}); } + $P.getInfo = (param) => { + ajax.get({ + url : $P.exmptnVhclControl.urls.getInfo, + data: param, + success:(resp) => { + dialog.open({ + id: "exmptnvhclDialog", + title: "면제차량 수정", + content:resp, + size: "lg", + init:() => { + var parentRes = new Object(); + var childReq = pageObject.childReq.pop(); + for(var reqKey in childReq) { + if($P.provide[reqKey]){ + parentRes[reqKey] = $P.provide[reqKey]; + } else { + parentRes[reqKey] = function(){}; + } + } + + pageObject.parentRes.push(parentRes); + } + }); + } + }); + }; + + $P.newInfo = () => { + ajax.get({ + url : $P.exmptnVhclControl.urls.newInfo, + data: {}, + success:(resp) => { + dialog.open({ + id: "exmptnvhclDialog", + title: "면제차량 등록", + content:resp, + size: "lg", + init:() => { + var parentRes = new Object(); + var childReq = pageObject.childReq.pop(); + + for(var reqKey in childReq) { + if($P.provide[reqKey]){ + parentRes[reqKey] = $P.provide[reqKey]; + } else { + parentRes[reqKey] = function(){}; + } + } + + pageObject.parentRes.push(parentRes); + } + }); + } + }); + }; + $P.fnOpenDelRsnDialog = () => { dialog.open({ id : "delRsnDialog--${pageName}", @@ -387,7 +386,7 @@ $(document).ready(function(){ } $P.fnRemove = () => { - var dataKey = $P.exmptnVhclControl.getCurrent()["EXMPTN_VHCL_ID"]; + var dataKey = $P.exmptnVhclControl.dataset.getCurrent()["EXMPTN_VHCL_ID"]; ajax.get({ url : $P.exmptnVhclControl.urls.remove, data : { @@ -404,14 +403,14 @@ $(document).ready(function(){ }; $P.fnOpenHistory = () => { - var dataKey = $P.exmptnVhclControl.getCurrent()["EXMPTN_VHCL_ID"]; + var dataKey = $P.exmptnVhclControl.dataset.getCurrent()["EXMPTN_VHCL_ID"]; ajax.get({ url : wctx.url("/BPV/crdn/crdn08/030/list.do"), data: { "exmptnVhclId" : dataKey }, success:(resp) => { dialog.open({ - id: "exmptnvhclHistorydialog", + id: "exmptnvhclHistoryDialog", title: "면제차량 이력", content : resp, size: "xxl", @@ -437,7 +436,7 @@ $(document).ready(function(){ $("#btnSearch--${pageName}").on("click", () => $P.searchExmptnVhclList()); $('#btnExcel--${pageName}').on('click', () => $P.fnExcelDown()); - $("#btnCreate--${pageName}").on('click', () => { $P.exmptnVhclControl.newInfo(); }); + $("#btnCreate--${pageName}").on('click', () => { $P.newInfo(); }); $("#btnOpenDelRsn--${pageName}").on('click', () => { $P.fnOpenDelRsnDialog(); }); $("#btnHistory--${pageName}").on('click', () => { $P.fnOpenHistory(); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp index 6154c2a9..5ef20bd1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp @@ -1,6 +1,6 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> - +면제차량 상세 조회
@@ -108,20 +108,15 @@ $(document).ready(function(){ }); /************************************************************************** - * DatasetControl.set + * pageObject.function **************************************************************************/ - $P.exmptnVhclControl.setInfo = (item) => { + $P.setInfo = (item) => { $P.formFields.set(item); var create = isEmpty(item.EXMPTN_VHCL_ID); $("#vhrno--${pageName}").prop("readonly", !create); } - - /************************************************************************** - * pageObject.function - **************************************************************************/ - $P.fnSave = () => { if(!customValidate($("#frmEdit--${pageName} input"))) return; @@ -155,7 +150,7 @@ $(document).ready(function(){ focusClose(); } }); - dialog.close("exmptnvhcldialog"); + dialog.close("exmptnvhclDialog"); $P.provided.refreshList(); } }; @@ -187,7 +182,7 @@ $(document).ready(function(){ fn_securityModeToggle($("#securityMode--top").is(":checked")); var exmptnVhclInfo = ${exmptnVhclInfo}; - $P.exmptnVhclControl.setInfo(exmptnVhclInfo); + $P.setInfo(exmptnVhclInfo); }); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp index b50e5471..04fe27b8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08030-info.jsp @@ -1,5 +1,7 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> +면제차량 이력 +
@@ -124,6 +126,6 @@ $(document).ready(function(){ fn_securityModeToggle($("#securityMode--top").is(":checked")); } - $P.exmptnVhclControl.setData(list); + $P.exmptnVhclControl.dataset.setData(list); }); \ No newline at end of file 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 df61da0a..07fd6c18 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 @@ -303,7 +303,7 @@ $(document).ready(function(){ $('#schCvlcptRcptYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); $('#schCvlcptRcptYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.crdnControl.setData([]); + $P.crdnControl.dataset.setData([]); } $P.fnResetAndChangeBiz = (taskSeCd) => { @@ -339,8 +339,8 @@ $(document).ready(function(){ $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; $P.crdnControl.beforeCurrent = { - key : $P.crdnControl.getCurrent()["CRDN_ID"], - index : $P.crdnControl.getCurrent()["ROW_NUM"] - 1 + key : $P.crdnControl.dataset.getCurrent()["CRDN_ID"], + index : $P.crdnControl.dataset.getCurrent()["ROW_NUM"] - 1 }; Apply.fromDatasetControl.load($P.crdnControl, 1).then((resp)=>{ @@ -490,7 +490,7 @@ $(document).ready(function(){ $P.fnHold = () => { - var curKey = $P.crdnControl.getCurrent()["CRDN_ID"]; + var curKey = $P.crdnControl.dataset.getCurrent()["CRDN_ID"]; if($P.holdList.includes(curKey)){ return; } @@ -520,15 +520,15 @@ $(document).ready(function(){ crdnIds.push(filtered[i].CRDN_ID); } - $P.crdnControl.select(crdnIds,true); + $P.crdnControl.dataset.select(crdnIds,true); } else { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } var curKey = cur["CRDN_ID"]; - $P.crdnControl.select(curKey,true); + $P.crdnControl.dataset.select(curKey,true); } var selected = $P.crdnControl.dataset.getKeys("selected"); @@ -557,7 +557,7 @@ $(document).ready(function(){ }; $P.fnRemoveSameRcptYmd = () => { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } @@ -575,7 +575,7 @@ $(document).ready(function(){ } $P.fnOpenCvlcptOrgnl = () => { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } 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 33c19551..e02db199 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 @@ -449,7 +449,6 @@ $(document).ready(function(){ * pageObject.function **************************************************************************/ - $P.openLevyExclPop = (levyExclSeCd) => { if(levyExclSeCd == "2"){ @@ -483,7 +482,7 @@ $(document).ready(function(){ success : (resp) => { dialog.open({ - id : "levyExcldialog--${pageName}", + id : "levyExclDialog--${pageName}", title : "부과제외 정보", content : resp, size : "md", @@ -539,8 +538,8 @@ $(document).ready(function(){ } }); - if($("#levyExcldialog--${pageName}").length > 0){ - dialog.close("levyExcldialog--${pageName}"); + if($("#levyExclDialog--${pageName}").length > 0){ + dialog.close("levyExclDialog--${pageName}"); } var crdnId = $("#crdnId--${pageName}").val(); @@ -586,7 +585,7 @@ $(document).ready(function(){ success : (resp) => { var crdnInfo = resp.crdnInfo; crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); - $P.crdnControl.setData([crdnInfo]); + $P.crdnControl.dataset.setData([crdnInfo]); $("#btnViewCrdnList--${pageName}").attr("hidden","hidden"); $("#btnViewCvlcptDscsnList--${pageName}").attr("hidden","hidden"); @@ -1067,17 +1066,17 @@ $(document).ready(function(){ }, success: function(resp) { dialog.open({ - id : "crdnListdialog--${pageName}", + id : "crdnListDialog--${pageName}", title : "동일차량 단속 내역", content : resp, 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(); + $("#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 : () => {} @@ -1097,17 +1096,17 @@ $(document).ready(function(){ }, success: function(resp) { dialog.open({ - id : "cvlcptDscsnListdialog--${pageName}", + id : "cvlcptDscsnListDialog--${pageName}", title : "민원상담 내역", content : resp, 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(); + $("#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 : () => {} @@ -1166,7 +1165,7 @@ $(document).ready(function(){ var crdnInfo = ${crdnInfo}; crdnInfo.CVLCPT_APLY_CN = escapeHTMLEntity(crdnInfo.CVLCPT_APLY_CN); - $P.crdnControl.setData([crdnInfo]); + $P.crdnControl.dataset.setData([crdnInfo]); if($("#taskSeCd--${pageName}").val() == "DPV" && $("#vltnCd--${pageName}").val() == "01"){ $("label[for='dstrbncYn--${pageName}']").show(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp index 86f6a989..0a45c4ac 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01050-info.jsp @@ -164,7 +164,7 @@ $(document).ready(function() { success : (resp) => { var cvlcptInfo = resp.cvlcptInfo; cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); - $P.cvlcptControl.setData([cvlcptInfo]); + $P.cvlcptControl.dataset.setData([cvlcptInfo]); var cs = $P.provided.getCountStatus($("#crdnId--${pageName}").val()); $("#countStauts--${pageName}").val(cs); @@ -192,7 +192,7 @@ $(document).ready(function() { **************************************************************************/ var cvlcptInfo = ${cvlcptInfo}; cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); - $P.cvlcptControl.setData([cvlcptInfo]); + $P.cvlcptControl.dataset.setData([cvlcptInfo]); var cs = $P.provided.getCountStatus($("#crdnId--${pageName}").val()); $("#countStauts--${pageName}").val(cs); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp index a22134c2..5963e782 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp @@ -291,7 +291,7 @@ $(document).ready(function(){ $('#schCvlcptRcptYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-31).date); $('#schCvlcptRcptYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.crdnControl.setData([]); + $P.crdnControl.dataset.setData([]); } $P.fnResetAndChangeBiz = taskSeCd => { @@ -329,8 +329,8 @@ $(document).ready(function(){ $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; $P.crdnControl.beforeCurrent = { - key : $P.crdnControl.getCurrent()["CRDN_ID"], - index : $P.crdnControl.getCurrent()["ROW_NUM"] - 1 + key : $P.crdnControl.dataset.getCurrent()["CRDN_ID"], + index : $P.crdnControl.dataset.getCurrent()["ROW_NUM"] - 1 }; $P.crdnControl.load(1); } @@ -446,7 +446,7 @@ $(document).ready(function(){ } $P.fnOpenCvlcptOrgnl = () => { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } @@ -483,7 +483,7 @@ $(document).ready(function(){ } $P.fnOpenAnswerPreview = () => { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp index 0119a91c..76de990a 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp @@ -136,7 +136,7 @@ $(document).ready(function() { success : (resp) => { var cvlcptInfo = resp.cvlcptInfo; cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); - $P.cvlcptControl.setData([cvlcptInfo]); + $P.cvlcptControl.dataset.setData([cvlcptInfo]); var cs = $P.parentRes.getCountStatus($("#crdnId--${pageName}").val()); $("#countStauts--${pageName}").val(cs); @@ -192,7 +192,7 @@ $(document).ready(function() { **************************************************************************/ var cvlcptInfo = ${cvlcptInfo}; cvlcptInfo.CVLCPT_APLY_CN = escapeHTMLEntity(cvlcptInfo.CVLCPT_APLY_CN); - $P.cvlcptControl.setData([cvlcptInfo]); + $P.cvlcptControl.dataset.setData([cvlcptInfo]); var cs = $P.parentRes.getCountStatus($("#crdnId--${pageName}").val()); $("#countStauts--${pageName}").val(cs); diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp index 3cbc2414..17dec341 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp @@ -276,7 +276,7 @@ $(document).ready(function(){ $('#schCvlcptRcptYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-365).date); $('#schCvlcptRcptYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.crdnControl.setData([]); + $P.crdnControl.dataset.setData([]); } $P.fnResetAndChangeBiz = (taskSeCd) => { @@ -309,8 +309,8 @@ $(document).ready(function(){ $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; $P.crdnControl.beforeCurrent = { - key : $P.crdnControl.getCurrent()["CRDN_ID"], - index : $P.crdnControl.getCurrent()["ROW_NUM"] - 1 + key : $P.crdnControl.dataset.getCurrent()["CRDN_ID"], + index : $P.crdnControl.dataset.getCurrent()["ROW_NUM"] - 1 }; Apply.fromDatasetControl.load($P.crdnControl, 1).then((resp)=>{ @@ -422,13 +422,13 @@ $(document).ready(function(){ $P.fnRemove = () => { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } var curKey = cur["CRDN_ID"]; - $P.crdnControl.select(curKey,true); + $P.crdnControl.dataset.select(curKey,true); var selected = $P.crdnControl.dataset.getKeys("selected"); if (selected.length < 1) { @@ -456,7 +456,7 @@ $(document).ready(function(){ } $P.fnOpenCvlcptOrgnl = () => { - var cur = $P.crdnControl.getCurrent(); + var cur = $P.crdnControl.dataset.getCurrent(); if(cur == null){ return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp index 7acc8060..4a422244 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp @@ -216,7 +216,7 @@ $(document).ready(function(){ $('#schDmndYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date); $('#schDmndYmdTo--${pageName}').datepicker('setDate', new Date()); - $P.dmndControl.setData([]); + $P.dmndControl.dataset.setData([]); } $P.fnResetAndChangeBiz = (taskSeCd) => { @@ -249,8 +249,8 @@ $(document).ready(function(){ if(!$P.dmndControl.dataset.empty){ $P.dmndControl.beforeCurrent = { - key : $P.dmndControl.getCurrent()["INDIV_ID"], - index : $P.dmndControl.getCurrent()["ROW_NUM"] - 1 + key : $P.dmndControl.dataset.getCurrent()["INDIV_ID"], + index : $P.dmndControl.dataset.getCurrent()["ROW_NUM"] - 1 }; } @@ -329,15 +329,15 @@ $(document).ready(function(){ $P.fnRemove = (allCompleteDataIds) => { if(allCompleteDataIds != null){ - $P.dmndControl.select(allCompleteDataIds,true); + $P.dmndControl.dataset.select(allCompleteDataIds,true); } else { - var cur = $P.dmndControl.getCurrent(); + var cur = $P.dmndControl.dataset.getCurrent(); if(cur == null){ return; } var curKey = cur["INDIV_ID"]; - $P.dmndControl.select(curKey,true); + $P.dmndControl.dataset.select(curKey,true); } var selected = $P.dmndControl.dataset.getKeys("selected"); @@ -368,7 +368,7 @@ $(document).ready(function(){ } $P.fnRemoveAllCompleteData = () => { - var cur = $P.dmndControl.getCurrent(); + var cur = $P.dmndControl.dataset.getCurrent(); if(cur == null){ return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp index 8c0ff2ba..b6efa1be 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc06010-main.jsp @@ -165,7 +165,7 @@ $(document).ready(function(){ $P.fnReset = () => { - $P.warningWordsControl.setData([]); + $P.warningWordsControl.dataset.setData([]); $P.renderWarningWordsList(0); $("#frmEditWarningWords--${pageName}").find("input, textarea").val(""); @@ -186,12 +186,12 @@ $(document).ready(function(){ data : {"taskSeCd" : taskSeCd}, success : (resp) => { - $P.warningWordsControl.setData(resp.List); + $P.warningWordsControl.dataset.setData(resp.List); $P.renderWarningWordsList(resp.List.length); if(resp.List.length > 0){ - var current = $P.warningWordsControl.getCurrent()["LEVY_EXCL_RSN_CD"]; + var current = $P.warningWordsControl.dataset.getCurrent()["LEVY_EXCL_RSN_CD"]; $P.clickWarningWordsList(current); } } @@ -215,7 +215,7 @@ $(document).ready(function(){ $P.radioClickWarningWordsList = (dataKey, gridType) => { - $P.warningWordsControl.setCurrent(dataKey); + $P.warningWordsControl.dataset.setCurrent(dataKey); $("#warningWordsTbody--${pageName}").setCurrentRow(dataKey); @@ -233,7 +233,7 @@ $(document).ready(function(){ $P.changeTextarea = () => { - var curData = $P.warningWordsControl.getCurrent(); + var curData = $P.warningWordsControl.dataset.getCurrent(); if(curData == null){ $("#ansRsnCd--${pageName}").val(""); @@ -251,7 +251,7 @@ $(document).ready(function(){ $P.refreshWarningWordsInfo = () => { - var cursor = $P.warningWordsControl.getCurrent()["LEVY_EXCL_RSN_CD"]; + var cursor = $P.warningWordsControl.dataset.getCurrent()["LEVY_EXCL_RSN_CD"]; var taskSeCd = $("#frmSearch--${pageName}").find("input[name='taskSeCd']:checked").val(); @@ -260,11 +260,11 @@ $(document).ready(function(){ data : {"taskSeCd" : taskSeCd}, success : (resp) => { - $P.warningWordsControl.setData(resp.List); + $P.warningWordsControl.dataset.setData(resp.List); $P.renderWarningWordsList(resp.List.length); if(resp.List.length > 0){ - $P.warningWordsControl.setCurrent(cursor); - var current = $P.warningWordsControl.getCurrent()["LEVY_EXCL_RSN_CD"]; + $P.warningWordsControl.dataset.setCurrent(cursor); + var current = $P.warningWordsControl.dataset.getCurrent()["LEVY_EXCL_RSN_CD"]; $P.clickWarningWordsList(current,'warning'); } diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp index f21308f9..606a5bfc 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt04010-main.jsp @@ -87,7 +87,7 @@ No. + onchange="pageObject['${pageName}'].deptControl.dataset.select(this.checked);" /> 시군구명 시군구코드 @@ -105,7 +105,7 @@ {ROW_NUM} + onchange="pageObject['${pageName}'].deptControl.dataset.select('{DEPT_CD}', this.checked);"> {SGG_NM} {SGG_CD} @@ -200,7 +200,7 @@ $(document).ready(function(){ searchForm.find("select[name='sggCd']").val(MY_INFO.info.sggCd); - $P.deptControl.setData([]); + $P.deptControl.dataset.setData([]); } $P.getParams = () => { @@ -267,10 +267,19 @@ $(document).ready(function(){ } $P.dblclickDeptList = (dataKey) => { - var params = { - deptCd : dataKey - }; - + $P.getInfo(dataKey); + } + + $P.createDept = () => { + $P.getInfo(); + } + + $P.getInfo = (deptCd) => { + var params = {}; + if(deptCd != null){ + params.deptCd = deptCd; + } + ajax.get({ url : $P.deptControl.urls.getInfo, data : params, @@ -278,14 +287,24 @@ $(document).ready(function(){ dialog.open({ id : "deptInfoDialog", - title : "부서 정보", size : "xxl", + title : "부서 정보", + size : "xxl", content : resp, - init : () => {} + init : () => { + + } }); } }); - + } + + $P.removeDept = () => { + //$P.deptControl.dataset.getKeys("selected"); + } + + $P.removeCallback = (resp) => { + // } /************************************************************************** @@ -293,8 +312,8 @@ $(document).ready(function(){ **************************************************************************/ $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $('#btnSearch--${pageName}').on('click', () => $P.searchDeptList()); - $('#btnAdd--${pageName}').on('click', () => {}); - $('#btnDel--${pageName}').on('click', () => {}); + $('#btnAdd--${pageName}').on('click', () => $P.createDept()); + $('#btnDel--${pageName}').on('click', () => $P.removeDept()); /************************************************************************** * 초기화 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp index 78029e7f..00b4b742 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt01014-info.jsp @@ -7,7 +7,7 @@ + onchange="integrationSearchControl.dataset.select(this.checked);"> + onchange="integrationSearchControl.dataset.select('{CRDN_ID}', this.checked);"> { var dataKey = obj.dataset.key; - $P.detailGridControl.setData(refListMap[dataKey]); + $P.detailGridControl.dataset.setData(refListMap[dataKey]); var offset = $('#masterArea--${pageName}').offset(); $('#statWrapper--${pageName}').animate({scrollTop : offset.top}, 400);