diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp index 69a2393f..eeac73f1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01010-main.jsp @@ -162,7 +162,6 @@ var FIM026 = new CommonCodes(${FIM026}); pageObject["${pageName}"] = {}; - $(document).ready(function(){ var $P = pageObject["${pageName}"]; @@ -189,7 +188,9 @@ $(document).ready(function(){ CRDN_YMD_TM : datetimeFormat } }); - + $P.crdnControl.defaultFetchSize = FETCH_XS; + $P.crdnControl.untilPageNum = 0; + /************************************************************************** * DatasetControl.on **************************************************************************/ @@ -248,9 +249,16 @@ $(document).ready(function(){ $P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/crdn/crdn01/020/info.do"); $P.crdnControl.urls.remove = wctx.url("/"+taskSeCd+"/crdn/crdn01/010/remove.do"); } - + + $P.refreshCrdnList = () => { + $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; + $P.crdnControl.load(1); + } + $P.searchCrdnList = () => { $P.holdList = []; + $("#btnDelete--${pageName}").show(); $("#btnDeleteSameRcptYmd--${pageName}").show(); @@ -353,6 +361,12 @@ $(document).ready(function(){ $("#table-responsive--${pageName}").removeAttr("data-scroll-status"); } + if($P.crdnControl.untilPageNum != 0){ + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; + $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; + $P.crdnControl.untilPageNum = 0; + } + $P.holdList.forEach(function(item){ $("#crdnTbody--${pageName}").find("tr[data-key='"+item+"']").addClass("bg-dark"); }); @@ -361,7 +375,7 @@ $(document).ready(function(){ $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); - data.fetchSize = 30; + data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp index a0e19f33..6b8bb9e1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01030-main.jsp @@ -186,7 +186,9 @@ $(document).ready(function(){ LEVY_EXCL_RSN_CD : FIM022 } }); - + $P.crdnControl.defaultFetchSize = FETCH_XS; + $P.crdnControl.untilPageNum = 0; + /************************************************************************** * DatasetControl.on **************************************************************************/ @@ -227,6 +229,12 @@ $(document).ready(function(){ $P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); } + $P.refreshCrdnList = () => { + $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; + $P.crdnControl.load(1); + } + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); @@ -281,12 +289,18 @@ $(document).ready(function(){ } else { $("#table-responsive--${pageName}").removeAttr("data-scroll-status"); } + + if($P.crdnControl.untilPageNum != 0){ + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; + $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; + $P.crdnControl.untilPageNum = 0; + } } $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); - data.fetchSize = 30; + data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } 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 5f053ded..ead371a3 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 @@ -124,6 +124,8 @@ $(document).ready(function(){ CRDN_YMD_TM : datetimeFormat } }); + $P.crdnControl.defaultFetchSize = FETCH_XS; + $P.crdnControl.untilPageNum = 0; $P.crdnControl.urls.newInfoByFile = ""; $P.crdnControl.urls.newInfoByHand = ""; @@ -207,6 +209,12 @@ $(document).ready(function(){ } } + $P.refreshCrdnList = () => { + $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; + $P.crdnControl.load(1); + } + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); @@ -259,12 +267,18 @@ $(document).ready(function(){ } else { $("#table-responsive--${pageName}").removeAttr("data-scroll-status"); } + + if($P.crdnControl.untilPageNum != 0){ + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; + $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; + $P.crdnControl.untilPageNum = 0; + } } $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); - data.fetchSize = 30; + data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } 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 87a834a9..95b6062c 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 @@ -308,6 +308,12 @@ $(document).ready(function(){ $("#crdnThead--${pageName}").html(colsStr); } + $P.refreshCrdnList = () => { + $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; + $P.crdnControl.load(1); + } + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); @@ -371,12 +377,18 @@ $(document).ready(function(){ } else { $("#table-responsive--${pageName}").removeAttr("data-scroll-status"); } + + if($P.crdnControl.untilPageNum != 0){ + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; + $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; + $P.crdnControl.untilPageNum = 0; + } } $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); - data.fetchSize = 30; + data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp index 753a343a..8bbb6bfe 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp @@ -373,7 +373,9 @@ $(document).ready(function(){ //감경금액 } }); - + $P.photoInspectionControl.defaultFetchSize = FETCH_XS; + $P.photoInspectionControl.untilPageNum = 0; + //동일차량검사 datasetControl 인스턴스 $P.sameVehicleControl = new InspectionControl({ urls : { load : "", getInfo : "" }, @@ -392,6 +394,8 @@ $(document).ready(function(){ } } ); + $P.sameVehicleControl.defaultFetchSize = FETCH_XS; + $P.sameVehicleControl.untilPageNum = 0; $P.photoInspectionControl.getNext = (key) => { @@ -467,6 +471,23 @@ $(document).ready(function(){ $('#btnPhotoInspection--${pageName}').trigger("click"); } + + $P.refreshInspectionList = () => { + switch ($P.currentDisplay) { + case "photoInspection": + $P.photoInspectionControl.untilPageNum = $P.photoInspectionControl.query.pageNum; + $P.photoInspectionControl.query.fetchSize = $P.photoInspectionControl.defaultFetchSize * $P.photoInspectionControl.query.pageNum; + $P.photoInspectionControl.load(1); + break; + case "sameVehicleInspection": + $P.sameVehicleControl.untilPageNum = $P.sameVehicleControl.main.query.pageNum; + $P.sameVehicleControl.main.query.fetchSize = $P.sameVehicleControl.defaultFetchSize * $P.sameVehicleControl.main.query.pageNum; + $P.sameVehicleControl.main.load(1); + break; + default: break; + } + } + $P.searchInspectionList = () => { switch ($P.currentDisplay) { case "photoInspection": @@ -617,9 +638,12 @@ $(document).ready(function(){ title : "부과제외 정보", content : resp, size : "lg", - init : () => $P.photoInspectionControl.setInfo(info), - onClose : () => { $P.photoInspectionControl.load(1); } // callback + init : () => {}, + onClose : () => { + $P.refreshInspectionList(); + } }); + } }); }; @@ -643,6 +667,12 @@ $(document).ready(function(){ } else { $("#photoInspection-responsive--${pageName}").removeAttr("data-scroll-status"); } + + if($P.photoInspectionControl.untilPageNum != 0){ + $P.photoInspectionControl.query.fetchSize = $P.photoInspectionControl.defaultFetchSize; + $P.photoInspectionControl.query.pageNum = $P.photoInspectionControl.untilPageNum; + $P.photoInspectionControl.untilPageNum = 0; + } break; case "sameVehicleInspectionMain": var dataList = $P.sameVehicleControl.main.dataset; @@ -659,6 +689,12 @@ $(document).ready(function(){ } else { $("#sameVehicleInspectionMain-responsive--${pageName}").removeAttr("data-scroll-status"); } + + if($P.sameVehicleControl.untilPageNum != 0){ + $P.sameVehicleControl.main.query.fetchSize = $P.sameVehicleControl.defaultFetchSize; + $P.sameVehicleControl.main.query.pageNum = $P.sameVehicleControl.untilPageNum; + $P.sameVehicleControl.untilPageNum = 0; + } break; case "sameVehicleInspectionSub": var dataList = $P.sameVehicleControl.sub.dataset; @@ -681,7 +717,12 @@ $(document).ready(function(){ $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); - data.fetchSize = 30; + + if($P.currentDisplay == "photoInspection"){ + data.fetchSize = $P.photoInspectionControl.defaultFetchSize; + } else if($P.currentDisplay == "sameVehicleInspection"){ + data.fetchSize = $P.sameVehicleControl.defaultFetchSize; + } return data; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp index 6b67ad9f..7a39f543 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp @@ -149,7 +149,9 @@ $(document).ready(function(){ BLNC : numberFormat } }); - + $P.crdnControl.defaultFetchSize = FETCH_XS; + $P.crdnControl.untilPageNum = 0; + /************************************************************************** * DatasetControl.on **************************************************************************/ @@ -177,7 +179,13 @@ $(document).ready(function(){ /************************************************************************** * pageObject.function **************************************************************************/ - $P.searchCrdnList = () => { + $P.refreshCrdnList = () => { + $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; + $P.crdnControl.load(1); + } + + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); } @@ -234,13 +242,18 @@ $(document).ready(function(){ $("#table-responsive--${pageName}").removeAttr("data-scroll-status"); } + if($P.crdnControl.untilPageNum != 0){ + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; + $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; + $P.crdnControl.untilPageNum = 0; + } } $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); data.taskSeCd = "DPV"; - data.fetchSize = 30; + data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp index ea27a31b..6728cab1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp @@ -159,7 +159,9 @@ $(document).ready(function(){ BLNC : numberFormat } }); - + $P.crdnControl.defaultFetchSize = FETCH_XS; + $P.crdnControl.untilPageNum = 0; + /************************************************************************** * DatasetControl.on **************************************************************************/ @@ -200,6 +202,12 @@ $(document).ready(function(){ $P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); } + $P.refreshCrdnList = () => { + $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; + $P.crdnControl.load(1); + } + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); @@ -256,12 +264,18 @@ $(document).ready(function(){ } else { $("#table-responsive--${pageName}").removeAttr("data-scroll-status"); } + + if($P.crdnControl.untilPageNum != 0){ + $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; + $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; + $P.crdnControl.untilPageNum = 0; + } } $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); - data.fetchSize = 30; + data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } diff --git a/src/main/webapp/resources/js/base/menu-support-fims.js b/src/main/webapp/resources/js/base/menu-support-fims.js index abf2fdbe..2d968833 100644 --- a/src/main/webapp/resources/js/base/menu-support-fims.js +++ b/src/main/webapp/resources/js/base/menu-support-fims.js @@ -75,7 +75,6 @@ function openMenu(obj, params) { let dynamicPage = document.createElement("div"); dynamicPage.setAttribute("id","innerPage-"+dataKey); - dynamicPage.setAttribute("title",menuNm); // .attr("frameborder" , "0") // .attr("scrolling" , "no")