From 20ec29eaefe32137f60075f404cf2bede3e4e351 Mon Sep 17 00:00:00 2001 From: leebj Date: Wed, 21 Aug 2024 15:09:52 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=B5=ED=86=B5=ED=95=A8=EC=88=98,=20?= =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=97=B4=20=EA=B4=80=EB=A0=A8=20=EC=9E=90?= =?UTF-8?q?=EB=B0=94=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-info.jsp | 4 ++-- src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-main.jsp | 2 +- .../webapp/WEB-INF/jsp/adds/nims/dsuseDoc-main.jsp | 6 +++--- .../adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp | 2 +- .../nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp | 2 +- .../adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp | 2 +- .../WEB-INF/jsp/adds/nims/dsuseMgtMapping-info.jsp | 4 ++-- .../WEB-INF/jsp/adds/nims/dsuseMgtMapping-main.jsp | 8 ++++---- .../adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp | 2 +- .../WEB-INF/jsp/adds/nims/dsuseMgtReceipt-edit.jsp | 10 +++++----- .../WEB-INF/jsp/adds/nims/dsuseMgtReceipt-info.jsp | 10 +++++----- .../WEB-INF/jsp/adds/nims/dsuseMgtReceipt-main.jsp | 8 ++++---- .../webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-info.jsp | 8 ++++---- .../webapp/WEB-INF/jsp/adds/nims/dsuseMgtRslt-main.jsp | 2 +- src/main/webapp/WEB-INF/jsp/include/tail.jsp | 2 +- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-info.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-info.jsp index 03775f2..1b11dd5 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-info.jsp @@ -180,7 +180,7 @@ $(document).ready(function() { // 저장 $P.fnSave = async() => { // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; + if (!AppSupport.customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; let apiKeyData = $P.apiKeyFormFields.get(); @@ -193,7 +193,7 @@ $(document).ready(function() { dialog.alert({ content: "현재 API KEY 정보를 저장 하시겠습니까?" - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { $P.control.save(apiKeyData); } }); } diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-main.jsp index bd1b8f8..a579ebf 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/apiKey-main.jsp @@ -269,7 +269,7 @@ } // DataTables(그리드) - let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = AppSupport.getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.control.query.cellDefs = cellDefs; 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 1ce48a1..228b08c 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 @@ -336,7 +336,7 @@ dialog.alert({ content: "선택한 폐기관리 정보로 "+ docName+" 파일을 생성 하시겠습니까?" - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { $P.fnCreateDoc(ADDS12); } @@ -368,7 +368,7 @@ content: "파일 생성 중 오류가 발생하였습니다." +"
" +responseJson.description, - init: () => { setDialogZindex(); } + init: () => { AppSupport.setDialogZindex(); } }); }); return false; @@ -448,7 +448,7 @@ } // DataTables(그리드) - let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = AppSupport.getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.control.query.cellDefs = cellDefs; diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp index ee0fc3c..d23ba74 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByBsshStatistics-main.jsp @@ -328,7 +328,7 @@ // 끝에서 2개의 th 요소 선택 let lastColNames = $(`#theadTr0--${pageName} th`).not("[colspan]").slice(-2); - $P.control.query.cellDefs = getCellDefs( + $P.control.query.cellDefs = AppSupport.getCellDefs( $([...firstColNames, ...middleColNames, ...lastColNames]), $($("#${infoPrefix}Row--${pageName}")[0].content).find("td") .not(".dummy-td").not(":eq(0)").not("[colspan]") diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp index b38ccf1..b0ea406 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByIndutyStatistics-main.jsp @@ -348,7 +348,7 @@ // 끝에서 2개의 th 요소 선택 let lastColNames = $(`#theadTr0--${pageName} th`).not("[colspan]").slice(-2); - $P.control.query.cellDefs = getCellDefs( + $P.control.query.cellDefs = AppSupport.getCellDefs( $([...firstColNames, ...middleColNames, ...lastColNames]), $($("#${infoPrefix}Row--${pageName}")[0].content).find("td") .not(".dummy-td").not(":eq(0)").not("[colspan]") diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp index 83fd68f..08494b3 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtDsuseQyByPrdStatistics-main.jsp @@ -326,7 +326,7 @@ // 끝에서 2개의 th 요소 선택 let lastColNames = $(`#theadTr0--${pageName} th`).not("[colspan]").slice(-2); - $P.control.query.cellDefs = getCellDefs( + $P.control.query.cellDefs = AppSupport.getCellDefs( $([...firstColNames, ...middleColNames, ...lastColNames]), $($("#${infoPrefix}Row--${pageName}")[0].content).find("td") .not(".dummy-td").not(":eq(0)").not("[colspan]") 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 1ff12dd..33fbad9 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 @@ -509,7 +509,7 @@ if(!checkData){ dialog.alert({ content: "선택한 NIMS 폐기보고 데이타가 없습니다." - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => {} }); return false; @@ -518,7 +518,7 @@ dialog.alert({ content: "확인 선택한 NIMS 폐기보고 정보를 저장 하시겠습니까?" - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { $P.control.save(); // formFields } 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 fb2807a..20d8614 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 @@ -374,8 +374,8 @@ dialog.alert({ content : showMessage, init : function(){ - setDialogZindex(); - focusClose(); + AppSupport.setDialogZindex(); + AppSupport.focusClose(); } }); @@ -500,7 +500,7 @@ dialog.alert({ content : "현재 " + $P.control.dataset.getCurrent().DSCDMNG_ID + " 정보를 완료 처리 하시겠습니까?", init : function() { - focusOK(); + AppSupport.focusOK(); }, onOK : () => { $P.control.prgsSttus(); @@ -553,7 +553,7 @@ } // DataTables(그리드) - let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = AppSupport.getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.control.query.cellDefs = cellDefs; diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp index eabbbbb..ad3caaf 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtNcrdAndPrtmStatistics-main.jsp @@ -351,7 +351,7 @@ let lastColNames = $(`#theadTr0--${pageName} th`).not("[colspan]").slice(-2); // DataTables(그리드) - $P.control.query.cellDefs = getCellDefs( + $P.control.query.cellDefs = AppSupport.getCellDefs( $([...firstColNames, ...middleColNames, ...lastColNames]), $($("#${infoPrefix}Row--${pageName}")[0].content).find("td") .not(".dummy-td").not(":eq(0)").not("[colspan]") diff --git a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-edit.jsp b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-edit.jsp index 8579575..cb10fb8 100644 --- a/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-edit.jsp +++ b/src/main/webapp/WEB-INF/jsp/adds/nims/dsuseMgtReceipt-edit.jsp @@ -333,7 +333,7 @@ // 메시지 출력 dialog.alert({ content: showMessage - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { } }); @@ -481,7 +481,7 @@ // 저장 $P.fnSave = async() => { // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; + if (!AppSupport.customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; let bsshData = $P.bsshFormFields.get(); @@ -556,7 +556,7 @@ dialog.alert({ content: "현재 폐기 신청서 접수 정보를 저장 하시겠습니까?" - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { let promiseArr = []; @@ -626,12 +626,12 @@ $P.fnDel = () => { // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; + if (!AppSupport.customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; const row = $P.productList.getCurrent(); dialog.alert({ content: "아래 제품을 삭제하시겠습니까?
제품명: "+row.prductNm + "
유효기간: " +row.prdValidDe+"
제조번호: "+row.mnfNo+"
일련번호: " + row.mnfSeq - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { $P.productList.remove($P.productList.getCurrent().keyCnt); } 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 ac493f9..522ce88 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 @@ -302,7 +302,7 @@ // 메시지 출력 dialog.alert({ content: showMessage - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { } }); @@ -450,7 +450,7 @@ // 저장 $P.fnSave = async() => { // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; + if (!AppSupport.customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; let bsshData = $P.bsshFormFields.get(); @@ -492,7 +492,7 @@ dialog.alert({ content: "현재 폐기 신청서 접수 정보를 저장 하시겠습니까?" - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { let promiseArr = []; @@ -562,12 +562,12 @@ $P.fnDel = () => { // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; + if (!AppSupport.customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; const row = $P.productList.getCurrent(); dialog.alert({ content: "아래 제품을 삭제하시겠습니까?
제품명: "+row.prductNm + "
유효기간: " +row.prdValidDe+"
제조번호: "+row.mnfNo+"
일련번호: " + row.mnfSeq - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { $P.productList.remove($P.productList.getCurrent().keyCnt); } 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 98d17c2..ea6a8bd 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 @@ -365,8 +365,8 @@ dialog.alert({ content:"삭제되었습니다.", init : () => { - setDialogZindex(); - focusClose(); + AppSupport.setDialogZindex(); + AppSupport.focusClose(); }, onClose : () => { $P.control.reload({all : true}); @@ -469,7 +469,7 @@ } dialog.alert({ content: "자료를 삭제할 경우 복구가 불가능합니다.
아래 자료를 삭제하시겠습니까?
폐기관리번호: "+row.DSCDMNG_ID + "
업체명: " +row.BSSH_NM+"
폐기건수: "+row.RND_DTL_RPT_CNT+"
폐기사유: " + row.DSUSE_PRV_NM - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { $P.control.removeDsuseMgt(row.DSCDMNG_ID); } @@ -525,7 +525,7 @@ } // DataTables(그리드) - let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = AppSupport.getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.control.query.cellDefs = cellDefs; 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 17dce5a..a50ee51 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 @@ -280,7 +280,7 @@ // 메시지 출력 dialog.alert({ content: showMessage - , init: () => { setDialogZindex(); } + , init: () => { AppSupport.setDialogZindex(); } , onOK: () => { } }); @@ -333,7 +333,7 @@ dialog.alert({ content: "변경된 내용이 없습니다.", init: () => { - focusOK(); + AppSupport.focusOK(); } }); return; @@ -342,7 +342,7 @@ //const msg = "현재 " + $P.control.prefixName + " 정보를 저장 하시겠습니까?" + isRsltImgRemove ? "
현재 등록된 이미지 삭제" : ""; dialog.alert({ content: (isRsltImgRemove ? "현재 등록된 이미지는 삭제 됩니다
[기등록 이미지 사용]
" : "") + $P.control.prefixName + " 정보를 저장 하시겠습니까?" - , init: () => setDialogZindex() + , init: () => AppSupport.setDialogZindex() , onOK: () => { upload({ url: wctx.url("/adds/nims/saveDsuseMgtRslt.do") @@ -460,7 +460,7 @@ // 저장 $P.fnSave = () => { // validate 확인 - if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; + if (!AppSupport.customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return; let rsltData = $P.formFields.get(); if(rsltData.hdrDe == ""){ 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 491a87d..2c87fb7 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 @@ -491,7 +491,7 @@ } // DataTables(그리드) - let cellDefs = getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") + let cellDefs = AppSupport.getCellDefs($("#theadTr--${pageName} th").not(".dummy-th").not(":eq(0)") , $($("#${infoPrefix}Row--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.control.query.cellDefs = cellDefs; diff --git a/src/main/webapp/WEB-INF/jsp/include/tail.jsp b/src/main/webapp/WEB-INF/jsp/include/tail.jsp index ebdb316..77279d2 100644 --- a/src/main/webapp/WEB-INF/jsp/include/tail.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/tail.jsp @@ -39,8 +39,8 @@ - +