From 8e3d020b6a39b23bf2c6293d822cc9b39c55fd48 Mon Sep 17 00:00:00 2001
From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com>
Date: Thu, 13 Jun 2024 18:49:14 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EA=B2=B0=EA=B3=BC=20=ED=99=94?=
 =?UTF-8?q?=EB=A9=B4=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EB=A7=B5=ED=95=91?=
 =?UTF-8?q?=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nims/web/DsuseMgtMappingController.java     |  4 ++--
 .../adds/nims/web/DsuseMgtRsltController.java   |  7 ++++---
 .../jsp/adds/nims/dsuseMgtReceipt-info.jsp      | 17 ++++++++---------
 .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp | 14 +++++---------
 .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp |  8 +++++---
 5 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtMappingController.java b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtMappingController.java
index 0f9fb48..5a38dec 100644
--- a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtMappingController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtMappingController.java
@@ -26,7 +26,7 @@ public class DsuseMgtMappingController extends AbstractController {
 		;
 	}
 	
-	@RequestMapping(name="마약류폐기 신청서 접수 메인", value=METHOD_URL.dsuseMgtMappingMain)
+	@RequestMapping(name="폐기 보고 확인 메인", value=METHOD_URL.dsuseMgtMappingMain)
     public ModelAndView main() {
         ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-main");
         
@@ -40,7 +40,7 @@ public class DsuseMgtMappingController extends AbstractController {
 		;
     }
 	
-	@RequestMapping(name="마약류폐기 신청서 접수 상세", value=METHOD_URL.dsuseMgtMappinginfo)
+	@RequestMapping(name="페기 보고 확인 등록", value=METHOD_URL.dsuseMgtMappinginfo)
     public ModelAndView getdsuseMgtReceiptInfo() {
 		ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtMapping-info");
 		
diff --git a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtRsltController.java b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtRsltController.java
index 5e23e73..6f85e8e 100644
--- a/src/main/java/cokr/xit/adds/nims/web/DsuseMgtRsltController.java
+++ b/src/main/java/cokr/xit/adds/nims/web/DsuseMgtRsltController.java
@@ -56,13 +56,14 @@ public class DsuseMgtRsltController extends AbstractController {
     }
 	
 	@RequestMapping(name="마약류폐기 신청서 접수 상세", value=METHOD_URL.dsuseMgtRsltInfo)
-    public ModelAndView getdsuseMgtReceiptInfo() {
+    public ModelAndView getdsuseMgtReceiptInfo(String usrRptIdNo) {
 		ModelAndView mav = new ModelAndView("adds/nims/dsuseMgtRslt-info");
 		
 		return mav
 				.addObject("pageName", "dsuseMgtRsltInfo")						// View(jsp)에서 사용할 id 뒤에 붙일 suffix
-//				.addObject("infoPrefix", "dsuseMgtReceipt")						// prefix
-//				.addObject("infoPrefixUrl", "/adds/nims")						// prefixUrl
+				.addObject("infoPrefix", "dsuseMgtRsltInfo")						// prefix
+				.addObject("infoPrefixUrl", "/adds/nims")						// prefixUrl
+				.addObject("usrRptIdNo", usrRptIdNo)						// View(jsp)에서 사용할 id 뒤에 붙일 suffix
 		;
 	}
 }
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
index 36811ff..6a2c38d 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp
@@ -98,15 +98,13 @@
 				</div>
 			</form>
 			<form id="productList--${pageName}" name="productList">
-				<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive-1--${pageName}">
+				<div class="table-responsive ox-scroll oy-scroll h-px-300" id="table-responsive--${pageName}">
 					<table class="table-layout-fixed dataTable datatables-ajax table table-bordered no-footer" id="DataTables_Table_0--productList" aria-describedby="DataTables_Table_0_info">
 						<thead class="sticky-thead">
 							<tr id="theadTr--productList"
 								data-by="by--productList" data-by-output="byOutput--productList" data-main-option="mainOption--productList" data-sub-option="subOption--productList">
-								<th style="width: 15.828px;text-align:center;" tabindex="0">No</th>
 								<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
 								<th class="sorting" style="width: 146.156px;">제품코드</th>
-								<th class="sorting" style="width: 160.141px;">제품번호</th>
 								<th class="sorting" style="width: 160.141px;">제조 번호</th>
 								<th class="sorting" style="width: 160.141px;">제조 일련 번호</th>
 								<th class="sorting" style="width: 230.469px;">유효기간</th>
@@ -122,9 +120,8 @@
 						</tbody>
 						<template id="productListRow--productList">
 							<tr data-key="{prductCd}">
-								<td style="text-align:center;"><input value="prductCd" onchange="userControl.select('{prductCd}', this.checked);" type="checkbox" class="form-check-input"></td>
-								<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductCd}</td>
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductNm}</td>
+								<td class="cmn text-center" {onclick}="" {ondblclick}="">{prductCd}</td>
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{mnfNo}</td>
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{mnfSeq}</td>
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{prdValidDe}</td>
@@ -133,7 +130,7 @@
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{pceQy}</td>
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{pceUnit}</td>
 								<td class="cmn text-center" {onclick}="" {ondblclick}="">{dsuseQy}</td>
