From d333ed58e32a62646f2cff50708569d0e48f5a7f Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Tue, 18 Jun 2024 09:12:27 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B7=B8=EB=A6=AC=EB=93=9C=20=EC=A0=95?=
 =?UTF-8?q?=EB=A0=AC=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/adds/nims/dsuseMgtMapping-main.jsp    | 21 ++++----
 .../jsp/adds/nims/dsuseMgtReceipt-main.jsp    | 39 +++++++-------
 .../jsp/adds/nims/dsuseMgtRslt-main.jsp       | 53 +++++++++++--------
 3 files changed, 60 insertions(+), 53 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 92ad682..ad7f82d 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
@@ -121,6 +121,7 @@
 		</div>
 	</div>
 </div>
+<br>
 <!-- / DataTables(그리드) -->
 	<div class="card">
 		<div class="row g-1">
@@ -132,13 +133,12 @@
 							<thead class="sticky-thead">
 								<tr>
 									<th class="cmn" style="width: 72px;">No.</th>
-									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
+									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 350.719px;">제품명</th>
 									<th class="sorting" style="width: 146.156px;">제품코드</th>
-									<th class="sorting" style="width: 160.141px;">폐기수량</th>
-									<th class="sorting" style="width: 230.469px;">유효기간</th>
-									<th class="sorting" style="width: 230.469px;">최소 유통단위 수량</th>
-									<th class="sorting" style="width: 230.469px;">낱개 단위 수량</th>
-									<th class="sorting" style="width: 230.469px;">폐기 수량</th>
+									<th class="sorting" style="width: 130.141px;">폐기수량</th>
+									<th class="sorting" style="width: 130.469px;">유효기간</th>
+									<th class="sorting" style="width: 200.469px;">유통단위 수량</th>
+									<th class="sorting" style="width: 200.469px;">낱개단위 수량</th>
 								</tr>
 							</thead>
 							<tbody id="tbody--${pageName}Detail">
@@ -148,11 +148,10 @@
 			                       <td {onclick}="" {ondblclick}="">{ROW_NUM}</td>
 			                       <td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td>
 			                       <td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
-			                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
-			                       <td {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
-			                       <td {onclick}="" {ondblclick}="">{MIN_DISTB}</td>
-			                       <td {onclick}="" {ondblclick}="">{PCE}</td>
-			                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+			                       <td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PCE}</td>
 			                    </tr>
 							</template>
 							<template id="${infoPrefix}NotFound--${pageName}Detail">
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 be08605..9b5c343 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
@@ -85,16 +85,16 @@
 					<tr id="theadTr--${pageName}"
 						data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 						<th class="cmn" style="width: 72px;">No.</th>
-						<th class="cmn" style="width: 160.141px;">취급일자</th>
-						<th class="cmn" style="width: 160.141px;">관리번호</th>
+						<th class="cmn" style="width: 130.141px;">취급일자</th>
+						<th class="cmn" style="width: 130.141px;">관리번호</th>
 						<th class="cmn" style="width: 230.469px;">업체명</th>
 						<th class="cmn" style="width: 100px;">보고건수</th>
-						<th class="cmn" style="width: 230.469px;">처리상태</th>
-						<th class="cmn" style="width: 180px;">폐기구분</th>
+						<th class="cmn" style="width: 200.469px;">처리상태</th>
+						<th class="cmn" style="width: 150px;">폐기구분</th>
 						<th class="cmn" style="width: 230.469px;">폐기사유</th>
 						<th class="cmn" style="width: 180px;">폐기방법</th>
-						<th class="cmn" style="width: 230.469px;">폐기장소</th>
-						<th class="cmn" style="width: 230.469px;">폐기일자</th>
+						<th class="cmn" style="width: 200.469px;">폐기장소</th>
+						<th class="cmn" style="width: 130.469px;">폐기일자</th>
 					</tr>
 				</thead>
 				<tbody id="tbody--${pageName}">
@@ -110,7 +110,7 @@
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
-						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
+						<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
 					</tr>
 				</template>
@@ -123,6 +123,7 @@
 		</div>
 	</div>
 </div>
+<br>
 <!-- / DataTables(그리드) -->
 	<div class="card">
 		<div class="row g-1">
@@ -134,13 +135,13 @@
 							<thead class="sticky-thead">
 								<tr>
 									<th class="cmn" style="width: 72px;">No.</th>
-									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
+									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 300.719px;">제품명</th>
 									<th class="sorting" style="width: 146.156px;">제품코드</th>
-									<th class="sorting" style="width: 160.141px;">폐기수량</th>
-									<th class="sorting" style="width: 230.469px;">유효기간</th>
-									<th class="sorting" style="width: 230.469px;">최소 유통단위 수량</th>
-									<th class="sorting" style="width: 230.469px;">낱개 단위 수량</th>
-									<th class="sorting" style="width: 230.469px;">폐기 수량</th>
+									<th class="sorting" style="width: 130.141px;">폐기수량</th>
+									<th class="sorting" style="width: 130.469px;">유효기간</th>
+									<th class="sorting" style="width: 200.469px;">최소 유통단위 수량</th>
+									<th class="sorting" style="width: 180.469px;">낱개 단위 수량</th>
+									<th class="sorting" style="width: 130.469px;">폐기 수량</th>
 								</tr>
 							</thead>
 							<tbody id="tbody--${pageName}Detail">
@@ -149,12 +150,12 @@
 			                   	<tr data-key="DSCDMNG_SN">
 			                       <td {onclick}="" {ondblclick}="">{ROW_NUM}</td>
 			                       <td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td>
