From 5a12bf9a67a1914c710712d5475ca51f7b04d6cc Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Wed, 10 Jul 2024 13:51:59 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=B3=B4=EA=B3=A0=EC=99=84=EB=A3=8C=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EC=9D=98=20=EB=8D=B0=EC=9D=B4=ED=83=80=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B6=88=EA=B0=80(=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xit/adds/cmm/model/DsuseRsltInfo.java | 2 + .../jsp/adds/nims/dsuseMgtMapping-info.jsp | 1 - .../jsp/adds/nims/dsuseMgtReceipt-info.jsp | 8 ++- .../jsp/adds/nims/dsuseMgtReceipt-main.jsp | 50 +++++++++---------- .../jsp/adds/nims/dsuseMgtRslt-info.jsp | 5 ++ .../jsp/adds/nims/dsuseMgtRslt-main.jsp | 3 +- 6 files changed, 41 insertions(+), 28 deletions(-) diff --git a/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java index 5ceba9c..9c94d88 100644 --- a/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java +++ b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java @@ -79,4 +79,6 @@ public class DsuseRsltInfo { private String dsuseSeCd; private String dsuseMthCd; private String dsuseLoc; + + private String prgrsSttsCd; } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp index f8f940a..7ccc0c8 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp @@ -511,7 +511,6 @@ **************************************************************************/ // 저장 $P.fnSave = () => { - debugger let checkData = $("input[name='maapingCheck']:checked").parent().parent().data()?.key; if(!checkData){ dialog.alert({ 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 76e79ef..1608bc0 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 @@ -13,6 +13,7 @@
+
@@ -229,6 +230,11 @@ if (!item) return; $P.bsshFormFields.set($P.control, item); + + // 보고완료 데이타 변경 불가 + if($("input[name='prgrsSttsCd']").val() == '99') { + $("#btnSave--${pageName}").prop("disabled", true); + } let checkData = item.data.dsusePrvCd; if (checkData =="01" || checkData =="02") { @@ -561,7 +567,7 @@ // 초기 화면 설정 $P.initForm = () => { - if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { + if($("input[name='prgrsSttsCd']").val() == '99' || ${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { $("#btnSave--${pageName}").prop("disabled", true); } initDatepicker("bssh--${pageName}"); 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 2c001b9..e698fb3 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 @@ -307,7 +307,8 @@ prmisnNo: row.PRMISN_NO, bizrno: row.BIZR_NO, dsusePrvCd: row.DSUSE_PRV_CD, - dsuseAcdtDe: row.DSUSE_ACDT_DE + dsuseAcdtDe: row.DSUSE_ACDT_DE, + prgrsSttsCd: row.PRGRS_STTS_CD }; let productDS = $P.detailControl.dataset.getDataset(); if(productDS.length > 0){ @@ -439,29 +440,28 @@ $P.control.load($P.control.query.pageNum + 1); } - // DataTables에 더블 클릭시 개별총정보 dialog - $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.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 = "마약류 취급업체 조회"; @@ -510,7 +510,7 @@ const row = $P.control.dataset.getCurrent(); if(row.PRGRS_STTS_CD == "99"){ dialog.alert({ - content: "종료된 자료는 삭제하실 수 없습니다.." + content: "보고완료된 자료는 삭제하실 수 없습니다.." }); return false; } 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 57599eb..fe56ca3 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 @@ -14,6 +14,7 @@ + <%-- --%>
@@ -187,6 +188,10 @@ // Dataset 셋팅 $P.formFields.set($P.control, item); + // 보고완료 상태인 경우 저장 버튼 비활성화 + if($("input[name='prgrsSttsCd']").val() == '99') { + $("#btnSave--${pageName}").prop("disabled", true); + } } // 저장 callback 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 5832596..04c4344 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 @@ -303,7 +303,8 @@ indutyNm: row.INDUTY_NM, dsusePrvNm: row.DSUSE_PRV_NM, rndDtlRptCnt: row.RND_DTL_RPT_CNT, - dsuseAcdtDe: row.DSUSE_ACDT_DE + dsuseAcdtDe: row.DSUSE_ACDT_DE, + prgrsSttsCd: row.PRGRS_STTS_CD }; if (isDtl && row.PRGRS_STTS_CD != "01") {