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 551875b5..69a2393f 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 @@ -233,6 +233,7 @@ $(document).ready(function(){ **************************************************************************/ $P.fnReset = () => { $P.holdList = []; + $("#btnOpenCvlcptOrgnl--${pageName}").show(); $("#btnDelete--${pageName}").show(); $("#btnDeleteSameRcptYmd--${pageName}").show(); @@ -282,9 +283,11 @@ $(document).ready(function(){ $("#crdnTbody--${pageName}").setCurrentRow(dataKey); if($P.holdList.includes(dataKey)){ + $("#btnOpenCvlcptOrgnl--${pageName}").hide(); $("#btnDelete--${pageName}").hide(); $("#btnDeleteSameRcptYmd--${pageName}").hide(); } else { + $("#btnOpenCvlcptOrgnl--${pageName}").show(); $("#btnDelete--${pageName}").show(); $("#btnDeleteSameRcptYmd--${pageName}").show(); } @@ -292,6 +295,10 @@ $(document).ready(function(){ $P.dblclickCrdnList = (dataKey) => { + if($P.holdList.includes(dataKey)){ + return; + } + var dialogId = "cvlcptInitialDataEditDialog--${pageName}"; ajax.get({ @@ -367,6 +374,7 @@ $(document).ready(function(){ $P.holdList.push(curKey); $("#crdnTbody--${pageName}").find("tr[data-key='"+curKey+"']").addClass("bg-dark"); + $("#btnOpenCvlcptOrgnl--${pageName}").hide(); $("#btnDelete--${pageName}").hide(); $("#btnDeleteSameRcptYmd--${pageName}").hide(); } @@ -456,7 +464,11 @@ $(document).ready(function(){ var ds = $P.crdnControl.dataset.getDataset(); var index = ds.findIndex(item => item.CRDN_ID == currentKey); if(ds.length > index+1){ - return ds[index+1]["CRDN_ID"]; + if($P.holdList.includes(ds[index+1]["CRDN_ID"])){ + return $P.provide.getNextKey(ds[index+1]["CRDN_ID"]); + } else { + return ds[index+1]["CRDN_ID"]; + } } else { return ""; } @@ -465,13 +477,20 @@ $(document).ready(function(){ var ds = $P.crdnControl.dataset.getDataset(); var index = ds.findIndex(item => item.CRDN_ID == currentKey); if(index != 0 && ds.length > 1){ - return ds[index-1]["CRDN_ID"]; + if($P.holdList.includes(ds[index-1]["CRDN_ID"])){ + return $P.provide.getPrevKey(ds[index-1]["CRDN_ID"]); + } else { + return ds[index-1]["CRDN_ID"]; + } } else { return ""; } }, "selectRow" : function(currentKey){ $P.clickCrdnList(currentKey); + }, + "holdRow" : function(currentKey){ + $P.fnHold(currentKey); } }; diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp index 90f55e21..f51740ea 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn01020-info.jsp @@ -2,7 +2,7 @@ <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%>