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 96faef63..6dd7d86f 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 @@ -518,30 +518,30 @@ $(document).ready(function(){ $P.fnRemove = (rcptYmd) => { if(rcptYmd != null){ - var ds = ctrl.dataset.getDataset(); - - var crdnIds = []; + var dsArray = ctrl.dataset.getDataset("item"); + + let dataIndexs = []; - var filtered = ds.filter(function(item){ - if(item['CVLCPT_RCPT_YMD'] == rcptYmd && !$P.holdList.includes(item['CRDN_ID'])){ + var filtered = dsArray.filter(function(item){ + if(item.data['CVLCPT_RCPT_YMD'] == rcptYmd && !$P.holdList.includes(item.data['CRDN_ID'])){ return true; } else { return false; } }); for(var i=0; i < filtered.length; i++){ - crdnIds.push(filtered[i].CRDN_ID); + dataIndexs.push(filtered[i].index); } - ctrl.dataset.select(crdnIds,true); + ctrl.dataset.select(dataIndexs, true); } else { var cur = ctrl.dataset.getCurrent(); if(cur == null){ return; } - var curKey = cur["CRDN_ID"]; - ctrl.dataset.select(curKey,true); + let dataIndex = ctrl.dataset.getCurrent("item").index; + ctrl.dataset.select(dataIndex, true); } var selected = ctrl.dataset.getDataset("selected"); 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 1178a617..37ade0c6 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 @@ -411,8 +411,8 @@ $(document).ready(function(){ return; } - var curKey = cur["CRDN_ID"]; - ctrl.dataset.select(curKey,true); + let dataIndex = ctrl.dataset.getCurrent("item").index; + ctrl.dataset.select(dataIndex, true); var selected = ctrl.dataset.getDataset("selected"); if (selected.length < 1) { 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 e96a8f99..3cd6891e 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 @@ -286,18 +286,18 @@ $(document).ready(function(){ Apply.toDataset.current(ctrl.dataset, dataIndex); } - $P.fnRemove = (allCompleteDataIds) => { + $P.fnRemove = (allCompleteDataIndexs) => { if(allCompleteDataIds != null){ - ctrl.dataset.select(allCompleteDataIds,true); + ctrl.dataset.select(allCompleteDataIndexs,true); } else { var cur = ctrl.dataset.getCurrent(); if(cur == null){ return; } - var curKey = cur["INDIV_ID"]; - ctrl.dataset.select(curKey,true); + let dataIndex = ctrl.dataset.getCurrent("item").index; + ctrl.dataset.select(dataIndex, true); } var selected = ctrl.dataset.getDataset("selected"); @@ -333,15 +333,17 @@ $(document).ready(function(){ return; } - var ds = ctrl.dataset.getDataset(); + var ds = ctrl.dataset.getDataset("item"); - var indivIds = ds.filter(function(item){ - if(item['STTS_CD'] == '9' || item['STTS_CD'] == 'B'){ - return item["INDIV_ID"]; + let filtered = ds.filter(function(item){ + if(item.data['STTS_CD'] == '9' || item.data['STTS_CD'] == 'B'){ + return true; + } else { + return false; } }); - - if(indivIds.length == 0){ + + if(filtered.length == 0){ dialog.alert({ content : "요청 완료자료가 없습니다.", init : function() { @@ -350,14 +352,15 @@ $(document).ready(function(){ }); return; } - + var dataIndexs = filtered.map(item=>item.index); + dialog.alert({ content : "완료된 자료를 모두 삭제하시겠습니까?", init : function() { AppSupport.focusOK(); }, onOK : () => { - $P.fnRemove(indivIds); + $P.fnRemove(dataIndexs); } }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt01010-main.jsp index 4f48d177..e16153cd 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/mngt/mngt01010-main.jsp @@ -125,7 +125,6 @@ $(document).ready(function(){ var ctrl = newMngt01010Control($P); ctrl.defaultFetchSize = FETCH_XS; ctrl.query = { pageNum : 1, fetchSize : ctrl.defaultFetchSize }; - ctrl.beforeCurrent = null; ctrl.dataset.onDatasetChange = (obj, option) => { var t = $P.getGridTemplate(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp index 6eef6646..7d15f370 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/ogdp/ogdp02010-main.jsp @@ -160,7 +160,6 @@ $(document).ready(function(){ var ctrl = newOgdp02020Control($P); ctrl.defaultFetchSize = FETCH_XS; ctrl.query = { pageNum : 1, fetchSize : ctrl.defaultFetchSize }; - ctrl.beforeCurrent = null; ctrl.dataset.onDatasetChange = (obj, option) => { var t = $P.getGridTemplate();