diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent01030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent01030-main.jsp index 55187df6..c1140cc6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent01030-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent01030-main.jsp @@ -91,6 +91,7 @@ 팩스번호 우편번호 주소 + 상세주소 등록일시 @@ -108,13 +109,14 @@ {ENT_FXNO} {ENT_ZIP} {ENT_ADDR} + {ENT_DTL_ADDR} {REG_DT} diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent01040-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent01040-info.jsp index 9ac192d7..3c400f55 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent01040-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent01040-info.jsp @@ -105,8 +105,6 @@ // pageObject let $P = pageObject["${pageName}"]; - // formFields - $P.formFields = new FimsFormFields($P.selectorn("frmEdit")); // datasetControl $P.ctrl = newRent01040Control("${pageName}", "[data-doctx=${pageName}]"); @@ -156,7 +154,7 @@ }); } - // 임대기업 등록 버튼 클릭 이벤트 + // 임대 기업 저장 $P.fnSave = () => { // validate 확인 if (!AppSupport.customValidate($P.$findn("frmEdit").find("input,select,textarea"))) return; @@ -165,7 +163,8 @@ content: "현재 " + $P.ctrl.prefixName + " 정보를 저장하시겠습니까?" , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { - let params = $P.formFields.get(); + // formFields + let params = new FimsFormFields($P.selectorn("frmEdit")).get(); if (params.entId) { params.callPurpose = "update"; @@ -184,9 +183,9 @@ // 이벤트 $P.setEvent = () => { // 기본 버튼 이벤트 - $P.$findn("btnZipCode").on("click", () => { $P.fnZipCode() }); // 우편번호 검색 + $P.$findn("btnZipCode").on("click", () => { $P.fnZipCode() }); // 우편번호 검색 버튼 // 버튼 이벤트 - $P.$findn("btnSave").on("click", () => { $P.fnSave() }); // 저장 + $P.$findn("btnSave").on("click", () => { $P.fnSave() }); // 저장 버튼 } /************************************************************************** diff --git a/src/main/webapp/resources/js/fims/rent/rent01010.js b/src/main/webapp/resources/js/fims/rent/rent01010.js index 65030002..25cacaf5 100644 --- a/src/main/webapp/resources/js/fims/rent/rent01010.js +++ b/src/main/webapp/resources/js/fims/rent/rent01010.js @@ -48,7 +48,7 @@ function newRent01010Control(pageName, doctx="[data-doctx='rent01010']") { [ctrl.find("[name='tmpltNotFound']").content.querySelector(".cmn").outerHTML] : dataList.inStrings(foundTr.outerHTML, replacer); - let noMore = (dataList.length >= obj["Total"]); // 전체 건수 + let noMore = (dataList.length >= obj["Paging"]?.totalSize); // 전체 건수 let initScroll = (ctrl.query.pageNum < 2); if (option != null && option.reloaded) { diff --git a/src/main/webapp/resources/js/fims/rent/rent01020.js b/src/main/webapp/resources/js/fims/rent/rent01020.js index 82da041b..c21a7b3e 100644 --- a/src/main/webapp/resources/js/fims/rent/rent01020.js +++ b/src/main/webapp/resources/js/fims/rent/rent01020.js @@ -50,7 +50,7 @@ function newRent01020Control(pageName, doctx="[data-doctx='rent01020']") { // 자료 재조회 ctrl.query.callPurpose = "reload"; - ctrl.refreshInfo(ctrl.query); + ctrl.refreshInfo(ctrl.query); // roload() 가 된다면 삭제.. // 오류 발생됨. 한실장님 다시 확인. // ctrl.reload(); // ctrl.load(1); @@ -60,6 +60,7 @@ function newRent01020Control(pageName, doctx="[data-doctx='rent01020']") { }); } + // 재 조회 ctrl.refreshInfo = (params) => { if (!params) return; diff --git a/src/main/webapp/resources/js/fims/rent/rent01030.js b/src/main/webapp/resources/js/fims/rent/rent01030.js index 45db205d..c265a20e 100644 --- a/src/main/webapp/resources/js/fims/rent/rent01030.js +++ b/src/main/webapp/resources/js/fims/rent/rent01030.js @@ -48,7 +48,7 @@ function newRent01030Control(pageName, doctx="[data-doctx='rent01030']") { [ctrl.find("[name='tmpltNotFound']").content.querySelector(".cmn").outerHTML] : dataList.inStrings(foundTr.outerHTML, replacer); - let noMore = (dataList.length >= obj["Total"]); // 전체 건수 + let noMore = (dataList.length >= obj["Paging"]?.totalSize); // 전체 건수 let initScroll = (ctrl.query.pageNum < 2); if (option != null && option.reloaded) { diff --git a/src/main/webapp/resources/js/fims/rent/rent01040.js b/src/main/webapp/resources/js/fims/rent/rent01040.js index 21796a48..bd744ea1 100644 --- a/src/main/webapp/resources/js/fims/rent/rent01040.js +++ b/src/main/webapp/resources/js/fims/rent/rent01040.js @@ -18,8 +18,10 @@ function newRent01040Control(pageName, doctx="[data-doctx='rent01040']") { ctrl.onCurrentChange = (item) => { if (!item) return; + let formFields = new FimsFormFields(ctrl.selector("[name='frmEdit']")); + // 화면에 Dataset 셋팅 - pageObject[pageName].formFields.set(ctrl, item); + formFields.set(ctrl, item); }; // 저장 callback