Merge remote-tracking branch 'origin/main'

src/main/java/cokr/xit/adds/cmmn/hwp/format/DisposeProcessDetails.java

@@ -19,7 +19,7 @@ public class DisposeProcessDetails extends HWPFormat {
 	public DisposeProcessDetails(Print print, PrintOption printOption, List<DataObject> dataObjectList, List<String> afterPhotoPaths) {
 		super(print, printOption, dataObjectList);
 
-		this.print.setFormatKorName("폐기처리내역");
+		this.print.setFormatKorName("폐기처리내역및사진");
 		this.print.setFormatName("disposeProcessDetails");
 
 		this.maxRunCount = 1;

src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp

@@ -65,11 +65,11 @@
         </div>
     </div>
     <div>
-        <button type="button" class="btn btn-primary w-px-120" id="btnCreateDsuseMGT--${pageName}" title="폐기 결과 통보서 출력">
+        <button type="button" class="btn btn-primary w-px-120" id="btnCreateDsuseRsltDoc--${pageName}" title="폐기 결과 보고서 생성">
-            폐기 결과 통보서 출력
+            폐기 결과 보고서 생성
         </button>
-        <button type="button" class="btn btn-primary w-px-120" id="btnCreateDsuseMGT--${pageName}" title="폐기 결과 보고서 출력">
+        <button type="button" class="btn btn-primary w-px-120" id="btnCreateDsuseRsltListPhoto--${pageName}" title="폐기 처리 내역 및 사진 생성">
-            폐기 결과 보고서 출력
+            폐기 처리 내역 및 사진 생성
         </button>
         <button type="button" class="btn btn-excel w-px-120" id="btnExcel--${pageName}" title="엑셀">
             엑셀
@@ -103,7 +103,7 @@
 				<tbody id="tbody--${pageName}">
 				</tbody>
 				<template id="${infoPrefix}Row--${pageName}">
-					<tr data-key="dscdmng_id">
+					<tr data-key="{dscdmng_id}">
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{ROW_NUM}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dscdmng_id}</td>
 						<td class="cmn text-center"  onclick="{onclick}" ondblclick="{ondblclick}">{hdr_de}</td>
@@ -111,8 +111,12 @@
 						<td class="cmn text-start"  onclick="{onclick}" ondblclick="{ondblclick}">{bssh_nm}</td>
 						<td class="cmn text-end" onclick="{onclick}" ondblclick="{ondblclick}">{rnd_dtl_rpt_cnt}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{prgrs_stts_nm}</td>
-						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_rslt_doc}</td>
+						<td class="cmn text-center" onclick="{onclick}">
-						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_rslt_list_photo}</td>
+							<a href="/file/download.do?fileID={dsuse_rslt_doc}">{dsuse_rslt_doc}</a>
+						</td>
+						<td class="cmn text-center" onclick="{onclick}">
+							<a href="/file/download.do?fileID={dsuse_rslt_list_photo}">{dsuse_rslt_list_photo}</a>
+						</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_prv_nm}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_se_nm}</td>
 						<td class="cmn text-center" onclick="{onclick}" ondblclick="{ondblclick}">{dsuse_mth_nm}</td>
@@ -200,9 +204,16 @@
 
 		// 현재 선택 자료 변경 이벤트
 		$P.control.onCurrentChange = (item) => {
-			if (!item) return;
 
-			let key = item.data.LEVY_EXCL_ID;
+			if (!item) {
+				$("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", true);
+				$("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", true);
+				return;
+			}
+			$("#btnCreateDsuseRsltDoc--${pageName}").prop("disabled", false);
+			$("#btnCreateDsuseRsltListPhoto--${pageName}").prop("disabled", false);
+			
+			let key = item.data.dscdmng_id;
 
 			$("#tbody--${pageName}").setCurrentRow(key);
 		};
@@ -301,9 +312,38 @@
 			$("#schRgtrNm--${pageName}").val(userNm);							// 사용자 명
 		}
 
-		// 전자우편 안내문 등록 버튼 이벤트
+		//문서 생성 버튼 이벤트
-		$P.fnCreateEpostGdcc = (title) => {
+		$P.fnCreateDoc = (ADDS12) => {
-			$P.control.getInfo();
+
+			let url = "";
+			let docName = "";
+			if(ADDS12 == "01"){
+				url = wctx.url("/doc/makeDisposeResultReportHwp.do");
+				docName = "폐기결과보고서";
+			} else if(ADDS12 == "02"){
+				url = wctx.url("/doc/makeDisposeProcessDetailsHwp.do");
+				docName = "폐기처리내역";
+			} else {
+				return;
+			}
+			
+			dialog.alert({
+				  content: "선택한 폐기관리 정보로 "+ docName+" 파일을 생성 하시겠습니까?"
+				, init: () => { setDialogZindex(); }
+				, onOK: () => {
+					let dscdmngId = $P.control.getCurrent().dscdmngId;
+					ajax.get({
+						url: url,
+						data: { dscdmngId : dscdmngId },
+						success:resp => {
+
+							//$P.control.load($P.control.pageNum);
+							
+						}
+					});
+				}
+			});
+	
 		}
 		
 		// 전자우편 안내문 등록 버튼 이벤트
@@ -373,9 +413,13 @@
 				}
 			});
 
-			// 안내문 등록 버튼 이벤트
+			// 폐기결과보고서 생성 버튼 이벤트
-			$("#btnCreateDsuseMGT--${pageName}").on("click", function() {
+			$("#btnCreateDsuseRsltDoc--${pageName}").on("click", function() {
-				$P.fnCreateEpostGdcc($(this).attr("title"));
+				$P.fnCreateDoc("01");
+			});
+			// 폐기처리내역및사진 생성 버튼 이벤트
+			$("#btnCreateDsuseRsltListPhoto--${pageName}").on("click", function() {
+				$P.fnCreateDoc("02");
 			});
 
 			// form-date 항목에서 키보드로 입력시 날짜 포맷팅 적용

src/main/webapp/WEB-INF/jsp/include/top.jsp

@@ -12,15 +12,7 @@
 				alt="Login image"
 				/>
 		</a>
-		<div class="d-flex" style="min-width:600px;">
+		
-			<div class="row">
-				<div class="col-12">
-					<input type="text" class="form-control-sm" placeholder="폐기관리아이디" />
-					<button type="button" class="btn-sm btn-primary" onclick="fnCreateDoc(true);">폐기결과보고서 생성</button>	
-					<button type="button" class="btn-sm btn-primary" onclick="fnCreateDoc(false);">폐기처리내역문서 생성</button>
-				</div>
-			</div>
-		</div>
 	</div>
 	
 	
@@ -78,31 +70,7 @@ function setPageTitle(pageTitle) {
 	$("#pageTitle").html(pageTitle);
 }
 
-function fnCreateDoc(flag){
 
-	var url = "";
-	if(flag){
-		url = wctx.url("/doc/makeDisposeResultReportHwp.do");
-	} else {
-		url = wctx.url("/doc/makeDisposeProcessDetailsHwp.do");
-	}
-
-	var textBox = $("#layout-navbar").find("input[type='text']");
-	var value = textBox.val();
-	if(value == ""){
-		textBox.focus();
-		return;
-	}
-	
-	ajax.get({
-		url: url,
-		data:{dscdmngId : value},
-		success:resp => {
-			console.log("파일아이디:"+resp.fileId);
-		}
-	});
-	
-}