diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index f596f408..265587e2 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -240,7 +240,7 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do") + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastProgRegist.do") public String adjReqMgrPastProgRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { //TODO 테스트로 인한 seq 코딩 @@ -273,7 +273,7 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastFileRegist.do") + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastFileRegist.do") public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq()); @@ -387,7 +387,7 @@ public class AdjReqMgrPastController { * @return * @throws Exception */ - @RequestMapping("/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do") + @RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastRecordRegist.do") public String adjReqMgrPastRecordRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp index 0a80eb7c..2f976125 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastBasicRegist.jsp @@ -1396,10 +1396,14 @@ function fn_goListPage(){
-
+
+ + + +
- +
@@ -1409,7 +1413,8 @@ function fn_goListPage(){
-
+<%-- --%> + " />
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index 9194c7dc..6de0358e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -34,15 +34,15 @@ $(document).ready(function(){ - $('#goPage').on('click', function(){ - $('#goPageForm').attr('action', ''); - $('#goPageForm').submit(); - }); +// $('#goPage').on('click', function(){ +// $('#goPageForm').attr('action', ''); +// $('#goPageForm').submit(); +// }); - $('#prevPage').on('click', function(){ - $('#goPageForm').attr('action', ''); - $('#goPageForm').submit(); - }); +// $('#prevPage').on('click', function(){ +// $('#goPageForm').attr('action', ''); +// $('#goPageForm').submit(); +// }); }); //더하기 버튼 alert @@ -247,11 +247,11 @@ function fn_goListPage(){
- +
- - + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp index 0dc403d1..1d6767d8 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastProgRegist.jsp @@ -183,11 +183,12 @@ function fn_goListPage(){
- +
- - + + +
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp index 3e9b355f..44e52eda 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastRecordRegist.jsp @@ -220,7 +220,8 @@ $(document).on('click','#regBtn', function(){ console.log('data : ', data); if(data.status == 'OK'){ alert(data.data); - fn_goListPage(); + window.close(); +// fn_goListPage(); // $('#adrSeq').val(data.dataSub); // $('#nextGoPageForm').submit(); } @@ -401,11 +402,11 @@ function fn_goListPage(){
- +
- - + +
diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js index 31e97465..a978570f 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/event.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/event.js @@ -31,7 +31,22 @@ function openExampleAdminPop(exmpCd) { commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/"+uri, '600', '400', "openExampleAdminPop", $('#pop')); } - + $(document).ready(function(){ + + $('.progReg').on('click', function(){ + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrPastProgRegist.do", '820', '600', "adjReqMgrPastProgRegist", $('#nextGoPageForm')); + }); + + $('.fileReg').on('click', function(){ + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrPastFileRegist.do", '1250', '600', "adjReqMgrPastFileRegist", $('#nextGoPageForm')); + }); + + $('.recordReg').on('click', function(){ + commonPopWindowopenForm("/kccadr/adjReqMgOff/popup/adjReqMgrPastRecordRegist.do", '1250', '600', "adjReqMgrPastRecordRegist", $('#nextGoPageForm')); + }); + + + }); /* 최종결과 선택에 따른 액션 diff --git a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js index c288b85f..c56b7d01 100644 --- a/src/main/webapp/js/kccadr/adjReqMgrPast/value.js +++ b/src/main/webapp/js/kccadr/adjReqMgrPast/value.js @@ -1087,8 +1087,8 @@ var msg = ""; var url = ""; - - console.log('$(#adrSeq).val() :', $('#adrSeq').val()); + +// var regUpdt = false; if($('#adrSeq').val() != '') { msg= "조정신청 정보 수정을 진행하시겠습니까?"; @@ -1106,20 +1106,29 @@ var data = new FormData(form); $.ajax({ - type: "POST", - url: url, - data: data, - dataType:'json', - async: false, - processData: false, - contentType: false, - cache: false, - success: function (data) { - alert(data.data); + type: "POST", + url: url, + data: data, + dataType:'json', + async: false, + processData: false, + contentType: false, + cache: false, + success: function (data) { + alert(data.data); if(data.status == 'OK') { - $('#adrSeqHidden').val(data.dataSub); - $('#nextGoPageForm').submit(); + if($('#adrSeqHidden').val() == null) + { + $('#adrSeqHidden').val(data.dataSub); + } + if($('#adrSeq').val() == null) + { + $('#adrSeq').val(data.dataSub); + } + + +// $('#nextGoPageForm').submit(); } else if(data.status == 'Unauthorized' || data.status == 'BAD_REQUEST') {