diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp index 9bb0a79b..9ba3e594 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp @@ -421,27 +421,37 @@ } // 우편통합발송 버튼 이벤트 - $P.fnCreateSndngLink = (title) => { + $P.fnCreateSndngLink = async(title) => { // validate 확인 if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; - let popupWidth = 480; - let popupHeight = 480; - - let popupX = (window.screen.width / 2) - (popupWidth / 2); - let popupY= (window.screen.height / 2) - (popupHeight / 2); - - window.open( - wctx.url("/resources/html/inputDateDialog.html" - + "?openerPageName=${pageName}" - + "&prefix=" + "sndngLink" - + "&callPurpose=" + "create" - + "&sndngYmd=" + $P.control.dataset.getValue("SNDNG_YMD") - + "&sndngEndYmd=" + $P.control.dataset.getValue("SNDNG_END_YMD") - ) - , "inputEPostDateDialog" - , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY - ); + var resp = await fetch(wctx.url("/resources/html/inputDateDialog.html")); + var template = await resp.text(); + + dialog.open({ + id : "inputEPostDateDialog", + title: title, + size : "md", + content: template, + init : () => { + $("#divPostSndng").show(); + initDatepicker("frmInputDate"); + $("#sndngYmd").datepicker("setDate", $P.control.dataset.getValue("SNDNG_YMD")); + $("#sndngEndYmd").datepicker("setDate", $P.control.dataset.getValue("SNDNG_END_YMD")); + }, + onOK : () => { + if (!inputDateComparison($("#sndngYmd").val(), $("#sndngEndYmd").val())) { + return; + } + + $P.callbackDate({ + "sndngYmd" : $("#sndngYmd").val(), + "sndngEndYmd" : $("#sndngEndYmd").val(), + "postSndngSeCd" : $("#frmInputDate").find("[name='postSndngSeCd']:checked").val() + }); + } + }); + } // 사전통지출력 버튼 이벤트 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp index b45ebc12..ca55d0ba 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01210-main.jsp @@ -491,30 +491,39 @@ } // 감경부과등록 버튼 이벤트 - fnCreateRductLevy${pageName} = () => { + fnCreateRductLevy${pageName} = async() => { // validate 확인 if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; - let callbackFuncName = "createRductLevy${pageName}"; let sndngYmd = DateUtil.getDateDay().date; let dudtYmd = DateUtil.getDateDay(20).date; - let popupWidth = 480; - let popupHeight = 480; - - let popupX = (window.screen.width / 2) - (popupWidth / 2); - let popupY= (window.screen.height / 2) - (popupHeight / 2); - - window.open( - wctx.url("/resources/html/inputDateDialog.html" - + "?callbackFuncName=" + callbackFuncName - + "&CALL_PURPOSE=" + "levy" - + "&SNDNG_YMD=" + sndngYmd - + "&DUDT_YMD=" + dudtYmd - ) - , "inputEPostDateDialog" - , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY - ); + var resp = await fetch(wctx.url("/resources/html/inputDateDialog.html")); + var template = await resp.text(); + + dialog.open({ + id : "inputRductLevyDateDialog", + title: "감경부과등록", + size : "md", + content: template, + init : () => { + $("#divPostSndng").hide(); + initDatepicker("frmInputDate"); + $("#sndngYmd").datepicker("setDate", sndngYmd); + $("#sndngEndYmd").datepicker("setDate", sndngEndYmd); + }, + onOK : () => { + if (!inputDateComparison($("#sndngYmd").val(), $("#sndngEndYmd").val())) { + return; + } + + $P.callbackDate({ + "sndngYmd" : $("#sndngYmd").val(), + "dudtYmd" : $("#sndngEndYmd").val() + }); + } + }); + } /************************************************************************** diff --git a/src/main/webapp/resources/html/inputDateDialog.html b/src/main/webapp/resources/html/inputDateDialog.html index 689f2640..ac7a0f60 100644 --- a/src/main/webapp/resources/html/inputDateDialog.html +++ b/src/main/webapp/resources/html/inputDateDialog.html @@ -1,177 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 일자선택 - - - -
-
-
-
- -
- - - -
- -
- - - -
- -
- - - - - -
-
+
+ +
+
+ +
+ + +
- - -
- - - + +
+ + + +
+ +
+ + + + - +
- - - - - - - - - - - - - - - - - - - - + +
\ No newline at end of file diff --git a/src/main/webapp/resources/js/base/base-fims.js b/src/main/webapp/resources/js/base/base-fims.js index 79c6b6da..753cdbf7 100644 --- a/src/main/webapp/resources/js/base/base-fims.js +++ b/src/main/webapp/resources/js/base/base-fims.js @@ -19,7 +19,7 @@ async function dialog2(msg, type, buttons){ var template = await resp.text(); var container = "
{content}
"; if(type == "prompt"){ - var rsn = '
'; + var rsn = '
'; content = container.replace(/{content}/g, msg + rsn); } else { content = container.replace(/{content}/g, msg); diff --git a/src/main/webapp/resources/js/fims/framework/cmm/cmmnDateUtil.js b/src/main/webapp/resources/js/fims/framework/cmm/cmmnDateUtil.js index 03b7e201..b6c012a8 100644 --- a/src/main/webapp/resources/js/fims/framework/cmm/cmmnDateUtil.js +++ b/src/main/webapp/resources/js/fims/framework/cmm/cmmnDateUtil.js @@ -5,6 +5,44 @@ function TODAY(){ return dateFormat.format(new Date()); } +function inputDateComparison(sndngYmd, sndngEndYmd) { + let startDate = inputDateSplit(sndngYmd); // 시작일 + let endDate = inputDateSplit(sndngEndYmd); // 종료일 + + if (typeof startDate == "undefined" || startDate == null || startDate == "") { + alert("시작일이 입력되지 않았습니다.\n시작일을 입력해주세요."); + $("#sndngYmd").focus(); + + return false; + } + if (typeof endDate == "undefined" || endDate == null || endDate == "") { + alert("종료일이 입력되지 않았습니다.\n종료일을 입력해주세요."); + $("#sndngEndYmd").focus(); + + return false; + } + // 입력일을 확인하는 이유는 현재 작성한 일자가 시작일인지 종료일인지 확인하기 위해서이다. + if (startDate > endDate) { + alert("시작일이 종료일보다 이 후 일수는 없습니다.\n다시 선택하여 주시기 바랍니다."); + $("#sndngYmd").focus(); + + return false; + } + + return true; +} + +// 날짜형식에 "-"이 사용된 경우에 한하여 날짜값에서 "-" 기호를 제거한다. +function inputDateSplit(obj) { + if (obj == "") { + return obj; + } else { + let dateArray = obj.split("-"); + + return dateArray[0] + dateArray[1] + dateArray[2]; + } +} + var DateUtil = { /*============================ * 현재날짜로부터 월 단위로 계산된 날짜(yyyymmdd) 반환