Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git
This commit is contained in:
myname
commit
8f31ee24ac
@ -19,6 +19,7 @@ import org.json.simple.JSONObject;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.core.env.SystemEnvironmentPropertySource;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.ModelMap;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
@ -659,6 +660,7 @@ public class ApmController {
|
||||
// List<FileVO> fileList = fileService.selectFileInfs(fileVO);
|
||||
// model.addAttribute("fileList", fileList);
|
||||
// }
|
||||
|
||||
model.addAttribute("exmpList", exmp);
|
||||
model.addAttribute("ccTy", adjstReqVO.getCcTy());
|
||||
model.addAttribute("exmpCd", adjstReqVO.getExmpCd());
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
|
||||
<script type="text/javascript" src="<c:url value='/js/antdatepicker/moment.min.js'/>"></script>
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$(document).ready(function() {
|
||||
//$('#oldDe').text(moment('<c:out value="${info.adrEndDeDay}" />').format('YYYY-MM-DD'));
|
||||
//$('#newDe').text(moment('<c:out value="${info.adrEndDeDay}" />').add(1, 'months').format('YYYY-MM-DD'));
|
||||
|
||||
@ -85,49 +85,48 @@
|
||||
});
|
||||
} */
|
||||
|
||||
fn_selectCn();
|
||||
});
|
||||
//fn_selectCn();
|
||||
});
|
||||
|
||||
function workView(obj){
|
||||
if($(obj).closest(".work_flow_wrap").hasClass("off")){
|
||||
$(obj).closest(".work_flow_wrap").removeClass("off");
|
||||
$(obj).addClass("btn_close").removeClass("btn_open");
|
||||
}else{
|
||||
$(obj).closest(".work_flow_wrap").addClass("off");
|
||||
$(obj).removeClass("btn_close").addClass("btn_open");
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style>
|
||||
.popup_cont {border-bottom:0 none;}
|
||||
.work_flow_wrap {min-width:auto;padding:0 10px;margin:0 0 15px;}
|
||||
.work_flow_wrap .work_tit {padding:10px 0 10px 5px;font-size:16px;}
|
||||
.work_flow_wrap .work_cont {width:100%;height:auto;padding:10px 15px;transition:none;}
|
||||
.work_flow_wrap .work_cont dl dt {margin:10px 0 0;line-height:30px;}
|
||||
.work_flow_wrap .work_cont dl dd {margin:5px 0 0;padding:10px;line-height:24px;background:#f1f2f4;border-radius:5px;}
|
||||
.work_flow_wrap .work_cont dl dd span {color:#d43403;}
|
||||
.work_flow_wrap .work_cont dl:first-child dt {margin:0;}
|
||||
.work_flow_wrap .work_cont .text {line-height:24px;}
|
||||
.work_flow_wrap .work_cont .text span {color:#d43403;}
|
||||
.work_flow_wrap.off .work_cont {height:0;padding:0 15px;transition:none;}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<div class="area_popup case_change" style="width: 550px;">
|
||||
<div class="cont_popup">
|
||||
<p class="tb_tit"><kc:code codeId="CC040" code="${exmpCd}"/></p>
|
||||
<table class="popup_tbType01 t_center">
|
||||
<colgroup>
|
||||
<col style="width: 20%;">
|
||||
<col style="width: 80%;">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td style="line-height: 30px; text-align: left;">
|
||||
<kc:code codeId="CC040" code="${exmpCd}"/>
|
||||
</td>
|
||||
<td style="line-height: 30px; text-align: left;">
|
||||
<%-- <kc:select codeId="CC002" name="exmpCcTy" id="exmpCcTy" selectedValue="${ccTy}"/> --%>
|
||||
<select style="width: 135px;">
|
||||
<option value="">사건 유형 1</option>
|
||||
<option value="">사건 유형 2</option>
|
||||
<option value="">사건 유형 3</option>
|
||||
</select>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td style="line-height: 30px; text-align: left;">
|
||||
내용
|
||||
</td>
|
||||
<td id="exmpCn" style="line-height: 30px; text-align: left;" >
|
||||
1)피신청인은 신청인에게 저작권 침해에 따른 손해배상 및 위자료로서 금삼백만원(W3,000,000)을 지급한다. 2)피신청인이 제작, 보유하고 있는 본 건 침해물 <월간 스키라이브>를 조정성립일로부터 14일 이내에 폐기처분한다. 라는 조정을 구합니다
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="btn_wrap btn_layout04">
|
||||
<button class="btnType01 tooltip-close" id="redBtn">등록</button>
|
||||
<div class="popup_cont" style="max-height: none;">
|
||||
<c:forEach items="${exmpList }" var="exmp">
|
||||
<div class="work_flow_wrap off">
|
||||
<div class="work_tit">
|
||||
<p><c:out value="${exmp.exmpTit }" /></p>
|
||||
<button type="button" title="열림" class="btn_open" onclick="workView(this);"><i></i></button>
|
||||
</div>
|
||||
<div class="work_cont">
|
||||
<div class="text">
|
||||
<a href="javascript:;" onclick="addText(this, '01'); return false;"><c:out value="${exmp.exmpCn }" /></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:forEach>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@ -488,19 +488,3 @@ table select+button{vertical-align: middle;}
|
||||
|
||||
|
||||
.tbType01 tbody td .innorix_basic {margin:15px 0;}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user