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 a25ed129..c0a1a705 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 @@ -520,8 +520,8 @@ // 삭제 버튼 클릭 이벤트 $P.fnRemove = (btnTitle) => { - let selected = $P.ctrl.getDataset("selected"); // 선택 자료 - + // 선택 자료 확인 + let selected = $P.ctrl.getDataset("selected"); if (selected.length < 1) { dialog.alert({ content: "선택하신 " + $P.ctrl.prefixName + " 정보가 없습니다." 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 59ec3c41..8fe78039 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 @@ -47,9 +47,7 @@
-
-
- +
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp index 35b21add..ace344df 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01020-info.jsp @@ -162,12 +162,12 @@ // URL $P.prefixUrl = "${prefixUrl}"; - // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) - $P.callPurpose = "${callPurpose}"; // datasetControl $P.ctrl = newSndb01020Control("${pageName}", "[data-doctx=${pageName}]"); + // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) + $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 - $P.ctrl.query = ${mainQuery}; + $P.mainQuery = ${mainQuery}; /************************************************************************** * DataTables 이벤트 @@ -316,6 +316,9 @@ // 업무 구분에 따른 URL 설정 $P.ctrl.urls.load = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/020/info.do"); // 조회 $P.ctrl.urls.create = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/020/createList.do"); // 등록 + + // 검색 조건 + $P.ctrl.query = $P.mainQuery; } /************************************************************************** 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 5a3e65a6..abe5da3c 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 @@ -274,12 +274,12 @@ let params = { btnTitle: $P.ctrl.prefixName + " 상세 정보" + , pageNum: 1 // 페이지 번호 + , fetchSize: DEFAULT_FETCH_SIZE // 1번에 조회되는 건수 , callPurpose: "update" , sggCd: $P.ctrl.getValue("SGG_CD") // 시군구 코드 , taskSeCd: $P.ctrl.getValue("TASK_SE_CD") // 업무 구분 코드 , sndngId: $P.ctrl.getValue("SNDNG_ID") // 발송 ID - , pageNum: 1 // 페이지 번호 - , fetchSize: DEFAULT_FETCH_SIZE // 1번에 조회되는 건수 }; $P.ctrl.getInfo(params); 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 cb55f35c..bc99f46d 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 @@ -134,12 +134,12 @@ // URL $P.prefixUrl = "${prefixUrl}"; - // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) - $P.callPurpose = "${callPurpose}"; // datasetControl $P.ctrl = newSndb01040Control("${pageName}", "[data-doctx=${pageName}]"); + // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) + $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 - $P.ctrl.query = ${mainQuery}; + $P.mainQuery = ${mainQuery}; /************************************************************************** * DataTables 이벤트 @@ -303,6 +303,9 @@ // 업무 구분에 따른 URL 설정 $P.ctrl.urls.create = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/040/list.do"); // 조회 + + // 검색 조건 + $P.ctrl.query = $P.mainQuery; } /************************************************************************** diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp index 77234aa7..87ece94c 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01060-info.jsp @@ -160,14 +160,12 @@ // URL $P.prefixUrl = "${prefixUrl}"; - // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) - $P.callPurpose = "${callPurpose}"; - // 사전통지 일자 - $P.advntceYmdInfo = ${advntceYmdInfo}; // datasetControl $P.ctrl = newSndb01060Control("${pageName}", "[data-doctx=${pageName}]"); + // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) + $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 - $P.ctrl.query = ${mainQuery}; + $P.mainQuery = ${mainQuery}; /************************************************************************** * DataTables 이벤트 @@ -321,6 +319,9 @@ // 업무 구분에 따른 URL 설정 $P.ctrl.urls.load = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/060/info.do"); // 조회 $P.ctrl.urls.create = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/060/createList.do"); // 등록 + + // 검색 조건 + $P.ctrl.query = $P.mainQuery; } /************************************************************************** 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 15f00e62..348ca29e 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 @@ -274,12 +274,12 @@ let params = { btnTitle: $P.ctrl.prefixName + " 상세 정보" + , pageNum: 1 // 페이지 번호 + , fetchSize: DEFAULT_FETCH_SIZE // 1번에 조회되는 건수 , callPurpose: "update" , sggCd: $P.ctrl.getValue("SGG_CD") // 시군구 코드 , taskSeCd: $P.ctrl.getValue("TASK_SE_CD") // 업무 구분 코드 , sndngId: $P.ctrl.getValue("SNDNG_ID") // 발송 ID - , pageNum: 1 // 페이지 번호 - , fetchSize: DEFAULT_FETCH_SIZE // 1번에 조회되는 건수 }; $P.ctrl.getInfo(params); 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 35a9fddc..cf03552a 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 @@ -166,12 +166,12 @@ // URL $P.prefixUrl = "${prefixUrl}"; - // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) - $P.callPurpose = "${callPurpose}"; // datasetControl $P.ctrl = newSndb01080Control("${pageName}", "[data-doctx=${pageName}]"); + // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) + $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 - $P.ctrl.query = ${mainQuery}; + $P.mainQuery = ${mainQuery}; /************************************************************************** * DataTables 이벤트 @@ -557,6 +557,9 @@ // 업무 구분에 따른 URL 설정 $P.ctrl.urls.load = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/080/list.do"); // 조회 + + // 검색 조건 + $P.ctrl.query = $P.mainQuery; } /************************************************************************** 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 8d748c12..015711b8 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 @@ -251,7 +251,7 @@ // URL $P.prefixUrl = "${prefixUrl}"; // datasetControl - $P.ctrl = newSndb01070Control("${pageName}", "[data-doctx=${pageName}]"); + $P.ctrl = newSndb01110Control("${pageName}", "[data-doctx=${pageName}]"); /************************************************************************** * DataTables 이벤트 @@ -329,12 +329,12 @@ url: wctx.url("/" + params.taskSeCd + $P.prefixUrl + "/100/info.do") , data: params || {} , success: (resp) => { - let dialogName = "userDialog"; + let dialogName = $P.ctrl.prefixed("Dialog"); let dialogId = dialogName + "-" + uuid(); dialog.open({ id: dialogId - , title: "고지서 발송 대상" + , title: params.btnTitle , size: "lg" , content: resp , init: () => { diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp index 2bce026a..8f549129 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01120-info.jsp @@ -160,12 +160,12 @@ // URL $P.prefixUrl = "${prefixUrl}"; - // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) - $P.callPurpose = "${callPurpose}"; // datasetControl $P.ctrl = newSndb01120Control("${pageName}", "[data-doctx=${pageName}]"); + // infoDialog 호출 용도(view 조회(편집불가), create 등록, update 수정) + $P.callPurpose = "${callPurpose}"; // main 의 검색 조건을 그대로 유지 - $P.ctrl.query = ${mainQuery}; + $P.mainQuery = ${mainQuery}; /************************************************************************** * DataTables 이벤트 @@ -470,6 +470,9 @@ // 업무 구분에 따른 URL 설정 $P.ctrl.urls.load = wctx.url("/" + "${taskSeCd}" + $P.prefixUrl + "/120/list.do"); + + // 검색 조건 + $P.ctrl.query = $P.mainQuery; } /************************************************************************** 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 58f27e73..7529a079 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 @@ -3,808 +3,705 @@ 반송 현황 - -
- -
-
- -
- - - - - -
- - - -
- - - - -
+
+ + + + + ~ + + + +
+
+ + + + +
+
+
+ + + + +
+ + +
+ +
    +
