Merge branch 'main' of http://211.119.124.110:3000/xit-app/adds-fo.git into main

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) {

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) {

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) {

src/main/webapp/WEB-INF/jsp/adds/nims/product-popup.jsp

@@ -86,6 +86,9 @@
 						<button type="button" class="btn btn-primary w-px-90" id="btnSearch3--${pageName}" title="검색">NIMS 검색</button>
 					</div>
 				</div>
+				<div>
+					<span style="padding-left: 50px; font-weight: bold; color: #696cff">유효기간(제조번호 또는 시리얼번호 조회 결과 내에서 조회)</span>
+				</div>
 			</div>
 		</form>		
 		<!-- 업무 버튼 표시 -->