From 0c088d6ab63810f8f49095a6ecb2b62f6171097b Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 7 Nov 2022 11:58:08 +0900 Subject: [PATCH] =?UTF-8?q?2022-11-07=2011:57=20=EB=82=B4=EB=B6=80?= =?UTF-8?q?=EA=B2=B0=EC=9E=AC=20=EC=B6=94=EA=B0=80=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 30 +++++++--- .../jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp | 10 +++- .../jsp/kccadr/adjPgrMgr/dtb/dtbDetail.jsp | 57 ++++++++++++++++++- .../jsp/kccadr/adjPgrMgr/dtb/dtbReg.jsp | 4 ++ .../iam/internalApprovManageDetail.jsp | 4 ++ .../kccadr/adjReqMgr/adjReqMgrRegDetail.jsp | 2 +- .../advcAprvl/popup/advcAprvlReqPop.jsp | 4 +- .../advcAprvl/popup/advcAprvlReqPop30.jsp | 3 +- .../advcAprvl/popup/advcAprvlReqPop50.jsp | 3 +- .../advcAprvl/popup/advcAprvlReqPop502030.jsp | 3 +- 10 files changed, 105 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index b78cdedc..5bb5ff22 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -328,6 +328,11 @@ $(document).ready(function(){ } } + //결재 팝업 이후 처리내용 + function fnc_aprvl_pop_ret(param){ + location.reload(); + } + /* 워크플로우 */ $(function(){ $(".work_flow_wrap .btn_open").click(function(){ @@ -469,8 +474,9 @@ $(document).ready(function(){ - - + + + @@ -481,8 +487,9 @@ $(document).ready(function(){ - - + + + @@ -574,7 +581,16 @@ $(document).ready(function(){ - + + 기일조서 +
${KccadrConstants.ADR_APP_NTC_APPR } +
${info.statCd } +
${KccadrConstants.ADR_CNCLTBS_APPR_REQ} +
${KccadrConstants.ADR_CNCLTBS_RETN} +
${KccadrConstants.ADR_APP_CHG_APPR} + +
/${apmChgDateList}/1 +
/${drtInfo}/2 --%> - + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index bbc1daec..69bcafc8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -256,6 +256,11 @@ } } + //결재 팝업이후 처리 내용 + function fnc_aprvl_pop_ret(param){ + fncGoList(); //조정진행목록으로 + } + function fncPrint() { var form = document.listForm; @@ -654,8 +659,9 @@ || info.statCd== KccadrConstants.ADR_APP_NTC_RETN || info.statCd== KccadrConstants.ADR_APP_ADD || info.statCd== KccadrConstants.ADR_APP_CHG_APPR}"> - - + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbDetail.jsp index 4575dc83..c620c1cf 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbDetail.jsp @@ -206,9 +206,63 @@ error: function (e) { alert("요청에 실패하였습니다."); console.log("ERROR : ", e); } }); } + + function fnc_aprvl_pop(param){ + var pop = document.pop; + pop.sbmtTyCd.value=param; + + //commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrOffAppReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + + if (param=='201010'){ //20, 30, 40 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop.do", '1000', '700', "entInfoPop", $('#pop')); + //commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + }else if (param=='202010'){ //30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop30.do", '1000', '700', "entInfoPop30", $('#pop')); + + }else if (param=='204010' + || param=='205010' + || param=='302010' + || param=='303010' + || param=='304010' + || param=='305010' + || param=='306010' + || param=='307010' + ){ //50 + //204010, 307010, 305010, 304010, 303010, 306010, 302010, 205010 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop50.do", '1000', '700', "entInfoPop50", $('#pop')); + + }else if (param=='309010'){ //50, 20, 30 + commonPopWindowopenForm("/kccadr/advcAprvl/popup/advcAprvlReqPop502030.do", '1000', '700', "entInfoPop502030", $('#pop')); + + } + } + + //결재 팝업이후 처리 내용 + function fnc_aprvl_pop_ret(param){ + fncGoList('list'); //조정진행목록으로 + } +
+ " /> + " /> + " /> + + " /> + " /> + + " /> + " /> + <%-- " /> --%> + + + + + +
+
" /> " /> @@ -336,7 +390,8 @@
- + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbReg.jsp index b47a4134..acdde43b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dtb/dtbReg.jsp @@ -249,6 +249,10 @@ } } + //결재 팝업이후 처리 내용 + function fnc_aprvl_pop_ret(param){ + fncGoList('list'); //조정진행목록으로 + } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp index 682d5162..40550689 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/iam/internalApprovManageDetail.jsp @@ -767,6 +767,10 @@ console.log(status); $('.tab_cont .tbType02').find('button').remove('button'); $('.tab_cont .btn_wrap .area_left').find('button').remove('button'); + $('.tab_cont .btn_layout05').find('button').remove('button'); + $('.tab_cont .tb_tit').find('button').remove('button'); + //btn_wrap btn_layout05 + }); } function getPageUrl(idx) { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp index 0b8a5dab..d790ab69 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegDetail.jsp @@ -130,7 +130,7 @@ } function fncPayment(){ - commonPopWindowopenForm("/kccadr/adjReqMgr/popup/adjReqMgrRegPaymentPopup.do" , "650", "400", "securityPop",$("#detailForm")); + commonPopWindowopenForm("/kccadr/adjReqMgr/popup/adjReqMgrRegPaymentPopup.do" , "650", "600", "securityPop",$("#detailForm")); } //사건정보 팝업 diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp index c5aabc55..55028ce1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop.jsp @@ -862,7 +862,9 @@ function fn_save_aprvl() { success : function(returnData, status) { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); - top.window.opener.parent.location.reload(); + //top.window.opener.parent.location.reload(); + top.window.opener.fnc_aprvl_pop_ret(); + fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop30.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop30.jsp index 02cdb15a..4699a40f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop30.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop30.jsp @@ -861,7 +861,8 @@ function fn_save_aprvl() { success : function(returnData, status) { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); - top.window.opener.parent.location.reload(); + //top.window.opener.parent.location.reload(); + top.window.opener.fnc_aprvl_pop_ret(); fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp index a3c20d79..fd38b97f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop50.jsp @@ -861,7 +861,8 @@ function fn_save_aprvl() { success : function(returnData, status) { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); - top.window.opener.parent.location.reload(); + //top.window.opener.parent.location.reload(); + top.window.opener.fnc_aprvl_pop_ret(); fncGoClose(); }else{ alert("ERROR"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp index acc511b4..13fc27fc 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/advcAprvl/popup/advcAprvlReqPop502030.jsp @@ -861,7 +861,8 @@ function fn_save_aprvl() { success : function(returnData, status) { if (returnData.status == "success") { alert("결재요청 완료되었습니다."); - top.window.opener.parent.location.reload(); + //top.window.opener.parent.location.reload(); + top.window.opener.fnc_aprvl_pop_ret(); fncGoClose(); }else{ alert("ERROR");