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 9c58271..5ceba9c 100644 --- a/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java +++ b/src/main/java/cokr/xit/adds/cmm/model/DsuseRsltInfo.java @@ -75,6 +75,7 @@ public class DsuseRsltInfo { private String hdrDe; private String dsuseDe; + private String dsuseAcdtDe; private String dsuseSeCd; private String dsuseMthCd; private String dsuseLoc; diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml index 7f2ebf7..ebe6691 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtReceipt-mapper.xml @@ -23,6 +23,7 @@ , GET_CODE_NM("ADDS05", A.DSUSE_MTH_CD) DSUSE_MTH_NM /* 폐기 방법 */ , A.DSUSE_LOC /* 폐기 장소 */ , A.DSUSE_DE /* 폐기 일자 */ + , A.DSUSE_ACDT_DE /* 사고발생일 */ , A.DSUSE_RMK /* 폐기 비고 */ , A.STTS /* 처리상태 */ , A.USR_RPT_ID_NO /* 사용자 보고 식별 번호 */ 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 e46eeaa..ca2745c 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 @@ -36,7 +36,7 @@ -
+
+
+ + + +
@@ -508,6 +513,18 @@ } }); } + + $P.fnChangeDsusePrvCd = () => { + // validate 확인 + let checkData = $("#dsusePrvCd--${pageName} option:selected").val(); + if (checkData =="01" || checkData =="02") { + $("#dsuseAcdtDe--${pageName}").prop('disabled', false); + }else{ + $("#dsuseAcdtDe--${pageName}").prop('disabled', true); + $("#dsuseAcdtDe--${pageName}").val(""); + } + + } /************************************************************************** * 초기 셋팅 @@ -530,6 +547,8 @@ $("#btnDel--${pageName}").on("click", () => $P.fnDel()); // 추가 + $("#dsusePrvCd--${pageName}").on("change", () => $P.fnChangeDsusePrvCd()); // 추가 + } // 초기 화면 설정 @@ -537,6 +556,8 @@ if(${currentUser.hasAuthorities("ROLE_MANAGER")} || ${currentUser.hasAuthorities("ROLE_ADMIN")}) { $("#btnSave--${pageName}").prop("disabled", true); } + initDatepicker("bssh--${pageName}"); + $("#dsuseAcdtDe--${pageName}").datepicker("setDate", new Date()); } 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 7964616..9af8cf2 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 @@ -94,6 +94,7 @@ 업체명 폐기건수 폐기사유 + 사고발생일 취급일자 폐기일자 폐기구분 @@ -111,6 +112,7 @@ {BSSH_NM} {RND_DTL_RPT_CNT} {DSUSE_PRV_NM} + {DSUSE_ACDT_DE} {HDR_DE} {DSUSE_DE} {DSUSE_SE_NM} @@ -217,6 +219,7 @@ , formats: { HDR_DE: dateFormat , DSUSE_DE: dateFormat + , DSUSE_ACDT_DE: dateFormat } }); // $P.control 설정 @@ -236,7 +239,7 @@ , keymapper : info => info ? info.DSCDMNG_SN : "" , dataGetter : obj => obj.dsuseMgtDetailList , formats : { - PRD_VALID_DE: dateFormat + PRD_VALID_DE: dateFormat } }); @@ -301,7 +304,8 @@ rprsntvNm: row.RPRSNTV_NM, prmisnNo: row.PRMISN_NO, bizrno: row.BIZR_NO, - dsusePrvCd: row.DSUSE_PRV_CD + dsusePrvCd: row.DSUSE_PRV_CD, + dsuseAcdtDe: row.DSUSE_ACDT_DE }; let productDS = $P.detailControl.dataset.getDataset(); if(productDS.length > 0){