From a93b2908db9d6496150fc3e7d8fb1277e7845a1e Mon Sep 17 00:00:00 2001 From: JoJH Date: Wed, 13 Nov 2024 18:39:33 +0900 Subject: [PATCH] =?UTF-8?q?1.=20=EB=8B=A8=EC=86=8D=20=EC=82=AC=EC=A7=84?= =?UTF-8?q?=EC=97=90=20=EB=B2=84=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94=20?= =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp | 3 +-- src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp | 4 +++- src/main/webapp/resources/js/fims/rent/rent02020.js | 8 +++++++- src/main/webapp/resources/js/fims/rent/rent03020.js | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp index 974afb1e..6ee462c6 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent02020-info.jsp @@ -313,9 +313,8 @@ // 5. 사진영역 초기화 let crdnInfo = $P.ctrl.getCurrent(); - let existVideo = false; - initPhotoMain("${pageName}", crdnInfo.fileList, existVideo); + initPhotoMain("${pageName}", crdnInfo.fileList, false, false); }); diff --git a/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp index 2401a702..b4c42704 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/rent/rent03020-info.jsp @@ -379,11 +379,13 @@ , async function(vhrnoEl) { return await $P.getVehicleTotalInfo(vhrnoEl); } + , false ); // 5. 사진영역 초기화 let crdnInfo = $P.ctrl.getCurrent(); - initPhotoMain("${pageName}", crdnInfo.fileList, false); + + initPhotoMain("${pageName}", crdnInfo.fileList, false, false); }); diff --git a/src/main/webapp/resources/js/fims/rent/rent02020.js b/src/main/webapp/resources/js/fims/rent/rent02020.js index 4f447ba6..ec6c720c 100644 --- a/src/main/webapp/resources/js/fims/rent/rent02020.js +++ b/src/main/webapp/resources/js/fims/rent/rent02020.js @@ -62,7 +62,10 @@ function newRent02020Control(pageName, doctx="[data-doctx='rent02020']") { } // 재 조회 -> 1건일때 reload 사용시 오류 발생. 배열이 아니여서 발생.. 한실장님에게 수정 요청 - ctrl.refresh = () => { + ctrl.refresh = (query) => { + // + if (query) ctrl.query = query; + ajax.get({ url: ctrl.urls.load , headers: { Accept: "application/json; charset=utf-8" } // json @@ -74,6 +77,9 @@ function newRent02020Control(pageName, doctx="[data-doctx='rent02020']") { // Dataset 셋팅 ctrl.setData([resp.Info]); // 정보 + + // 사진영역 초기화 + initPhotoMain(pageName, resp.Info.fileList, false, false); } }); } diff --git a/src/main/webapp/resources/js/fims/rent/rent03020.js b/src/main/webapp/resources/js/fims/rent/rent03020.js index 45a9dd35..e8054ec9 100644 --- a/src/main/webapp/resources/js/fims/rent/rent03020.js +++ b/src/main/webapp/resources/js/fims/rent/rent03020.js @@ -71,7 +71,7 @@ function newRent03020Control(pageName, doctx="[data-doctx='rent03020']") { ctrl.setData([resp.Info]); // 정보 // 사진영역 초기화 - initPhotoMain(pageName, resp.Info.fileList, false); + initPhotoMain(pageName, resp.Info.fileList, false, false); } }); }