From ef8fd3b2e2a300d40960e0908224bbcc1f00cbef Mon Sep 17 00:00:00 2001
From: "Jonguk. Lim" <minuk926@gmail.com>
Date: Wed, 10 Jul 2024 15:31:44 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?=
 =?UTF-8?q?=20=20=20=20=20=20=ED=8F=90=EA=B8=B0=EA=B2=B0=EA=B3=BC=20:=20?=
 =?UTF-8?q?=ED=8F=90=EA=B8=B0=EC=82=AC=EC=A7=84=20=ED=95=84=EC=88=98=20?=
 =?UTF-8?q?=EC=B2=B4=ED=81=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/adds/nims/dsuseMgtReceipt-info.jsp    | 13 ++++++-----
 .../jsp/adds/nims/dsuseMgtReceipt-main.jsp    | 23 -------------------
 .../jsp/adds/nims/dsuseMgtRslt-info.jsp       | 11 +++++----
 .../WEB-INF/jsp/adds/nims/product-popup.jsp   | 12 ----------
 4 files changed, 14 insertions(+), 45 deletions(-)

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 1608bc0..41a0039 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
@@ -315,8 +315,6 @@
 				userId: "${currentUser.account}"
 			}
 
-			let create = (jsonBssh.dscdmngId == "");
-
 			upload({
 				  url: '<c:url value="${apiHost}/api/biz/nims/v1/saveDsuseMgtReceipt" />'
 				, data: {
@@ -332,11 +330,8 @@
 						  });
 						  return;
 					  }
-
-					  //$P.control.onSave(resp)
 					  dialog.alert("처리 되었습니다.");
 					  dialog.close("dsuseMgtReceiptDialog");
-			          //this._load();
 				}
 			});
 		}
@@ -421,12 +416,18 @@
 			if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return;
 
 			let bsshData = $P.bsshFormFields.get();
+
+
 			if(bsshData.bsshCd == ""){
 				dialog.alert({
 					content: "마약류 취급업체 정보를 입력해주세요."
 				});
 				return false;
 			}
+			// 신규등록인 경우 - 상태 : 신청서접수
+			if(!bsshData.dscdmngId){
+				bsshData.prgrsSttsCd = "01";
+			}
 
 			let dsProd = $P.productList.getDataset();
 			if(dsProd.length == 0){
@@ -452,7 +453,7 @@
 				return false;
 			}
 			
-
+debugger;
 			dialog.alert({
 				  content: "현재 폐기 신청서 접수 정보를 저장 하시겠습니까?"
 				, init: () => { setDialogZindex(); }
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 e698fb3..26bf7b5 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
@@ -440,29 +440,6 @@
             $P.control.load($P.control.query.pageNum + 1);
         }
 
-        // $P.getTotalInfo = (usrRptIdNo) => {
-        //     if (typeof usrRptIdNo == "undefined" || usrRptIdNo == null || usrRptIdNo == "") return;
-        //
-        //     let params = {
-        //         usrRptIdNo: usrRptIdNo
-        //     }
-        //
-        //     ajax.get({
-        //         url : wctx.url("/adds/nims/dsuseMgt-info.do")
-        //         , data: params
-        //         , success: resp => {
-        //             dialog.open({
-        //                 id: "dsuseMgtinfoDialog"
-        //                 , title: "폐기 신청 접수 상세"
-        //                 , content: resp
-        //                 , size: "xl"
-        //                 , init: () => { }
-        //                 , onClose: () => { }
-        //             });
-        //         }
-        //     });
-        // }
-
         $P.control.getBsshInfo = (gdccId) => {
             let dialogTitle = "마약류 취급업체 조회";
             let params = {openPage : "frmSearch--${pageName}"};
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 fe56ca3..b2215af 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
@@ -232,6 +232,13 @@
 		
 		// 저장
 		$P.control.save = (info, fileArr) => {
+			if(fileArr.length == 0){
+				dialog.alert({
+					content: "폐기(진행) 사진을 1개 이상 등록해 주세요."
+				});
+				return;
+			}
+
 			let saveData = {
 				...info,
 				prgrsSttsCd: "06",
@@ -265,12 +272,8 @@
 					    });
 					    return;
 				    }
-
-					//$P.control.onSave(resp)
 					dialog.alert("저장 처리 하였습니다.");
 					dialog.close("dsuseMgtRsltDialog");
-			        //this._load();
-
 				}
 			});
 		}	
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 c592a84..4cfff05 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
@@ -378,18 +378,6 @@
     			t: $('#schText--productMain').val(), //제조번호 또는 시리얼번호
     			userId: "${currentUser.account}"
     		};
-/*            
-			}else{
-				$P.detailControl.query.pageNum = 1;
-	            $P.detailControl.query = {
-		    		fg: "1",  // 1-제조번호, 2-시리얼번호
-		    		pg: $P.detailControl.query.pageNum,
-		    		p: $P.control.dataset.getCurrent().prductCd , //제품코드
-		    		prdValidDe: $("input[name='schPrdValidDe']").val().replaceAll("-", ""),
-		    		t: $('#schText--productMain').val(), //제조번호 또는 시리얼번호
-		    		userId: "${currentUser.account}"
-		    	};				
-			}*/
 
 			$P.detailControl.query.fetchSize = FETCH_MD;			// 한번에 조회되는 자료 건수
 			$P.detailControl.query.delYn = "N";										// 삭제 여부