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 d39cfbb0..81cdbdee 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 @@ -510,7 +510,8 @@ $(document).ready(function(){ - + ${list.menuId} @@ -616,12 +617,43 @@ $(document).ready(function(){ - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index 4e39547a..638cf281 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -181,6 +181,43 @@ }); } + 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){ + //location.reload(); + fncGoList('list'); //조정진행목록으로 + } + function sendDlvInfoPop() { commonPopWindowopenForm("/kccadr/adjPgrMgr/dlvinfo/popup/dlvInfoPop.do", '580', '350', "dlvInfoPop", $('#dlvpop')); } @@ -263,6 +300,16 @@ + +
+ " /> + " /> + " /> + + + + +
" /> " /> @@ -574,7 +621,8 @@ info.statCd eq '302050' || info.statCd eq '303090' }"> - + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp index fefd9f57..7ac84916 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armReg.jsp @@ -286,7 +286,7 @@
- +