From 391db4f5a96afc41746c47f25992c772e9e89f07 Mon Sep 17 00:00:00 2001 From: mjkhan21 Date: Tue, 18 Feb 2025 11:19:09 +0900 Subject: [PATCH] =?UTF-8?q?=EB=8D=94=EB=B8=94=ED=81=B4=EB=A6=AD=20->=20?= =?UTF-8?q?=EC=B0=A8=EC=A0=81=EC=A1=B0=ED=9A=8C,=20=EB=B6=80=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=EC=99=B8=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1/?= =?UTF-8?q?=EB=B9=84=ED=99=9C=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 9 ++++- .../WEB-INF/jsp/fims/crdn/crdn05010-main.jsp | 6 +-- .../WEB-INF/jsp/fims/crdn/crdn05030-info.jsp | 38 +++++++------------ 3 files changed, 25 insertions(+), 28 deletions(-) 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 774f2ddd..25f82d37 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 @@ -385,7 +385,8 @@ pageObject["${pageName}"] = newDoctxFinder("${pageName}"); $(document).ready(function(){ - var $P = pageObject["${pageName}"]; + let $P = pageObject["${pageName}"]; + let enableExclBtn = (dataItem) => $P.$findn("btnInstLevyExcl").prop("disabled", !dataItem || "21" != dataItem.data["CRDN_STTS_CD"]); /************************************************************************** * DatasetControl, DatasetSupport, FormFields @@ -433,6 +434,7 @@ $(document).ready(function(){ } $P.showPhoto(curCrdnId,nextCrdnId,curDataVhrno,nextDataVhrno); + enableExclBtn(dataItem); } $P.pagingSupport0 = new FimsPagingSupport({ @@ -479,6 +481,7 @@ $(document).ready(function(){ shift.dataset.onCurrentChange = (dataItem) => { Apply.fromDataset.currentRow(shift.dataset, dataItem, $P.findn("sameVehicleInspectionSubTbody")); + enableExclBtn(dataItem); }; @@ -1011,6 +1014,8 @@ $(document).ready(function(){ $P.$findn('btnPhotoInspection').addClass("active"); $P.$findn('btnSameVehicleInspection').removeClass("active"); $P.currentDisplay = "photoInspection"; + + enableExclBtn(ctrl.getCurrent("item")); }); $P.$findn("btnSameVehicleInspection").on('click', () => { @@ -1020,6 +1025,8 @@ $(document).ready(function(){ $P.$findn("btnSameVehicleInspection").addClass("active"); $P.$findn("btnPhotoInspection").removeClass("active"); $P.currentDisplay = "sameVehicleInspection"; + + enableExclBtn(shift.getCurrent("item")); }); $P.$findn('btnSearch').on('click', () => $P.searchInspectionList()); //검색버튼 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 0e23da3d..72438fa2 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 @@ -225,9 +225,9 @@ $(document).ready(function(){ } $P.clickCrdnList = (dataIndex) => { - if(dataIndex == ""){ + if(!dataIndex) return; - } + $P.$findn("crdnTbody").setCurrentRow(dataIndex); @@ -249,7 +249,7 @@ $(document).ready(function(){ ajax.get({ url : url, - data : {}, + data : {taskSeCd: currentTask()}, success : (resp) => { let dialogId = dialogName+"-"+uuid(); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp index f610ee64..97cd6764 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05030-info.jsp @@ -560,14 +560,13 @@ $(document).ready(function(){ $P.fnDisplay(); }); - - $P.$findn("vhrno").onEnterPress(function(){ - + + let getPayerInfo = () => { var crdnYmd = $P.$findn("crdnYmd").val().replaceAll("-", ""); var vhrnoEl = event.target; var vhrno = vhrnoEl.value; - if(crdnYmd == ""){ - dialog.alert({ + if(!crdnYmd) + return dialog.alert({ content : "단속일자를 입력하세요.", init : function(){ AppSupport.setDialogZindex(); @@ -576,10 +575,8 @@ $(document).ready(function(){ onClose : function(){ $P.$findn("crdnYmd").focus(); } }); - return; - } - if(vhrno == ""){ - dialog.alert({ + if(!vhrno){ + return dialog.alert({ content:"차량번호를 입력하세요.", init : function(){ AppSupport.setDialogZindex(); @@ -587,7 +584,6 @@ $(document).ready(function(){ }, onClose:function(){ $(vhrnoEl).focus(); } }); - return; } json.post({ @@ -606,19 +602,9 @@ $(document).ready(function(){ AppSupport.focusClose(); } }); - $P.$findn("rtpyrId").val(""); - $P.$findn("addrSn").val(""); - $P.$findn("rtpyrNm").val(""); - $P.$findn("rtpyrSeCd").val(""); - $P.$findn("rtpyrNo").val(""); - $P.$findn("vin").val(""); - $P.$findn("vhclNm").val(""); - $P.$findn("vhclColr").val(""); - $P.$findn("useFuelCd").val(""); - $P.$findn("ffnlgCarmdlCd").val(""); - $P.$findn("zip").val(""); - $P.$findn("addr").val(""); - $P.$findn("dtlAddr").val(""); + + ["rtpyrId", "addrSn", "rtpyrNm", "rtpyrSeCd", "rtpyrNo", "vin", "vhclNm", "vhclColr", "useFuelCd", "ffnlgCarmdlCd", "zip", "addr", "dtlAddr"] + .forEach(name => $P.$findn(name).val("")) return; } @@ -667,8 +653,12 @@ $(document).ready(function(){ $P.$findn("dtlAddr").val(vehicle.use_strnghld_adres_nm); //상세주소 } }); + + }; - }); + let input = $P.$findn("vhrno"); + input.onEnterPress(getPayerInfo); + input.on("dblclick", getPayerInfo); $P.$findn("teamId").on("change",function(){ $P.$findn("teamer1").val("");