-			                       <td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
-			                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
-			                       <td {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
-			                       <td {onclick}="" {ondblclick}="">{MIN_DISTB}</td>
-			                       <td {onclick}="" {ondblclick}="">{PCE}</td>
-			                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
+			                       <td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PCE}</td>
+			                       <td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
 			                    </tr>
 							</template>
 							<template id="${infoPrefix}NotFound--${pageName}Detail">
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 314bf06..658fb14 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
@@ -83,16 +83,16 @@
 					<tr id="theadTr--${pageName}"
 						data-by="by--${pageName}" data-by-output="byOutput--${pageName}" data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 						<th class="cmn" style="width: 72px;">No.</th>
-						<th class="cmn" style="width: 160.141px;">취급일자</th>
-						<th class="cmn" style="width: 160.141px;">관리번호</th>
+						<th class="cmn" style="width: 130.141px;">취급일자</th>
+						<th class="cmn" style="width: 130.141px;">관리번호</th>
 						<th class="cmn" style="width: 230.469px;">업체명</th>
 						<th class="cmn" style="width: 100px;">보고건수</th>
-						<th class="cmn" style="width: 230.469px;">처리상태</th>
-						<th class="cmn" style="width: 180px;">폐기구분</th>
-						<th class="cmn" style="width: 230.469px;">폐기사유</th>
-						<th class="cmn" style="width: 180px;">폐기방법</th>
-						<th class="cmn" style="width: 230.469px;">폐기장소</th>
-						<th class="cmn" style="width: 230.469px;">폐기일자</th>
+						<th class="cmn" style="width: 200.469px;">처리상태</th>
+						<th class="cmn" style="width: 150px;">폐기구분</th>
+						<th class="cmn" style="width: 200.469px;">폐기사유</th>
+						<th class="cmn" style="width: 150px;">폐기방법</th>
+						<th class="cmn" style="width: 200.469px;">폐기장소</th>
+						<th class="cmn" style="width: 130.469px;">폐기일자</th>
 					</tr>
 				</thead>
 				<tbody id="tbody--${pageName}">
@@ -108,7 +108,7 @@
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_SE_NM}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_PRV_NM}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_MTH_NM}</td>
-						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
+						<td class="cmn" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_LOC}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{DSUSE_DE}</td>
 					</tr>
 				</template>
@@ -132,13 +132,13 @@
 							<thead class="sticky-thead">
 								<tr>
 									<th class="cmn" style="width: 72px;">No.</th>
-									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 223.719px;">제품명</th>
+									<th class="sorting sorting_asc" aria-sort="ascending" style="width: 350.719px;">제품명</th>
 									<th class="sorting" style="width: 146.156px;">제품코드</th>
-									<th class="sorting" style="width: 160.141px;">폐기수량</th>
-									<th class="sorting" style="width: 230.469px;">유효기간</th>
-									<th class="sorting" style="width: 230.469px;">최소 유통단위 수량</th>
-									<th class="sorting" style="width: 230.469px;">낱개 단위 수량</th>
-									<th class="sorting" style="width: 230.469px;">폐기 수량</th>
+									<th class="sorting" style="width: 130.141px;">폐기수량</th>
+									<th class="sorting" style="width: 130.469px;">유효기간</th>
+									<th class="sorting" style="width: 200.469px;">최소 유통단위 수량</th>
+									<th class="sorting" style="width: 230.469px;">낱개단위 수량</th>
+									<th class="sorting" style="width: 130.469px;">폐기수량</th>
 								</tr>
 							</thead>
 							<tbody id="tbody--${pageName}Detail">
@@ -148,11 +148,11 @@
 			                       <td {onclick}="" {ondblclick}="">{ROW_NUM}</td>
 			                       <td {onclick}="" {ondblclick}="">{PRDUCT_NM}</td>
 			                       <td {onclick}="" {ondblclick}="">{PRDUCT_CD}</td>
-			                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
-			                       <td {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
-			                       <td {onclick}="" {ondblclick}="">{MIN_DISTB}</td>
-			                       <td {onclick}="" {ondblclick}="">{PCE}</td>
-			                       <td {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+			                       <td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PRD_VALID_DE}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{MIN_DISTB}</td>
+			                       <td class="text-center" {onclick}="" {ondblclick}="">{PCE}</td>
+			                       <td class="text-end" {onclick}="" {ondblclick}="">{DSUSE_QY}</td>
 			                    </tr>
 							</template>
 							<template id="${infoPrefix}NotFound--${pageName}Detail">
@@ -283,9 +283,16 @@
 		// 신청서 정보 dialog
 		$P.control.getInfo = () => {
 			let dialogTitle = "폐기 결과[통보] 등록";
-			let dscdmngId = $P.control.dataset.getCurrent().DSCDMNG_ID;
-			if (typeof dscdmngId == "undefined" || dscdmngId == null || dscdmngId == "") return;
-			let params = {dscdmngId : dscdmngId};
+			let row = $P.control.dataset.getCurrent();
+			if (typeof row == "undefined" || row == null || row == "") return;
+			let params = {
+				dscdmngId: row.DSCDMNG_ID,
+				bsshNm: row.BSSH_NM,
+				usrRptIdNo: row.USR_RPT_ID_NO,
+				indutyNm: row.INDUTY_NM,
+				dsusePrvNm: row.DSUSE_PRV_NM,
+				rndDtlRptCnt: row.RND_DTL_RPT_CNT
+			};
 			 
 			ajax.get({
 				url : wctx.url("/adds/nims/dsuseMgtRslt-info.do")