From 3f710ac6811bedf5f1d52088eaa47da6161906b3 Mon Sep 17 00:00:00 2001
From: Leeyh1121 <130335980+Leeyh1121@users.noreply.github.com>
Date: Tue, 25 Jun 2024 14:03:14 +0900
Subject: [PATCH] =?UTF-8?q?fit=20:=20=EC=B2=98=EB=A6=AC=EC=83=81=ED=83=9C?=
 =?UTF-8?q?=EA=B0=80=20=EC=8B=A0=EC=B2=AD=EC=84=9C=20=EC=A0=91=EC=88=98?=
 =?UTF-8?q?=EA=B0=80=20=EC=95=84=EB=8B=8C=EA=B2=BD=EC=9A=B0=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=20=EB=93=B1=EB=A1=9D=20=EB=B6=88=EA=B0=80=EB=8A=A5?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20=EC=B7=A8?=
 =?UTF-8?q?=EA=B8=89=EC=9D=BC=EC=9E=90=20=EB=B0=8F=20=ED=8F=90=EA=B8=B0?=
 =?UTF-8?q?=EC=9D=BC=EC=9E=90=EA=B0=80=20=EB=B9=88=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EB=8B=B9=EC=9D=BC=EB=A1=9C=20=EC=B4=88=EA=B8=B0=ED=99=94.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp   |  6 ++++++
 .../WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp   | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

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 40b47cf..ac4506d 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
@@ -477,6 +477,12 @@
 		}
 		$P.control.setData(dsuseRsltInfo);
 		
+		// 취급일자 및 페기일자에 값이 없는 경우 당일로 초기화.
+		if (($P.control.getValue("dsuseDe") == null || $P.control.getValue("dsuseDe") == "") &&  
+				($P.control.getValue("hdrDe") == null || $P.control.getValue("hdrDe") == "")){ 
+			$("#hdrDe--${pageName}").datepicker("setDate", new Date());										// 취급 일자
+			$("#dsuseDe--${pageName}").datepicker("setDate", new Date());									// 폐기 일자
+		}
 		
 		if($P.fileInfos.length > 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 538e48f..2dc48cf 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
@@ -279,8 +279,9 @@
         // 신청서 정보 dialog
         $P.control.getInfo = (isDtl) => {
             let dialogTitle = "폐기 결과[통보] 등록";
-            if(isDtl)   dialogTitle = "폐기 결과[통보] 상세";
             const row = $P.control.dataset.getCurrent();
+            
+            if(isDtl && row.PRGRS_STTS_CD != "01")   dialogTitle = "폐기 결과[통보] 상세";
             if (typeof row == "undefined" || row == null || row == "") return;
             let params = {
                 dscdmngId: row.DSCDMNG_ID,
@@ -292,7 +293,7 @@
                 rndDtlRptCnt: row.RND_DTL_RPT_CNT,
             };
 
-            if (isDtl) {
+            if (isDtl && row.PRGRS_STTS_CD != "01") {
                 params = {
                     ...params,
                     hdrDe: row.HDR_DE.substring(0, 4) + "-" + row.HDR_DE.substring(4, 6) + "-" + row.HDR_DE.substring(6),
@@ -418,7 +419,15 @@
 
         // 폐기결과[통보]등록 등록 버튼 이벤트
         $P.fnCreateDsuseMgtRslt = () => {
-            $P.control.getInfo();
+        	if ($P.control.dataset.getCurrent().PRGRS_STTS_CD != "01"){
+                dialog.alert({
+                    content: "결과 등록은 폐기 신청 접수 상태에서만 가능합니다."
+                    , onOK: () => { }
+                });
+                return;
+            }
+        	
+	        $P.control.getInfo();
         }
 
         // 전자우편 안내문 등록 버튼 이벤트