From f03fa678a6fe14a163f67750fb8d0e861ec6bfa6 Mon Sep 17 00:00:00 2001 From: "Jonguk. Lim" Date: Mon, 21 Oct 2024 23:56:54 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=ED=8F=90=EA=B8=B0=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=EC=8B=9C=20=ED=8F=90=EA=B8=B0=EC=9E=A5?= =?UTF-8?q?=EC=86=8C=20set=20=EB=B0=8F=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20?= =?UTF-8?q?=EA=B0=92=20set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/adds/nims/dsuseMgtRslt-mapper.xml | 1 + .../jsp/adds/nims/dsuseMgtRslt-info.jsp | 8 ++++++- .../jsp/adds/nims/dsuseMgtRslt-main.jsp | 21 ++++++++++--------- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/resources/sql/mapper/adds/nims/dsuseMgtRslt-mapper.xml b/src/main/resources/sql/mapper/adds/nims/dsuseMgtRslt-mapper.xml index 890c86c..f0f4f71 100644 --- a/src/main/resources/sql/mapper/adds/nims/dsuseMgtRslt-mapper.xml +++ b/src/main/resources/sql/mapper/adds/nims/dsuseMgtRslt-mapper.xml @@ -11,6 +11,7 @@ , tcc.CODE_VAL AS DSUSE_MTH_NM , tdm.DSUSE_DE , tdm.DSUSE_LOC + , tdm.DSUSE_SE_CD , IF(#{dscdmngId} = tdm.DSCDMNG_ID, 'Y', 'N') AS SELF_YN , (SELECT GROUP_CONCAT(dscdmng_id SEPARATOR ',') FROM tb_dsuse_mgt 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 1ece058..97e5eac 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 @@ -157,6 +157,9 @@ document.getElementById("rsltImgList").innerHTML = ""; $('#btnImgAdd--${pageName}').prop('disabled', false); $('#btnImgDel--${pageName}').prop('disabled', false); + $('#dsuseLoc--${pageName}') + .val('') + .prop('disabled', false); let param = { dscdmngId: $("#dscdmngId--${pageName}").val(), @@ -195,6 +198,7 @@ if(dscnmngIds.length > 1){ $('#dsuseDe--${pageName}').prop('disabled', true); $('#dsuseMthCd--${pageName}').prop('disabled', true); + $('#dsuseLoc--${pageName}').prop('disabled', false); $('#spnDsuseDe').show(); $('#spnDsuseMthCd').show(); @@ -206,11 +210,13 @@ isImgSaved = false; $('#btnImgAdd--${pageName}').prop('disabled', true); $('#btnImgDel--${pageName}').prop('disabled', true); + $('#dsuseLoc--${pageName}').val(list[0].DSUSE_LOC); + $('#dsuseLoc--${pageName}').prop('disabled', true); let tagsTextArr = []; for(let idx = 0; idx < list.length; idx++){ let item = list[idx]; - tagsTextArr.push('폐기관리번호 : [ ' + item.DSCDMNG_ID + ' ]의 폐기사진 공유(총 ' + dscnmngIds.length + '건)
폐기일자 : [ ' + item.DSUSE_DE + ' ], 폐기방법 : [ ' + item.DSUSE_MTH_NM + ' ]'); + tagsTextArr.push('폐기관리번호 : [ ' + item.DSCDMNG_ID + ' ]의 폐기사진 공유(총 ' + dscnmngIds.length + '건)
폐기일자 : [ ' + item.DSUSE_DE + ' ], 폐기방법 : [ ' + item.DSUSE_MTH_NM + ' ], 폐기장소 : [ ' + item.DSUSE_LOC + ' ]'); } document.getElementById("rsltImgList").innerHTML = tagsTextArr.join(""); if(isOnloadExistRsltImg && list.length > 0) isRsltImgRemove = true; 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 615f6fe..662a08a 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 @@ -221,7 +221,7 @@ $P.control.defaultFetchSize = FETCH_XXS; // 1 페이지당 조회되는 자료 건수 index.jsp에서 확인 FETCH_XS = 30 $P.control.query = { pageNum : 1, fetchSize : $P.control.defaultFetchSize }; $P.control.beforeCurrent = null; - + $P.detailControl = new DatasetControl({ urls : { @@ -252,7 +252,7 @@ , func: "pageObject['${pageName}'].control.load({index})" }); - + }; $P.detailControl.onDatasetChange = (obj) => { @@ -262,7 +262,7 @@ // 현재 선택 자료 변경 이벤트 $P.control.onCurrentChange = (item) => { if (!item) { - $P.detailControl.setData([]); + $P.detailControl.setData([]); return; } @@ -292,9 +292,10 @@ $P.control.getInfo = (isDtl) => { let dialogTitle = "폐기 결과[통보] 등록"; const row = $P.control.dataset.getCurrent(); - + if(isDtl && row.PRGRS_STTS_CD != "01") dialogTitle = "폐기 결과[통보] 상세"; if (typeof row == "undefined" || row == null || row == "") return; + let params = { dscdmngId: row.DSCDMNG_ID, bsshNm: row.BSSH_NM, @@ -329,7 +330,7 @@ , title : dialogTitle , content : resp , size : $P.control.infoSize - , onClose : () => { + , onClose : () => { $P.control.reload({all : true}); } }); @@ -369,10 +370,10 @@ if(option != null && option.reloaded){ initScroll = false; } - + $("#table-responsive--${pageName}")[0].changeContent(trs.join(), initScroll, noMore); - + } @@ -421,7 +422,7 @@ /************************************************************************** * 사용자 함수(function) **************************************************************************/ - + // 사용자검색 callback $P.callbackFindUser = (userId, userNm) => { @@ -438,7 +439,7 @@ }); return; } - + $P.control.getInfo(); } @@ -543,7 +544,7 @@ // DataTables 스크롤 이벤트 생성 Componentization.fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollDataList); - + // 하단 테이블 행 번호 표시 Componentization.fnMakeRowNumberingTable(document.getElementById('tbody--${pageName}Detail') , (tr)=>{ return $(tr).find("td.row-num")[0]; }