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 7e685fb6..ddbf25fb 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 @@ -108,7 +108,7 @@ - @@ -164,12 +164,12 @@ - +
- + @@ -434,12 +434,12 @@ $(document).ready(function(){ $P.showPhoto(curCrdnId,nextCrdnId,curDataVhrno,nextDataVhrno); } - + $P.pagingSupport0 = new FimsPagingSupport({ doq: $P, linkContainer: "[name='photoInspectionPaging']" }); - + //동일차량검사 datasetControl 인스턴스 var alt = newCrdn02010Alt($P); alt.defaultFetchSize = FETCH_XS; @@ -463,14 +463,14 @@ $(document).ready(function(){ $P.$findn("sameVehicleInspectionSubTbody").html(""); } } - + $P.pagingSupport1 = new FimsPagingSupport({ doq: $P, linkContainer: "[name='sameVehicleInspectionMainPaging']" }); - + var shift = newCrdn02010Shift($P); - + shift.dataset.onDatasetChange = (obj, option) => { var t = $P.getGridTemplate("sameVehicleInspectionSub"); var trs = Apply.fromDataset.getTbody(shift.dataset, t.found, t.notFound, t.replacer); @@ -481,7 +481,7 @@ $(document).ready(function(){ Apply.fromDataset.currentRow(shift.dataset, dataItem, $P.findn("sameVehicleInspectionSubTbody")); }; - + /************************************************************************** * pageObject.function **************************************************************************/ @@ -579,7 +579,7 @@ $(document).ready(function(){ Apply.fromDatasetControl.reload(ctrl).then((resp)=>{ Apply.toDataset.set(ctrl.dataset, resp); ctrl.dataset.onDatasetChange(resp, {reloaded : true}); - + let todoCurrent = Apply.fromDataset.getTodoCurrent(ctrl.dataset, ctrl.beforeCurrent, "CRDN_ID"); ctrl.beforeCurrent = null; if(todoCurrent != null){ @@ -596,7 +596,7 @@ $(document).ready(function(){ Apply.fromDatasetControl.reload(alt).then((resp)=>{ Apply.toDataset.set(alt.dataset, resp); alt.dataset.onDatasetChange(resp, {reloaded : true}); - + let todoCurrent = Apply.fromDataset.getTodoCurrent(alt.dataset, alt.beforeCurrent, "CRDN_ID_LIST"); alt.beforeCurrent = null; if(todoCurrent != null){ @@ -777,18 +777,18 @@ $(document).ready(function(){ var dialogUrl = wctx.url("/sprt/sprt02/010/main.do"); let params = { - callControlName : "pageObject['${pageName}'].ctrl" - , crdnId : dataKey + callPageName : "${pageName}", + crdnId : dataKey } ajax.get({ url : dialogUrl, data : params, success : (resp) => { - + let dialogName = "totalInfoMainDialog"; let dialogId = dialogName+"-"+uuid(); - + dialog.open({ id : dialogId, title : "개별총정보", size : "xxl", content : resp, @@ -886,7 +886,7 @@ $(document).ready(function(){ let dialogName = "levyExclDialog"; let dialogId = dialogName+"-"+uuid(); - + dialog.open({ id : dialogId, title : "부과제외 정보", @@ -937,7 +937,7 @@ $(document).ready(function(){ let dialogName = "overTimeProcessDialog"; let dialogId = dialogName+"-"+uuid(); - + dialog.open({ id : dialogId, title : "2시간 초과 처리", @@ -982,16 +982,16 @@ $(document).ready(function(){ let dialogName = "userDialog"; let dialogId = dialogName+"-"+uuid(); - + dialog.open({ id: dialogId , title: "사용자 검색" , content: resp , size: "lg" - , init: () => { + , init: () => { $("#"+dialogId).attr("name", dialogName); $("#"+dialogId).attr("data-ref-doctx","${pageName}"); - + AppSupport.setDialogZindex(); } }); @@ -1021,7 +1021,7 @@ $(document).ready(function(){ $P.$findn("btnPhotoInspection").removeClass("active"); $P.currentDisplay = "sameVehicleInspection"; }); - + $P.$findn('btnSearch').on('click', () => $P.searchInspectionList()); //검색버튼 // 동적검색에서 엔터(Enter) 키를 누르면 검색한다. $P.$findn("term").onEnterPress($P.searchInspectionList); 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 646b20c0..701cfbeb 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 @@ -135,7 +135,7 @@ $(document).ready(function(){ * DatasetControl, DatasetSupport, FormFields **************************************************************************/ var ctrl = newCrdn03010Control($P); - + ctrl.defaultFetchSize = FETCH_XS; ctrl.query = { pageNum : 1, fetchSize : ctrl.defaultFetchSize }; ctrl.beforeCurrent = null; @@ -152,12 +152,12 @@ $(document).ready(function(){ ctrl.dataset.onCurrentChange = (dataItem) => { Apply.fromDataset.currentRow(ctrl.dataset, dataItem, $P.findn("crdnTbody")); }; - + $P.pagingSupport = new FimsPagingSupport({ doq: $P, linkContainer: "[name='crdnPaging']" }); - + /************************************************************************** * pageObject.function **************************************************************************/ @@ -194,16 +194,16 @@ $(document).ready(function(){ } $P.refreshCrdnList = () => { - + ctrl.beforeCurrent = { primaryKey : ctrl.dataset.getCurrent()["CRDN_ID"], arrayIndex : ctrl.dataset.getCurrent()["ROW_NUM"] - 1 }; - + Apply.fromDatasetControl.reload(ctrl).then((resp)=>{ Apply.toDataset.set(ctrl.dataset, resp); ctrl.dataset.onDatasetChange(resp, {reloaded : true}); - + let todoCurrent = Apply.fromDataset.getTodoCurrent(ctrl.dataset, ctrl.beforeCurrent, "CRDN_ID"); ctrl.beforeCurrent = null; if(todoCurrent != null){ @@ -251,7 +251,7 @@ $(document).ready(function(){ if(option != null && option.reloaded){ initScroll = false; } - + $P.findn("table-responsive").changeContent(trs, initScroll, noMore); //보안모드 @@ -270,8 +270,8 @@ $(document).ready(function(){ $P.dblclickCrdnList = (dataKey) => { let params = { - callControlName : "pageObject['${pageName}'].ctrl" - , crdnId : dataKey + callPageName : "${pageName}", + crdnId : dataKey } ajax.get({ @@ -281,7 +281,7 @@ $(document).ready(function(){ let dialogName = "totalInfoMainDialog"; let dialogId = dialogName+"-"+uuid(); - + dialog.open({ id : dialogId, title : "개별총정보", size : "xxl", content : resp, 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 af093337..5594d1fd 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 @@ -73,7 +73,7 @@ -