From 0f3e5086d9765bafda2bc7aedc4ae4d1a40e87ef Mon Sep 17 00:00:00 2001 From: JoJH Date: Thu, 7 Nov 2024 16:28:59 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=84=9D=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/fims/excl/excl01020-info.jsp | 4 +--- .../WEB-INF/jsp/fims/excl/excl02020-info.jsp | 9 ++++----- .../WEB-INF/jsp/fims/sprt/sprt02020-info.jsp | 7 +++---- .../WEB-INF/jsp/fims/sprt/sprt02030-info.jsp | 7 +++---- .../WEB-INF/jsp/fims/sprt/sprt02040-info.jsp | 9 ++++----- .../WEB-INF/jsp/fims/sprt/sprt02050-info.jsp | 15 +++++++-------- .../WEB-INF/jsp/fims/sprt/sprt02060-info.jsp | 7 +++---- .../WEB-INF/jsp/fims/sprt/sprt02070-info.jsp | 7 +++---- .../WEB-INF/jsp/fims/sprt/sprt02080-info.jsp | 7 +++---- .../webapp/resources/js/fims/excl/excl01020.js | 1 - .../webapp/resources/js/fims/excl/excl02020.js | 13 ++++--------- 11 files changed, 35 insertions(+), 51 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp index 9440193f..fb84355b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp @@ -150,9 +150,7 @@ $P.fnReset = () => { // 초기화 $P.findn("frmEdit").reset(); // 화면 초기화 - - // 달력 초기화 - AppSupport.initDatepicker($P.findn("frmEdit")); + AppSupport.initDatepicker($P.findn("frmEdit")); // 달력 초기화 // 기본 데이터 설정 $P.$findn("levyExclYmd").datepicker("setDate", TODAY()); // 부과 제외 일자 diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp index ff83ae98..149d1e8c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02020-info.jsp @@ -389,11 +389,12 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmEdit").reset(); + // 초기화 + $P.findn("frmEdit").reset(); // 화면 초기화 + AppSupport.initDatepicker($P.findn("frmEdit")); // 달력 초기화 // 기본 데이터 설정 - $P.$findn("rcptYmd").datepicker("setDate", TODAY()); // 달력 초기화 + $P.$findn("rcptYmd").datepicker("setDate", TODAY()); // 접수 일자 // View로 호출되었을때 disabled 셋팅 if ($P.callPurpose == "view") { @@ -418,8 +419,6 @@ $P.setEvent(); // 2. 초기 화면 설정 - AppSupport.initDatepicker($P.findn("frmEdit")); - $P.fnReset(); // 3. Dataset 설정 diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp index afab8454..76be8d36 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02020-info.jsp @@ -880,10 +880,9 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmCrdnPayer").reset(); - // Dataset 초기화 - $P.ctrlCrdn.dataset.clear(); // 단속 Dataset + // 초기화 + $P.findn("frmCrdnPayer").reset(); // 단속 화면 초기화 + $P.ctrlCrdn.dataset.clear(); // 단속 Dataset 초기화 // 화면 호출(callPurpose)이 view가 아니라면 버튼 활성화 disabled = false if (pageObject["${pageNameMain}"].callPurpose != "view") { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp index 3d0e790b..ecac849e 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02030-info.jsp @@ -541,10 +541,9 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmOpnn").reset(); - // Dataset 초기화 - $P.ctrlOpnn.dataset.clear(); // 의견제출 Dataset + // 초기화 + $P.findn("frmOpnn").reset(); // 의견제출 화면 초기화 + $P.ctrlOpnn.dataset.clear(); // 의견제출 Dataset 초기화 // 화면 호출(callPurpose)이 view가 아니라면 버튼 활성화 disabled = false if (pageObject["${pageNameMain}"].callPurpose != "view") { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp index 4a5a7ddc..7069e3a6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02040-info.jsp @@ -418,11 +418,10 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmEditSndngDtl").reset(); - // Dataset 초기화 - $P.ctrlSndngDtl.dataset.clear(); // 발송상세 - $P.ctrlSvbtc.dataset.clear(); // 공시송달 + // 초기화 + $P.findn("frmEditSndngDtl").reset(); // 발송상세 화면 초기화 + $P.ctrlSndngDtl.dataset.clear(); // 발송상세 Dataset 초기화 + $P.ctrlSvbtc.dataset.clear(); // 공시송달 Dataset 초기화 // 화면 호출(callPurpose)이 view가 아니라면 버튼 활성화 disabled = false if (pageObject["${pageNameMain}"].callPurpose != "view") { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp index a6b6de03..b06bd0e8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp @@ -587,14 +587,13 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmEditRdct").reset(); - $P.findn("frmEditLevyExcl").reset(); - // Dataset 초기화 - $P.ctrlRdct.dataset.clear(); // 감경 - $P.ctrlLevyExcl.dataset.clear(); // 부과제외 - $P.ctrlCrdnSttsHstry.dataset.clear(); // 단속상태 이력 - $P.ctrlPayerAddrHstrys.dataset.clear(); // 단속 납부자주소 이력 + // 초기화 + $P.findn("frmEditRdct").reset(); // 감경 화면 초기화 + $P.findn("frmEditLevyExcl").reset(); // 부과제외 화면 초기화 + $P.ctrlRdct.dataset.clear(); // 감경 Dataset 초기화 + $P.ctrlLevyExcl.dataset.clear(); // 부과제외 Dataset 초기화 + $P.ctrlCrdnSttsHstry.dataset.clear(); // 단속상태 이력 Dataset 초기화 + $P.ctrlPayerAddrHstrys.dataset.clear(); // 단속 납부자주소 이력 Dataset 초기화 // 화면 호출(callPurpose)이 view가 아니라면 버튼 활성화 disabled = false if (pageObject["${pageNameMain}"].callPurpose != "view") { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp index 2e28cb99..f3f072e4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02060-info.jsp @@ -357,10 +357,9 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmEditLevy").reset(); - // Dataset 초기화 - $P.ctrlLevy.dataset.clear(); + // 초기화 + $P.findn("frmEditLevy").reset(); // 부과 화면 초기화 + $P.ctrlLevy.dataset.clear(); // 부과 Dataset 초기화 // 화면 호출(callPurpose)이 view가 아니라면 버튼 활성화 disabled = false if (pageObject["${pageNameMain}"].callPurpose != "view") { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp index 0fed2bbb..c6c9b309 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp @@ -409,10 +409,9 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmEditRcvmt").reset(); - // Dataset 초기화 - $P.ctrlRcvmt.dataset.clear(); // 수납 Dataset + // 초기화 + $P.findn("frmEditRcvmt").reset(); // 수납 화면 초기화 + $P.ctrlRcvmt.dataset.clear(); // 수납 Dataset 초기화 // 화면 호출(callPurpose)이 view라면 버튼 비활성화 disabled = true if (pageObject['${pageNameMain}'].callPurpose != "view") { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp index 07726177..fb38ca53 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02080-info.jsp @@ -253,10 +253,9 @@ // 초기 화면 설정 $P.fnReset = () => { - // 화면 초기화 - $P.findn("frmEditCvlcptDscsn").reset(); - // Dataset 초기화 - $P.ctrlCvlcptDscsn.dataset.clear(); // 수납 Dataset + // 초기화 + $P.findn("frmEditCvlcptDscsn").reset(); // 민원 상담 화면 초기화 + $P.ctrlCvlcptDscsn.dataset.clear(); // 민원 상담 Dataset 초기화 // 화면 호출(callPurpose)이 view라면 버튼 비활성화 disabled = true if (pageObject['${pageNameMain}'].callPurpose != "view") { diff --git a/src/main/webapp/resources/js/fims/excl/excl01020.js b/src/main/webapp/resources/js/fims/excl/excl01020.js index 1dda2870..b9a811d8 100644 --- a/src/main/webapp/resources/js/fims/excl/excl01020.js +++ b/src/main/webapp/resources/js/fims/excl/excl01020.js @@ -32,7 +32,6 @@ function newExcl01020Control(pageName, doctx="[data-doctx='excl01020']") { ctrl.urls.create = wctx.url("/" + item.data.TASK_SE_CD + pageObject[pageName].prefixUrl + "/020/create.do"); // 등록 ctrl.urls.update = wctx.url("/" + item.data.TASK_SE_CD + pageObject[pageName].prefixUrl + "/020/update.do"); // 수정 - // 등록 if (!item.data.LEVY_EXCL_ID) { $(ctrl.find("[name='levyExclYmd']")).datepicker("setDate", TODAY()); // 부과제외 일자 } diff --git a/src/main/webapp/resources/js/fims/excl/excl02020.js b/src/main/webapp/resources/js/fims/excl/excl02020.js index 9eaa77d3..8465b06d 100644 --- a/src/main/webapp/resources/js/fims/excl/excl02020.js +++ b/src/main/webapp/resources/js/fims/excl/excl02020.js @@ -26,15 +26,10 @@ function newExcl02020Control(pageName, doctx="[data-doctx='excl02020']") { ctrl.urls.create = wctx.url("/" + item.data.TASK_SE_CD + pageObject[pageName].prefixUrl + "/020/create.do"); // 등록 ctrl.urls.update = wctx.url("/" + item.data.TASK_SE_CD + pageObject[pageName].prefixUrl + "/020/update.do"); // 수정 - // 접수 일자 - if (!item.data.RCPT_YMD) { - $(ctrl.find("[name='rcptYmd']")).datepicker("setDate", TODAY()); - } - - // 첨부파일 조회 - let key = item.data.OPNN_ID; - if (key != null) { - pageObject[pageName].fnSearchFileList(key); + if (item.data.OPNN_ID) { + pageObject[pageName].fnSearchFileList(item.data.OPNN_ID); // 첨부파일 조회 + } else { + $(ctrl.find("[name='rcptYmd']")).datepicker("setDate", TODAY()); // 접수 일자 } };