diff --git a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java index e855f85e..cc040cdf 100644 --- a/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java +++ b/src/main/java/kcc/kccadr/adjcclt/web/AdjstConciliatorController.java @@ -375,6 +375,15 @@ public class AdjstConciliatorController { // model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); return "/web/kccadr/adjcclt/popup/adjstOpinionsPopList"; } + + /** + * 의견관리 목록 > 자주쓰는 의견 등록 팝업 + */ + @RequestMapping("/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.do") + public String adjstOpinionsRegistPopList(@ModelAttribute("adjstConciliatorVO") AdjstConciliatorVO adjstConciliatorVO, ModelMap model) throws Exception { +// model.addAttribute("info", adjstConciliatorService.selectAdjstRecommendationCommentDetail(adjstConciliatorVO)); + return "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList"; + } /** * 조정사건 목록 화면 diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp index 014867a5..f0d5cd79 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/opinion/adjstOpinionList.jsp @@ -155,7 +155,7 @@
- <%----%> +
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp new file mode 100644 index 00000000..7750f1cb --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.jsp @@ -0,0 +1,99 @@ +<%@ 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/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index 99353c9e..536ff59f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -15,106 +15,74 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 6aa91599..f90f8fdb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1242,6 +1242,25 @@ var AdjstReq = { , "adjstOpinionsPop" ); }, + opinionsRegistAdjstPopList : function(paramObj){ + if(paramObj == undefined || paramObj == ''){ + paramObj = { + pageIndex : 1, + searchKeyword : "", + searchCondition : "", + pageUnit : 5 + }; + } + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/adjcclt/popup/adjstOpinionsRegistPopList.do" + , 1000 + , 700 + , paramObj + , "N" + , "adjstOpinionsRegistPop" + ); + }, openExamplePop : function(exmpCd){ /* - 01 : 신청취지 diff --git a/src/main/webapp/kccadrPb/usr/css/content.css b/src/main/webapp/kccadrPb/usr/css/content.css index a64c3e61..118d6fc9 100644 --- a/src/main/webapp/kccadrPb/usr/css/content.css +++ b/src/main/webapp/kccadrPb/usr/css/content.css @@ -732,6 +732,17 @@ table .label{position: absolute;width: 1px; height: 1px; margin: 0; border: none .work_cont p.status01{border: 1px solid #ea5404; color: #ea5404;} .work_cont .status02 p{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} .work_cont p.status02{border: 2px solid #1b6fcd; color: #1b6fcd; font-weight: 500;width:208px;height:43px;} + +.popup_wrap .work_flow_wrap {padding:0 10px;margin:0 0 15px;} +.popup_wrap .work_flow_wrap .work_tit {padding:10px 0 10px 5px;font-size:16px;} +.popup_wrap .work_flow_wrap .work_cont {height:auto;padding:10px 15px;transition:none;} +.popup_wrap .work_flow_wrap .work_cont dl dt {margin:10px 0 0;line-height:30px;} +.popup_wrap .work_flow_wrap .work_cont dl dd {margin:5px 0 0;padding:10px;line-height:24px;background:#f1f2f4;border-radius:5px;} +.popup_wrap .work_flow_wrap .work_cont dl dd span {color:#d43403;} +.popup_wrap .work_flow_wrap .work_cont dl:first-child dt {margin:0;} +.popup_wrap .work_flow_wrap .work_cont .text {line-height:24px;} +.popup_wrap .work_flow_wrap .work_cont .text span {color:#d43403;} +.popup_wrap .work_flow_wrap.off .work_cont {height:0;padding:0 15px;} /* //워크플로우 */ /* 익스플로어 */