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 535f3bd8..2512453e 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 @@ -688,7 +688,7 @@ $(document).ready(function(){ } } - $P.fnExcelDown = () => { + $P.fnExcelDown = async() => { if($P.currentDisplay == "photoInspection"){ if($P.photoInspectionControl.dataset.empty){ alert("조회된 자료가 없습니다."); @@ -707,15 +707,18 @@ $(document).ready(function(){ alert("조회된 자료가 없습니다."); return; } - - if(confirm("단속건수 엑셀저장은 확인버튼, 상세내역 엑셀저장시 취소버튼을 누르세요.")){ + + var excelTarget = await dialog2("저장할 자료를 선택하세요.","", + [{key:"main",value:"단속건수 엑셀저장"},{key:"sub",value:"상세내역 엑셀저장"},{key:"cancel",value:"취소"}]); + + if(excelTarget == "main"){ var cellDefs = getCellDefs($("#sameVehicleInspectionMain_Table_0--${pageName} thead th").not(".dummy-th"), $($("#sameVehicleInspectionMainRow--${pageName}")[0].content).find("td").not(".dummy-td")); $P.sameVehicleMainControl.query.cellDefs = cellDefs; $P.sameVehicleMainControl.download(); - } else { + } else if(excelTarget == "sub"){ var cellDefs = getCellDefs($("#sameVehicleInspectionSub_Table_0--${pageName} thead th").not(".dummy-th"), $($("#sameVehicleInspectionSubRow--${pageName}")[0].content).find("td").not(".dummy-td")); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp index 6b1a0367..7136ac3e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02050-info.jsp @@ -69,7 +69,7 @@ $(document).ready(function(){ /************************************************************************** * pageObject.function **************************************************************************/ - $P.fnSave = () => { + $P.fnSave = async() => { var alertMessage = ""; if($("#chgAmtSe--${pageName}").val() == "1"){ @@ -99,7 +99,7 @@ $(document).ready(function(){ alertMessage = "감액 처리하시겠습니까?"; } - if(confirm(alertMessage)){ + if(await confirm2(alertMessage)){ var info = $P.formFields.get(); if (!info) { return; @@ -116,7 +116,7 @@ $(document).ready(function(){ } } - $P.fnRestore = () => { + $P.fnRestore = async() => { if(crdnInfo.OVTIME_YN != "Y" && crdnInfo.OVTIME_PRTTN_YN != "Y"){ dialog.alert({ @@ -129,7 +129,7 @@ $(document).ready(function(){ return; } - if(confirm("원금 복원하시겠습니까?")){ + if(await confirm2("원금 복원하시겠습니까?")){ var info = $P.formFields.get(); info.chgAmtSe = "0"; 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 21c70a8e..63074791 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 @@ -434,7 +434,7 @@ $(document).ready(function(){ displayArea.innerHTML = tagsText; }; - $P.fnSave = () => { + $P.fnSave = async() => { if(!customValidate($("#frmEdit--${pageName} input"))) return; @@ -454,7 +454,7 @@ $(document).ready(function(){ } } - if(confirm("현재 단속 정보를 저장하시겠습니까?")){ + if(await confirm2("현재 단속 정보를 저장하시겠습니까?")){ var info = $P.formFields.get(); if (!info) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp index 1a65a7b3..cae3f3c7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08020-info.jsp @@ -116,11 +116,11 @@ $(document).ready(function(){ $("#vhrno--${pageName}").prop("readonly", !create); } - $P.fnSave = () => { + $P.fnSave = async() => { if(!customValidate($("#frmEdit--${pageName} input"))) return; - if(confirm("면제 차량 정보를 저장하시겠습니까?")){ + if(await confirm2("면제 차량 정보를 저장하시겠습니까?")){ var info = $P.formFields.get(); if (!info) { diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp index 248a72ba..355c3c28 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp @@ -606,10 +606,10 @@ $(document).ready(function(){ }); } - $P.fnCopy = () => { + $P.fnCopy = async() => { var crdnId = $("#crdnId--${pageName}").val(); - if(confirm("현 자료의 복사본을 생성하시겠습니까?")){ + if(await confirm2("현 자료의 복사본을 생성하시겠습니까?")){ ajax.get({ url : $P.crdnControl.urls.create, @@ -763,7 +763,7 @@ $(document).ready(function(){ $P.fnGo(crdnId); } - $P.fnAccept = () => { + $P.fnAccept = async() => { if(!customValidate($("#frmEdit--${pageName} input"))) return; @@ -794,15 +794,15 @@ $(document).ready(function(){ return; } - if(confirm("현재 단속 정보를 저장하시겠습니까?")){ + if(await confirm2("현재 단속 정보를 저장하시겠습니까?")){ $P.save($P.formFields.get(), true); } }; - $P.fnSendBack = () => { - if(!confirm("반송 처리 하시겠습니까?")){ + $P.fnSendBack = async() => { + if(!await confirm2("반송 처리 하시겠습니까?")){ return; } diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp index 28c0faab..15a4b495 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02060-info.jsp @@ -144,11 +144,11 @@ $(document).ready(function() { }); } - $P.fnSave = () => { + $P.fnSave = async() => { if(!customValidate($("#frmEdit--${pageName} input"))) return; - if(confirm("현재 답변 내용을 저장하시겠습니까?")){ + if(await confirm2("현재 답변 내용을 저장하시겠습니까?")){ var info = $P.formFields.get(); if (!info) {