From bc80df4b811f7aeb07a23eb01f159ff92cf55b21 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Thu, 18 Jul 2024 18:23:04 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B2=80=EC=83=89=EC=A1=B0=EA=B1=B4=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20:=20=EC=B7=A8=EA=B8=89=EC=9D=BC=EC=9E=90?= =?UTF-8?q?=20->=20=ED=8F=90=EA=B8=B0=EC=9D=BC=EC=9E=90=20=20=20=20=20=20?= =?UTF-8?q?=EA=B7=B8=EB=A6=AC=EB=93=9C=20=ED=95=AD=EB=AA=A9=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=20=EC=A1=B0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp | 31 +++---------------- .../jsp/adds/nims/dsuseMgtMapping-main.jsp | 4 +-- .../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 11 ++++++- .../jsp/adds/nims/dsuseMgtReceipt-main.jsp | 4 +-- .../jsp/adds/nims/dsuseMgtRslt-info.jsp | 14 +++++++++ .../jsp/adds/nims/dsuseMgtRslt-main.jsp | 4 +-- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp index 9e93354..a4b5acb 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp @@ -88,7 +88,7 @@
-
+
{ - /*let dialogTitle = "신청서 정보 등록"; - let params = {}; - - ajax.get({ - url : wctx.url("/adds/nims/dsuseMgtReceipt-info.do") - , data : params || {} - , success : resp => { - dialog.open({ - id : $P.control.prefixed("Dialog") - , title : dialogTitle - , content : resp - , size : $P.control.infoSize - , onClose : () => { } - }); - } - });*/ } @@ -381,7 +360,7 @@ }); fetch(wctx.url("/adds/nims/getHwpForRptDoc.do") + "?" + parameter) .then((response) => { - var header = response.headers.get('Content-Disposition'); + let header = response.headers.get('Content-Disposition'); if(!header){ response.json().then((responseJson)=>{ dialog.alert({ @@ -393,8 +372,8 @@ }); new Error(""); } - var parts = header.split(';'); - filename = decodeURIComponent(parts[1].split('=')[1]); + let parts = header.split(';'); + let filename = decodeURIComponent(parts[1].split('=')[1]); if(filename.startsWith("\"")){ filename = filename.substring(1); } @@ -412,7 +391,7 @@ document.body.appendChild(a); a.click(); a.remove(); - + if($("#tbody--${pageName}").find("td input[type='checkbox']:checked").length == 1){ $P.control.load($P.control.pageNum); } 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 b572d0a..00806ad 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 @@ -81,7 +81,7 @@
-
+
-
+
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 1d6ceaf..399d26a 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 @@ -524,9 +524,18 @@ }); return false; } + + if(isNaN($P.productFormFields.get().dsuseQy)){ + dialog.alert({ + content: "폐기 수량은 숫자만 입력 가능합니다", + onOK: () => {} + }); + return false; + } + if(!$P.productFormFields.get().dsuseQy){ dialog.alert({ - content: "폐기수량을 입력해 주세요" + content: "폐기 수량을 입력해 주세요" }); return false; } 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 62bc5e3..9873bc7 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 @@ -83,7 +83,7 @@
-
+
-
+
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 9ade939..20f6c25 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 @@ -142,6 +142,8 @@ let initDataset = false; // 변경 화면 let isEditData = false; + // 폐기결과 이미지 등록 및 변경 + let isImgChange = true; const searchRsltImgList = () => { document.getElementById("rsltImgList").innerHTML = ""; @@ -173,6 +175,7 @@ let isSelf = list.filter(item => item.SEL_YN == 'Y') if(isSelf.length > 0) return; + isImgChange = false; $('#btnImgAdd--${pageName}').prop('disabled', true); $('#btnImgDel--${pageName}').prop('disabled', true); let tagsTextArr = []; @@ -447,6 +450,16 @@ let fileArr = $P.fileArr; + if(isImgChange){ + if(fileArr.length == 0){ + dialog.alert({ + content: "폐기(진행) 사진을 등록해 주세요.", + onOK: () => {} + }); + return; + } + } + dialog.alert({ content: "현재 " + $P.control.prefixName + " 정보를 저장하시겠습니까?" , init: () => { setDialogZindex(); } @@ -484,6 +497,7 @@ $("#btnSave--${pageName}").on("click", () => $P.fnSave()); // 저장 $("#dsuseDe--${pageName}, #dsuseMthCd--${pageName}").on("change", () => { + isImgChange = true; if(!initDataset){ initDataset = true; return; 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 088bf8e..13f100d 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 @@ -78,7 +78,7 @@
-
+
-
+