From a918ffc96582a34adfee07b00f10712214c848ca Mon Sep 17 00:00:00 2001 From: hylee Date: Wed, 16 Nov 2022 16:16:13 +0900 Subject: [PATCH] =?UTF-8?q?refactor:[PMS:#2892]=EB=8B=B5=EB=B3=80=EC=84=9C?= =?UTF-8?q?=20=ED=81=B4=EB=A6=AD=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjst/web/AdjstReqWebController.java | 3 ++ .../adjst/popup/adjstReqOpenExamplePop.jsp | 31 ++++++++++++++++--- src/main/webapp/js/page/adjstReq/adjstReq.js | 1 - 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java index 4482089e..279e192c 100644 --- a/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java +++ b/src/main/java/kcc/kccadr/adjst/web/AdjstReqWebController.java @@ -213,7 +213,10 @@ public class AdjstReqWebController { // List fileList = fileService.selectFileInfs(fileVO); // model.addAttribute("fileList", fileList); // } + + model.addAttribute("exmpList", exmpList); + model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); 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 0d0416cf..5eab99c4 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 @@ -34,8 +34,19 @@ $(document).ready(function(){ }); // 신청취지 텍스트에 추가 -function addText(obj){ - $('#reqCn1').text($('#reqCn1').text().trim()+' '+obj.text); +function addText(obj, exmpCd){ + // 답변서 code == 04 + if(exmpCd == '04') + { + $('#adrDocCn1').text(obj.text); + $(".tooltip-close").trigger("click"); + + } + else + { + $('#reqCn1').text($('#reqCn1').text().trim()+' '+obj.text); + } + } @@ -45,8 +56,20 @@ function addText(obj){ diff --git a/src/main/webapp/js/page/adjstReq/adjstReq.js b/src/main/webapp/js/page/adjstReq/adjstReq.js index 1d2b4719..b2d3b553 100644 --- a/src/main/webapp/js/page/adjstReq/adjstReq.js +++ b/src/main/webapp/js/page/adjstReq/adjstReq.js @@ -1048,7 +1048,6 @@ var AdjstReq = { ); }, openExamplePop : function(expmCd){ - console.log(" + expmCd :: ", expmCd); commonPopLayeropen( "/web/kccadr/adjst/popup/adjstReqOpenExamplePop.do" , 1100