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 3e225cc..3dbb50e 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 @@ -43,7 +43,7 @@
-
+
@@ -54,7 +54,6 @@ - @@ -67,15 +66,10 @@ -
차량번호 단속장소 위반내용
VHRNO CRDN_PLC VLTN_ARTCL
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 998d679..cebcde6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -170,7 +170,7 @@
+ class="table-responsive h-px-500"> @@ -194,7 +194,7 @@ + style="width: 140px;" class="cmn">상태
사진건수 처리상태 제외사유 { let noMore = (listLength >= total); - var initScroll = (ctrl.query.pageNum < 2); - if(option != null && option.reloaded){ + let initScroll = (ctrl.query.pageNum < 2); + if (option != null && option.reloaded){ initScroll = false; } $P.findn("table-responsive").changeContent(trs, initScroll, noMore); fn_securityModeToggle($("#securityMode--top").is(":checked")); //보안모드 - } $P.clickCrdnList = (dataIndex) => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index 30cc073..ae42195 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -45,7 +45,7 @@
-
+
@@ -55,14 +55,10 @@ - - - - - + + + - - @@ -74,18 +70,14 @@ - - - - - + + + - -
공문번호 소유주명 면제기간등록자등록일시수정자수정일시삭제자등록일시 / 사용자수정일시 / 사용자삭제일시 / 사용자 삭제사유삭제일시
DOC_NO OWNR_NM {EXMPTN_BGNG_YMD} ~ {EXMPTN_END_YMD}RGTR_NMREG_DTMDFR_NMMDFCN_DTDLTR_NM{REG_DT} / {RGTR_NM}{MDFCN_DT} / {MDFR_NM}{DEL_DT} / {DLTR_NM} DEL_RSNDEL_DT
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp index 77b1160..0774ef8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp @@ -162,7 +162,7 @@
-
+
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 13ceffd..5085cfa 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 @@ -164,5 +164,5 @@ // 3. dataset 설정 $P.ctrl.setData([${Info}]); }); - - +//# sourceURL=excl01020-info.jsp + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp index 74d7e86..33129d0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl02010-main.jsp @@ -194,7 +194,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp index 19c1c7b..9f6392b 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl03010-main.jsp @@ -141,7 +141,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp index 3901274..2cb9dd8 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp @@ -143,7 +143,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp index a239d6a..11f1052 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01010-main.jsp @@ -147,7 +147,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp index 119a904..c4bfce3 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01030-main.jsp @@ -129,7 +129,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp index ccc970b..35060d4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01050-main.jsp @@ -132,7 +132,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp index 709fe6a..77ac8c7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01070-main.jsp @@ -129,7 +129,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp index c6b0d34..d298e68 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01110-main.jsp @@ -138,7 +138,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp index b8d8a25..aae0a0f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01220-main.jsp @@ -177,7 +177,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp index 1264abc..c1c9a76 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01240-main.jsp @@ -147,7 +147,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp index ec4b22d..5695347 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02010-main.jsp @@ -395,33 +395,30 @@ * 사용자 함수(function) **************************************************************************/ // 자료 재조회 - $P.fnRefresh = $P.fnRefreshInfo = (params) => { - if (!params) return; - + $P.fnRefresh = $P.fnRefreshInfo = (params = {}) => { ajax.get({ url: wctx.url("/sprt/sprt02/010/main.do") , headers: { Accept: "application/json; charset=utf-8" } // json - , data: params || {} + , data: params , success: resp => { - if (resp.totalInfo) { - // 최상단 단속 Data 셋팅 - $P.ctrlMain.setData([resp.totalInfo]); - - if ($P.activeTabIndex == 0) { - $P.fnCrdnPayerInfo(); // 단속 납부자 Data 셋팅 - } else if ($P.activeTabIndex == 1) { - $P.fnOpnnSbmsnInfo(); // 의견제출 정보 - } else if ($P.activeTabIndex == 2) { - $P.fnSndngInfo(); // 발송 반송 정보 - } else if ($P.activeTabIndex == 3) { - $P.fnPrcsInfo(); // 처리 상세 정보 - } else if ($P.activeTabIndex == 4) { - $P.fnLevyInfo(); // 부과체납 정보 - } else if ($P.activeTabIndex == 5) { - $P.fnRcvmtInfo(); // 수납 정보 - } else if ($P.activeTabIndex == 6) { - $P.fnCvlcptDscsnInfo(); // 민원상담 정보 - } + if (!resp.totalInfo) return; + // 최상단 단속 Data 셋팅 + $P.ctrlMain.setData([resp.totalInfo]); + + if ($P.activeTabIndex == 0) { + $P.fnCrdnPayerInfo(); // 단속 납부자 Data 셋팅 + } else if ($P.activeTabIndex == 1) { + $P.fnOpnnSbmsnInfo(); // 의견제출 정보 + } else if ($P.activeTabIndex == 2) { + $P.fnSndngInfo(); // 발송 반송 정보 + } else if ($P.activeTabIndex == 3) { + $P.fnPrcsInfo(); // 처리 상세 정보 + } else if ($P.activeTabIndex == 4) { + $P.fnLevyInfo(); // 부과체납 정보 + } else if ($P.activeTabIndex == 5) { + $P.fnRcvmtInfo(); // 수납 정보 + } else if ($P.activeTabIndex == 6) { + $P.fnCvlcptDscsnInfo(); // 민원상담 정보 } } }); @@ -493,5 +490,5 @@ // 4. 단속, 납부자 정보 조회 $P.fnCrdnPayerInfo(); }); - - +//# sourceURL=sprt02010-main.jsp + \ No newline at end of file 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 09b42dc..0b97a40 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 @@ -31,7 +31,7 @@
-
+
@@ -149,7 +149,7 @@
-
+
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 a042ee8..4a395e2 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 @@ -143,7 +143,7 @@
-
+
@@ -194,7 +194,7 @@
-
+
@@ -326,9 +326,13 @@ ctrlMain.setData([resp.totalInfo]); // 감경 정보 - if (resp.rdctInfo) { $P.ctrlRdct.setData([resp.rdctInfo]); } + if (resp.rdctInfo) + $P.ctrlRdct.setData([resp.rdctInfo]); // 부과제외 정보 - if (resp.levyExclInfo) { $P.ctrlLevyExcl.setData([resp.levyExclInfo]); } + if (resp.levyExclInfo) { + $P.ctrlLevyExcl.setData([resp.levyExclInfo]); + $P.fnReset(false); + } // 단속상태 이력 $P.ctrlCrdnSttsHstry.setData(resp.crdnSttsHstrys); // 납부자 주소 이력 @@ -584,7 +588,8 @@ } // 초기 화면 설정 - $P.fnReset = () => { + $P.fnReset = (reset = true) => { + if (reset) { // 초기화 $P.findn("frmEditRdct").reset(); // 감경 화면 초기화 $P.findn("frmEditLevyExcl").reset(); // 부과제외 화면 초기화 @@ -592,7 +597,8 @@ $P.ctrlLevyExcl.dataset.clear(); // 부과제외 Dataset 초기화 $P.ctrlCrdnSttsHstry.dataset.clear(); // 단속상태 이력 Dataset 초기화 $P.ctrlPayerAddrHstrys.dataset.clear(); // 단속 납부자주소 이력 Dataset 초기화 - + } +<%-- // 화면 호출(callPurpose)이 view가 아니라면 버튼 활성화 disabled = false if (pageObject["${pageNameMain}"].callPurpose != "view") { $P.$findn("btnCreateRdct").prop("disabled", false); @@ -603,9 +609,13 @@ $P.$findn("btnUpdateLevyExcl").prop("disabled", false); $P.$findn("btnRemoveLevyExcl").prop("disabled", false); } +--%> let crdnSttsCd = pageObject["sprt02010"].ctrlMain.dataset.getDataset()[0].CRDN_STTS_CD; + debug("crdnSttsCd", crdnSttsCd); $P.$findn("btnCreateWrng").prop("disabled", crdnSttsCd != "21"); $P.$findn("btnCreateLevyExcl").prop("disabled", crdnSttsCd == "81"); + $P.$findn("btnUpdateLevyExcl").prop("disabled", crdnSttsCd != "81"); + $P.$findn("btnRemoveLevyExcl").prop("disabled", crdnSttsCd != "81"); } /************************************************************************** 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 2a03adf..df584eb 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 @@ -28,7 +28,7 @@
-
+
diff --git a/src/main/webapp/resources/js/fims/excl/excl01020.js b/src/main/webapp/resources/js/fims/excl/excl01020.js index 5adc4db..452fb6b 100644 --- a/src/main/webapp/resources/js/fims/excl/excl01020.js +++ b/src/main/webapp/resources/js/fims/excl/excl01020.js @@ -49,7 +49,6 @@ function newExcl01020Control(pageName, doctx="[data-doctx='excl01020']") { if (pageObject[pageName].savedCallbackFuncName != "") { pageObject[pageName].savedCallbackFuncName(resp.saved); } - if (resp.saved) { dialog.close(modalId); } } }); diff --git a/src/main/webapp/resources/js/fims/sprt/sprt02050.js b/src/main/webapp/resources/js/fims/sprt/sprt02050.js index 0ca8ec3..24041b4 100644 --- a/src/main/webapp/resources/js/fims/sprt/sprt02050.js +++ b/src/main/webapp/resources/js/fims/sprt/sprt02050.js @@ -114,12 +114,12 @@ function newSprt02050ControlLE(pageName, doctx="[data-doctx='sprt02050']", mainP }; // 상세 정보 dialog - ctrlLevyExcl.getInfo = (params) => { + ctrlLevyExcl.getInfo = (params = {}) => { if (!params) return; ajax.get({ url: wctx.url("/excl/excl01/020/info.do") - , data: params || {} + , data: params , success: (resp) => { if ((typeof resp) != "string") { if (resp.rtnMsg) @@ -149,7 +149,8 @@ function newSprt02050ControlLE(pageName, doctx="[data-doctx='sprt02050']", mainP // 삭제 callback ctrlLevyExcl.onRemove = (params, resp) => { if (resp.saved) - return pageObject[mainPageName].fnRefresh(); + return pageObject[pageName].fnRefresh(); +// return pageObject[mainPageName].fnRefresh(); let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, params.btnTitle);