+
+ + + + + + + +
+
+ + + +
+ +
+ +
+ + + +
- + 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 d7eb06db..ac082020 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 @@ -3,721 +3,657 @@ 공시송달 현황 - -
- -
-
- -
- - - - - -
- - - -
- - - - -
+
+ + + + +
+
+
+ + + + +
+ + +
+ +
    +
+
+ + + + + + +
+
+ + + +
+ +
+ +
+ + + +
- + diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp index 2777dc1d..8bc3cba9 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01250-info.jsp @@ -1,543 +1,481 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -공시송달 상세 - - -
- -
- - -
- -
- -
- - - -
- - -
- -
    -
-
- - - - - - -
-
- - -
- -
-
- - - -
- +고지서 발송 현황 상세 정보 + + +
+ +
+ +
+ +
+ + + +
+ + + +
+ + +
+ +
    +
+
+ + + + + + +
+
+ + +
+ +
+
+ +
+
- + diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01260-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01260-info.jsp index a3324e85..3c9f331f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01260-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01260-info.jsp @@ -1,249 +1,169 @@ <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> <%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> -공시송달 정보 +공시송달 등록 -
- -
- - -
- -
- - - - - -
- -
- - -
- -
- - - -
- -
- - - -
- -
- - -
- -
- - -
- -
- - -
-
-
- - - -
- - - - - - -
-
- - -
- +
+ +
+
+ +
+ + + + + +
+ +
+ + +
+
+ + + + + ~ + + + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ + +
+ + + + + + +
+ +
+
diff --git a/src/main/webapp/resources/js/fims/sndb/sndb01110.js b/src/main/webapp/resources/js/fims/sndb/sndb01110.js index 1d6d953f..22ab26b4 100644 --- a/src/main/webapp/resources/js/fims/sndb/sndb01110.js +++ b/src/main/webapp/resources/js/fims/sndb/sndb01110.js @@ -1,4 +1,4 @@ -function newSndb01070Control(pageName, doctx="[data-doctx='sndb01070']") { +function newSndb01110Control(pageName, doctx="[data-doctx='sndb01110']") { let ctrl = new DatasetControl({ doctx: doctx , prefix: "nhtSndng" diff --git a/src/main/webapp/resources/js/fims/sndb/sndb01220.js b/src/main/webapp/resources/js/fims/sndb/sndb01220.js new file mode 100644 index 00000000..8786eb2c --- /dev/null +++ b/src/main/webapp/resources/js/fims/sndb/sndb01220.js @@ -0,0 +1,152 @@ +function newSndb01220Control(pageName, doctx="[data-doctx='sndb01220']") { + let ctrl = new DatasetControl({ + doctx: doctx + , prefix: "sndbk" + , prefixName: "반송" + , dataGetter: obj => obj["List"] + , keys: ["SNDNG_DTL_ID"] + , appendData: true + , infoSize: "xxl" + , urls: { + load: "/list.do" + , getInfo: "/info.do" + , remove: "/remove.do" + } + , formats: { + DLVR_YMD: dateFormat + , DLVR_TM: timeFormat + , SNDNG_YMD: dateFormat + , CRDN_YMD_TM: datetimeFormat + , FFNLG_AMT: numberFormat + , PCPTAX: numberFormat + , ADAMT: 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']" //