From 1d5fd00f624abe14f2f60f71c0f0fe23612b2e98 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Tue, 9 Jul 2024 13:54:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=83=81=ED=92=88=EA=B2=80=EC=83=89?= =?UTF-8?q?=20=ED=8C=9D=EC=97=85=20:=20=EC=8B=9C=EB=A6=AC=EC=96=BC?= =?UTF-8?q?=EB=B2=88=ED=98=B8=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EC=BD=94=EB=A9=98=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp index 2ba5f8f..56260f1 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp @@ -86,6 +86,9 @@ +
+ 유효기간(제조번호 또는 시리얼번호 조회 결과 내에서 조회) +
From e80db59cde6fa8bcc7235a6a9e4fbfe3fe94de77 Mon Sep 17 00:00:00 2001 From: leebj Date: Tue, 9 Jul 2024 14:03:09 +0900 Subject: [PATCH 2/2] =?UTF-8?q?reload=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp | 14 ++++++++++---- .../WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp | 14 ++++++++++---- .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp | 14 ++++++++++---- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp index a4549c5..c53c843 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp @@ -241,8 +241,8 @@ * DatasetControl 이벤트 **************************************************************************/ // Dataset 변경 이벤트 - $P.control.onDatasetChange = (obj) => { - $P.renderList(obj.${infoPrefix}Total); + $P.control.onDatasetChange = (obj, option) => { + $P.renderList(obj.${infoPrefix}Total, option); $("#${infoPrefix}Paging--${pageName}").setPagingInfo({ list: $P.control.dataset @@ -355,7 +355,9 @@ , title : dialogTitle , content : resp , size : "xxl" - , onClose : () => { $P.fnRefreshList(); } + , onClose : () => { + $P.control.reload({all : true}); + } }); } }); @@ -400,7 +402,7 @@ * DataTables 이벤트 **************************************************************************/ // DataTables에 click, dbclick 이벤트 - $P.renderList = (totalSize) => { + $P.renderList = (totalSize, option) => { let ${infoPrefix}List = $P.control.dataset; let empty = ${infoPrefix}List.empty; @@ -424,6 +426,10 @@ let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + if(option != null && option.reloaded){ + initScroll = false; + } + $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); if ($P.control.untilPageNum != 0) { diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp index f56a899..7769bb3 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp @@ -249,8 +249,8 @@ * DatasetControl 이벤트 **************************************************************************/ // Dataset 변경 이벤트 - $P.control.onDatasetChange = (obj) => { - $P.renderList(obj.${infoPrefix}Total); + $P.control.onDatasetChange = (obj, option) => { + $P.renderList(obj.${infoPrefix}Total, option); $("#${infoPrefix}Paging--${pageName}").setPagingInfo({ list: $P.control.dataset @@ -341,7 +341,9 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.fnSearchList(); } + , onClose : () => { + $P.control.reload({all : true}); + } }); } }); @@ -379,7 +381,7 @@ * DataTables 이벤트 **************************************************************************/ // DataTables에 click, dbclick 이벤트 - $P.renderList = (totalSize) => { + $P.renderList = (totalSize, option) => { let ${infoPrefix}List = $P.control.dataset; let empty = ${infoPrefix}List.empty; @@ -402,6 +404,10 @@ let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + if(option != null && option.reloaded){ + initScroll = false; + } + $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); if ($P.control.untilPageNum != 0) { diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp index 49223fa..7946913 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp @@ -240,8 +240,8 @@ * DatasetControl 이벤트 **************************************************************************/ // Dataset 변경 이벤트 - $P.control.onDatasetChange = (obj) => { - $P.renderList(obj.${infoPrefix}Total); + $P.control.onDatasetChange = (obj, option) => { + $P.renderList(obj.${infoPrefix}Total, option); $("#${infoPrefix}Paging--${pageName}").setPagingInfo({ list: $P.control.dataset @@ -327,7 +327,9 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { $P.fnRefreshList(); } + , onClose : () => { + $P.control.reload({all : true}); + } }); } }); @@ -338,7 +340,7 @@ * DataTables 이벤트 **************************************************************************/ // DataTables에 click, dbclick 이벤트 - $P.renderList = (totalSize) => { + $P.renderList = (totalSize, option) => { let ${infoPrefix}List = $P.control.dataset; let empty = ${infoPrefix}List.empty; @@ -362,6 +364,10 @@ let noMore = (${infoPrefix}List.length >= totalSize); let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0); + if(option != null && option.reloaded){ + initScroll = false; + } + $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); if ($P.control.untilPageNum != 0) {