-								<td class="cmn text-center" {onclick}="" {ondblclick}=""></td>
+								<td class="cmn text-center aaaa" {onclick}="" {ondblclick}=""></td>
 							</tr>
 						</template>
 						<template id="productListNotFound--productList">
@@ -293,7 +290,7 @@
 		$P.productList.onDatasetChange = item => {
 			if (!item) return;
 
-			let empty = $P.productListList.empty;
+			let empty = $P.productList.empty;
 
 			// 업무별 DataTables(그리드) tr, td
 			let foundContent = document.getElementById("productListRow--productList").content;
@@ -311,7 +308,9 @@
 			let trs = empty ? [document.getElementById("$productListNotFound--productList").content.outerHTML]
 							: $P.productList.inStrings(foundTr.outerHTML, replacer);
 
-			$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
+			$("#table-responsive--${pageName}")[0].changeContent(trs.join(), true, true);
+			
+			fnMakeGridImageViewer($("#tbody--productList").find("td.aaaa").get(), "dsusePrdImgFiles");
 		}
 
 		/**************************************************************************
@@ -362,7 +361,7 @@
 		
 		//추가
 		$P.fnAdd = () => {
-			$P.productList.addData($P.productFormFields.get());			
+			$P.productList.addData([$P.productFormFields.get()]);			
 		}
 		
 		$P.fnDel = () => {
diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
index 7b186ca..e88dd69 100644
--- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp
@@ -246,7 +246,7 @@
 			let noMore = (totalSize == ${infoPrefix}List.length);
 			let initScroll = ($P.control.query.pageNum < 2) && ($P.control.untilPageNum == 0);
 
-			$("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore);
+			$("#table-responsive--${pageName}")[0].changeContent(trs.join(), true, true);
 
 		    if ($P.control.untilPageNum != 0) {
 		    	$P.control.query.fetchSize = $P.control.defaultFetchSize;
@@ -307,19 +307,15 @@
 			// 버튼 이벤트
 			$("#btnSave--${pageName}").on("click", () => $P.fnSave());			// 저장
 		}
-		
-
-		// DataTables width 변경 조정 (업무별 그리드가 존재 한다면.. crdn06010-main.jsp 참고)
-		fnMakeResizableTable($("#table-responsive--${pageName}")[0]);
-
-		// DataTables 스크롤 이벤트 생성
-		fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList);
-		
 
 		// 초기 화면 설정
 		$P.initForm = () => {
 			// Dialog 마우스로 드래그 할 수 있도록 설정.
 //			fnMakeDraggableDialog(document.getElementById($P.control.prefix + "Dialog"));
+			
+			console.log("#${usrRptIdNo}");
+			
+			
 
 			// input, select 초기화
 			let searchForm = $("#frmSearch--${pageName}");
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 d0215db..507c605 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
@@ -283,8 +283,10 @@
 		// 신청서 정보 dialog
 		$P.control.getInfo = (gdccId) => {
 			let dialogTitle = "폐기 결과[통보] 등록";
-			let params = {};
-
+			var usrRptIdNo = $P.control.dataset.getCurrent().USR_RPT_ID_NO;
+			if (typeof usrRptIdNo == "undefined" || usrRptIdNo == null || usrRptIdNo == "") return;
+			let params = {usrRptIdNo : usrRptIdNo};
+			 
 			ajax.get({
 				url : wctx.url("/adds/nims/dsuseMgtRslt-lnfo.do") 
 				, data : params
@@ -294,7 +296,7 @@
 						, title : dialogTitle
 						, content : resp
 						, size : $P.control.infoSize
-						, onClose : () => { $P.RefreshList();	}
+						, onClose : () => { $P.fnRefreshList();	}
 					});
 				}
 			});