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 324d2c55..a25ed129 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 @@ -384,6 +384,8 @@ // 삭제사유 callback $P.callbackRsn = (obj) => { + if (!obj) return; + let selected = $P.ctrl.getDataset("selected"); // 선택 자료 // 서버에 전송할 data(파라미터) 생성 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 b1ba96da..40634b1b 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 @@ -432,7 +432,7 @@ dialog.open({ id: "levyExclDialog" , title: "부과제외 정보" - , size: "md" + , size: "md" , content: resp , onClose: () => { $P.ctrl.reload({all : true}); } // 자료 재조회 }); 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 5b242426..5a3e65a6 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 @@ -58,7 +58,7 @@
- @@ -285,6 +285,11 @@ $P.ctrl.getInfo(params); } + // DataTables에 스크롤이 맨 밑으로 이동했을 때 이벤트 + $P.scrollDataList = () => { + $P.ctrl.load($P.ctrl.query.pageNum + 1); + } + /************************************************************************** * 사용자 함수(function) **************************************************************************/ diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp index b7cdf127..cb55f35c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01040-info.jsp @@ -138,6 +138,8 @@ $P.callPurpose = "${callPurpose}"; // datasetControl $P.ctrl = newSndb01040Control("${pageName}", "[data-doctx=${pageName}]"); + // main 의 검색 조건을 그대로 유지 + $P.ctrl.query = ${mainQuery}; /************************************************************************** * DataTables 이벤트 @@ -193,7 +195,21 @@ // DataTables에 스크롤이 맨 밑으로 이동했을 때 이벤트 $P.scrollDataList = () => { - $P.ctrl.load($P.ctrl.query.pageNum + 1); + // 페이지 증가 + $P.ctrl.query.pageNum += 1; + + ajax.get({ + url: $P.ctrl.urls.load + , headers: { Accept: "application/json; charset=utf-8" } // json + , data: $P.ctrl.query + , success: (resp) => { + if (!$P.ctrl.appendData || $P.ctrl.query.pageNum == 1) + $P.ctrl.setData(resp); + else { + $P.ctrl.addData(resp); + } + } + }); } /************************************************************************** @@ -234,7 +250,7 @@ } // 계고장출력 버튼 이벤트 - $P.fnPrint = () => { + $P.fnPrint = (btnTitle) => { // validate 확인 if (!AppSupport.customValidate($P.$findn("frmEdit").find("input,select,textarea"))) return; @@ -243,6 +259,7 @@ , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { let params = new FimsFormFields($P.selectorn("frmEdit")).get(); // formFields + params.btnTitle = btnTitle; // 버튼 타이틀 $P.print(params); } 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 f6ed747b..1a6bc22a 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 @@ -3,640 +3,521 @@ 사전통지 발송 현황 - -
- -
-
- -
- - - - - -
- - - -
- - - - -
+
+ + + + +
+
+
+ + + + +
+ + +
+ +
    +
+
+ + + + +
+
+ + + +
+ +
+ +
+
+ + +
- + 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 98f4a954..226e0350 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 @@ -3,664 +3,575 @@ 사전통지 발송 현황 상세 정보 - -
- -
- - -
- -
- - - -
- - - -
- - -
- -
    -
-
- - - - - - - - - - - -
-
- - -
- -
-
- - -
- + +
+ +
+ +
+ +
+ + + +
+ + + +
+ + +
+ +
    +
+
+ + + + + + + + + + + +
+
+ + +
+ +
+
+ +
+
- + diff --git a/src/main/webapp/resources/js/fims/sndb/sndb01040.js b/src/main/webapp/resources/js/fims/sndb/sndb01040.js index 2c44dda0..5d252a62 100644 --- a/src/main/webapp/resources/js/fims/sndb/sndb01040.js +++ b/src/main/webapp/resources/js/fims/sndb/sndb01040.js @@ -65,33 +65,5 @@ function newSndb01040Control(pageName, doctx="[data-doctx='sndb01040']") { Apply.fromDataset.currentRow(ctrl.dataset, item, ctrl.find("[name='tbodyList']")); }; - // 저장 callback - ctrl.onSave = (params, resp) => { - let modalId = $(document.querySelector(doctx)).parents(".modal")[0].id; - let dialogTitle = $("#" + modalId).find("h5.modal-title").html(); - let showMessage = resp.rtnMsg.replace(/[S]|[F]/g, dialogTitle); - - // 메시지 출력 - dialog.alert({ - content: showMessage - , init: () => { AppSupport.setDialogZindex(); } - , onOK: () => { } - , onClose: () => { - if (resp.saved) { dialog.close(modalId); } - } - }); - } - - // 저장 - ctrl.save = (params) => { - if (!params) return; - - ajax.post({ - url: ctrl.urls.create - , data: params || {} - , success: (resp) => { ctrl.onSave(params, resp); } - }); - } - return ctrl; } diff --git a/src/main/webapp/resources/js/fims/sndb/sndb01070.js b/src/main/webapp/resources/js/fims/sndb/sndb01070.js new file mode 100644 index 00000000..d7f2e667 --- /dev/null +++ b/src/main/webapp/resources/js/fims/sndb/sndb01070.js @@ -0,0 +1,149 @@ +function newSndb01070Control(pageName, doctx="[data-doctx='sndb01070']") { + let ctrl = new DatasetControl({ + doctx: doctx + , prefix: "advntceSndng" + , prefixName: "사전통지 발송 현황" + , dataGetter: obj => obj["List"] + , keys: ["SNDNG_ID"] + , appendData: true + , infoSize: "xxl" + , urls: { + load: "/list.do" + , getInfo: "/info.do" + , remove: "/remove.do" + } + , formats: { + SNDNG_YMD: dateFormat + , SNDNG_END_YMD: dateFormat + , TNOCS: numberFormat + , GRAMT: numberFormat + , REG_DT: datetimeFormat + , MDFCN_DT: datetimeFormat + } + }); + + // 검색 조건 + ctrl.query = { pageNum: 1, fetchSize: DEFAULT_FETCH_SIZE }; // 1 페이지당 자료 건수 index.jsp에서 확인 + // paging + ctrl.pagingSupport = new FimsPagingSupport({ + ctrl: ctrl // DatasetControl + , ignoreCtrlPrefix: true // ctrl.prefix 가 있더라도 무시 + , linkContainer: "[name='dataPaging']" //