From 19d3a5126d469a78a5551f16bfa82128596abb66 Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 12 Oct 2022 14:14:58 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0?= =?UTF-8?q?=20=EC=88=98=EC=88=98=EB=A3=8C=20=EB=B2=84=ED=8A=BC=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/AdjstExpDetailController.java | 8 + src/main/resources/rebel.xml | 6 +- .../web/kccadr/adjstExp/adjstIncidentList.jsp | 55 ++++- .../popup/adjstPayMentDetailPopup.jsp | 194 ++++++++++++++++++ .../adjstExpDetail/adjstIncidentDetail.jsp | 48 ++--- 5 files changed, 267 insertions(+), 44 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index 9e57976c..481c237a 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -166,6 +166,14 @@ public class AdjstExpDetailController { public String adjstReqStatusTabNormal() throws Exception { return "/web/kccadr/adjstExpDetail/adjstReqStatusTabNormal"; } + /** + * 조정신청 구분선택 - 안내화면 + */ + @RequestMapping("/web/kccadr/adjstExpDetail/popup/adjstPayMentDetailPopup.do") + public String adjstPayMentDetailPopup(@ModelAttribute("adjDeputyReqVO") AdjstDeputyReqVO adjDeputyReqVO, ModelMap model) throws Exception { + + return null; + } /** * 조정신청 구분선택 - 안내화면 diff --git a/src/main/resources/rebel.xml b/src/main/resources/rebel.xml index c2e2c0bc..0e85c739 100644 --- a/src/main/resources/rebel.xml +++ b/src/main/resources/rebel.xml @@ -7,18 +7,18 @@ - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp index 3fdf1368..8bd45989 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp @@ -61,10 +61,18 @@ * B :진행 * C :종결 */ - + alert(type); var listForm = document.listForm ; listForm.action = ""; -// listForm.pageType.value = type; + if(type == undefined) + { + listForm.pageType.value = ''; + } + else + { + listForm.pageType.value = type; + } + listForm.submit(); } @@ -260,6 +268,41 @@

조정진행중

+ + + + 접수일자 +

2021-11-21

+ + + 신청인 + 홍길동 + + + 피신청인 + 김길동 외1명 + + + 신청내용 + 미술저작물 + + + 조정부 +

합의1부

+ + + 기일 +

-

+ + + 조정차수 +

1차

+ + + 조정상태 +

조정진행중

+ + @@ -268,15 +311,15 @@ 신청인 - 박영희 + 박영희 피신청인 - 김철수 + 김철수 신청내용 - 어문저작물 + 어문저작물 조정부 @@ -292,7 +335,7 @@ 조정상태 -

조정진행중

+

수수료납부요청

diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp new file mode 100644 index 00000000..17d47bc3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/popup/adjstPayMentDetailPopup.jsp @@ -0,0 +1,194 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + +수수료납부금액 + + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp index c60c5180..65fab3cf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstIncidentDetail.jsp @@ -30,43 +30,18 @@ varFrom.submit(); } - function fn_egov_downFile(atchFileId, fileSn){ - window.open(""); + + function fncPayDtlPopup(type , seq, id){ + var data = { + adrSeq : seq + }; + if(type == "M"){ + data = {mltApprSeq : seq}; + } + funOpenLayerPop("/web/kccadr/accdnt/apm/popup/adjstPayMentDetailPopup.do" , data, 'fee_'+seq+'_popup') + } - function fncEdit(step){ - var varFrom = document.getElementById("editForm"); - varFrom.action = "/web/kccadr/adjst/adjstReqRegistStep"+step+".do"; - varFrom.submit(); - - } - - function fncEditPopup(){ - $('#layerPop').load( - '/web/kccadr/accdnt/ai/popup/adjstIncidentReqEdit.do' - , {"aaa" : "cccc"} - , function(res, status, xhr){ - if(status == "success"){ - var target = "sch_popup" - var showTarget = $('[data-tooltip-con="' + target + '"]'); - showTarget.show().focus(); - - var popWid = showTarget.width(); - var popHei = showTarget.height(); - - var nLeft = (($(window).width() - popWid)/2); - var nTop = (($(window).height() - popHei)/2); - - showTarget.css({ - "left": nLeft, - "top": nTop - }); - showTarget.find('.tooltip-close').data('activeTarget', target); - - $(".mask").show(); - } - }); - } /* 상세정보 팝업_퍼블리싱 작업 요청_이준호_220818 */ function fncDetailPop() { @@ -216,6 +191,9 @@
+ + +