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 92a88b5f..b9144b20 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 @@ -45,8 +45,8 @@ - 단속 파일 등록 - 단속 수기 등록 + + 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 dd3b7810..2c0340fe 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 @@ -133,8 +133,8 @@ - 업무 처리1 - 업무 처리2 + + 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 d1e66d7d..e866277e 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 @@ -10,8 +10,8 @@
- 단속사진 비교 - 동일단속차량 검사 + + 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 2dc633ce..823edf03 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 @@ -47,7 +47,7 @@
- 개별 확인 자료로 수정 +
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 c19455c1..317d3b0c 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 @@ -65,9 +65,8 @@ - - 민원원본보기 - 처리 잠시 보류 + + @@ -133,8 +132,8 @@ 위반장소 - 선택자료 삭제 - 접수일 전체 삭제 + +
- 민원원본보기 - 답변미리보기 - ☑ 답변등록 실행 - ☑ 답변완료로 수정 + + + +
@@ -93,7 +93,10 @@ No. - + + + 위반내용 {ROW_NUM} - + + + {VLTN_ARTCL} {CVLCPT_APLCNT_NM} {CVLCPT_PRCS_PIC_NM} @@ -175,7 +181,7 @@ $(document).ready(function(){ * DatasetControl **************************************************************************/ $P.crdnControl = new DatasetControl({ - urls : { load : "", getInfo : "" }, + urls : { load : "", getInfo : "", update : "" }, dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.CRDN_ID : "", formats : { @@ -195,7 +201,7 @@ $(document).ready(function(){ * DatasetControl.on **************************************************************************/ $P.crdnControl.onDatasetChange = (obj) => { - + $P.renderCrdnList(obj["Total"]); $("#crdnPaging--${pageName}").setPagingInfo({ @@ -211,11 +217,35 @@ $(document).ready(function(){ }; $P.crdnControl.onCurrentChange = (item) => { - + if(!$P.crdnControl.tableRenderComplete){ return; } + if($P.crdnControl.beforeCurrent != null){ + var beforeCurrentKey = $P.crdnControl.beforeCurrent.key; + var beforeCurrentIndex = $P.crdnControl.beforeCurrent.index; + $P.crdnControl.beforeCurrent = null; + + if(!$P.crdnControl.dataset.empty){ + var info = $P.crdnControl.dataset.getData(beforeCurrentKey); + + if(info != null){ + $P.crdnControl.setCurrent(beforeCurrentKey); + return; + } + + if(beforeCurrentIndex > ($P.crdnControl.dataset.length - 1)){ + info = $P.crdnControl.dataset.getDataset()[$P.crdnControl.dataset.length - 1]; + } else { + info = $P.crdnControl.dataset.getDataset()[beforeCurrentIndex]; + } + + $P.crdnControl.setCurrent(info["CRDN_ID"]); + return; + } + } + $P.crdnControl.tableRenderComplete = false; if(!item){ $P.clickCrdnList("", true); @@ -224,6 +254,20 @@ $(document).ready(function(){ } } + $P.crdnControl.onSelectionChange = (selected) => { + + var crdnList = $P.crdnControl.dataset; + var keys = selected.map(e => crdnList.getKey(e)); + + $("#table-responsive--${pageName}").find("input[name='gridCheckbox']").each(function() { + var checkbox = $(this); + checkbox.prop("checked", keys.includes(checkbox.val())); + }); + + $("#btnAnswerExecute--${pageName}").prop("disabled", keys.length < 1); + $("#btnAnswerComplete--${pageName}").prop("disabled", keys.length < 1); + }; + /************************************************************************** * pageObject.function **************************************************************************/ @@ -237,12 +281,17 @@ $(document).ready(function(){ $P.fnReset(); $P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/cvlc/cvlc01/030/list.do"); $P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt01/020/info.do"); + $P.crdnControl.urls.update = wctx.url("/"+taskSeCd+"/sprt/cvlc01/030/update.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.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 + }; + $P.crdnControl.load(1); } $P.searchCrdnList = () => { @@ -324,11 +373,7 @@ $(document).ready(function(){ } }); - - - if($("#table-responsive--${pageName}").find("input[name='gridAllCheckbox']").is(":checked")){ - $("#table-responsive--${pageName}").find("input[name='gridCheckbox']").prop("checked",true); - } + } $P.getParams = () => { @@ -452,13 +497,9 @@ $(document).ready(function(){ $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList()); $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl()); $("#btnOpenAnswerPreview--${pageName}").on("click", () => $P.fnOpenAnswerPreview()); - + $("#btnAnswerExecute--${pageName}").on("click", () => {}); + $("#btnAnswerComplete--${pageName}").on("click", () => {}); $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); }); - - $("#table-responsive--${pageName}").find("input[name='gridAllCheckbox']").on("click", function(){ - var checkYn = $(this).is(":checked"); - $("#table-responsive--${pageName}").find("input[name='gridCheckbox']").prop("checked", checkYn); - }); /************************************************************************** * 초기화