Merge branch 'hylee'

This commit is contained in:
hylee 2022-10-12 14:15:16 +09:00
commit 369727ec79
5 changed files with 267 additions and 44 deletions

View File

@ -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;
}
/**
* 조정신청 구분선택 - 안내화면

View File

@ -7,18 +7,18 @@
<application generated-by="eclipse" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
<classpath>
<dir name="D:/Development/git_repository/kcc_adr_advc_git/target/classes">
<dir name="${rebel.workspace.path}/kcc_adr_advc_git/target/classes">
</dir>
</classpath>
<web>
<link target="/">
<dir name="D:/Development/git_repository/kcc_adr_advc_git/target/m2e-wtp/web-resources">
<dir name="${rebel.workspace.path}/kcc_adr_advc_git/target/m2e-wtp/web-resources">
<exclude name="/"/>
</dir>
</link>
<link target="/">
<dir name="D:/Development/git_repository/kcc_adr_advc_git/src/main/webapp">
<dir name="${rebel.workspace.path}/kcc_adr_advc_git/src/main/webapp">
</dir>
</link>
</web>

View File

@ -61,10 +61,18 @@
* B :진행
* C :종결
*/
alert(type);
var listForm = document.listForm ;
listForm.action = "<c:url value='/web/kccadr/adjstExpDetail/adjstIncidentDetail.do'/>";
// listForm.pageType.value = type;
if(type == undefined)
{
listForm.pageType.value = '';
}
else
{
listForm.pageType.value = type;
}
listForm.submit();
}
@ -260,6 +268,41 @@
<p class="status_write">조정진행중</p>
</td>
</tr>
<tr>
<td class="td_num"></td>
<td class="td_date">
<span class="read_only m_th_text">접수일자</span>
<p>2021-11-21</p>
</td>
<td class="td_subscriber">
<span class="m_th_text">신청인</span>
<a href="#none" onclick="fncGoingDetail();">홍길동</a>
</td>
<td class="td_respondent">
<span class="m_th_text">피신청인</span>
<a href="#none" onclick="fncGoingDetail();">김길동 외1명</a>
</td>
<td class="td_tit">
<span class="read_only m_th_text">신청내용</span>
<a href="#none" onclick="fncGoingDetail();">미술저작물</a>
</td>
<td>
<span class="m_th_text">조정부</span>
<p>합의1부</p>
</td>
<td>
<span class="m_th_text">기일</span>
<p>-</p>
</td>
<td>
<span class="m_th_text">조정차수</span>
<p>1차</p>
</td>
<td class="td_status">
<span class="read_only m_th_text">조정상태</span>
<p class="status_write">조정진행중</p>
</td>
</tr>
<tr>
<td class="td_num"></td>
<td class="td_date">
@ -268,15 +311,15 @@
</td>
<td class="td_subscriber">
<span class="m_th_text">신청인</span>
<a href="#none" onclick="fncGoingDetail();">박영희</a>
<a href="#none" onclick="fncGoingDetail('S');">박영희</a>
</td>
<td class="td_respondent">
<span class="m_th_text">피신청인</span>
<a href="#none" onclick="fncGoingDetail();">김철수</a>
<a href="#none" onclick="fncGoingDetail('S');">김철수</a>
</td>
<td class="td_tit">
<span class="read_only m_th_text">신청내용</span>
<a href="#none" onclick="fncGoingDetail();">어문저작물</a>
<a href="#none" onclick="fncGoingDetail('S');">어문저작물</a>
</td>
<td>
<span class="m_th_text">조정부</span>
@ -292,7 +335,7 @@
</td>
<td class="td_status">
<span class="read_only m_th_text">조정상태</span>
<p class="status_write">조정진행중</p>
<p class="status_write">수수료납부요청</p>
</td>
</tr>
</c:if>

View File

@ -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"%>
<!DOCTYPE html>
<html lang="ko">
<head>
<title>수수료납부금액</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<script type="text/javascript" lang="javascript">
function vBankReq() {
var bankCode = $("#bankCode").val();
var nmInput = $("#nmInput").val();
var buyerEmail = $("#buyerEmail").val();
var adrSeq = $("#adrSeq2").val();
var mltApprSeq = $("#mltApprSeq2").val();
var exptext = /^[A-Za-z0-9_\.\-]+@[A-Za-z0-9\-]+\.[A-Za-z0-9\-]+/;
if (bankCode == "") {
alert("입금은행을 선택해 주세요."); return;
} else if (nmInput == "") {
alert("입금자명을 입력해 주세요."); return;
} else if (exptext.test(buyerEmail)==false) {
alert("메일주소를 형식에 맞게 입력해 주세요."); return;
}
var data = {
bankCode : bankCode
,nmInput : nmInput
,buyerEmail : buyerEmail
,adrSeq : adrSeq
,mltApprSeq : mltApprSeq
};
if (confirm("가상계좌를 신청하시겠습니까?")) {
$.ajax({
type: "POST",
url: "/web/kccadr/vBankReqAjax.do",
data: JSON.stringify(data),
dataType:'json',
async: false,
processData: false,
contentType: "application/json",
cache: false,
success: function (returnData, status) {
console.log(returnData.message);
if (returnData.result == "success") {
//opener.location.reload();
//self.close();
var info = "가상계좌 : " + returnData.bankNm + " " + returnData.vacct + "<br>"
+ " 예금주 : 한국저작권위원회" + "<br>";
$("#vacctInfo").html(info);
alert("가상계좌가 생성되었습니다.");
} else {
if (returnData.message && returnData.message != "") {
alert(returnData.message);
} else {
alert("가상계좌가 생성에 실패하였습니다.");
}
}
},
error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
});
}
}
$(document).ready(function(){
var listForm = document.popCreateForm2;
var adr = listForm.adrSeq.value;
var mlt = listForm.mltApprSeq.value;
if(typeof mlt == "undefined" || mlt == ""){
$(".fee_popup").attr("class","popup_wrap fee_"+adr+"_popup");
$("*[data-focus='fee_popup']").attr("data-focus","fee_"+adr+"_popup");
$("*[data-tooltip-con='fee_popup']").attr("data-tooltip-con","fee_"+adr+"_popup");
$("*[data-focus-prev='fee_popup_close']").attr("data-focus-prev","fee_"+adr+"_popup_close");
$("*[data-focus-next='fee_popup']").attr("data-focus-next","fee_"+adr+"_popup");
$("*[data-focus='fee_popup_close']").attr("data-focus","fee_"+adr+"_popup_close");
}else{
$(".fee_popup").attr("class","popup_wrap fee_"+mlt+"_popup");
$("*[data-focus='fee_popup']").attr("data-focus","fee_"+mlt+"_popup");
$("*[data-tooltip-con='fee_popup']").attr("data-tooltip-con","fee_"+mlt+"_popup");
$("*[data-focus-prev='fee_popup_close']").attr("data-focus-prev","fee_"+mlt+"_popup_close");
$("*[data-focus-next='fee_popup']").attr("data-focus-next","fee_"+mlt+"_popup");
$("*[data-focus='fee_popup_close']").attr("data-focus","fee_"+mlt+"_popup_close");
}
});
</script>
</head>
<body>
<!-- 일정 상세 -->
<form:form commandName="adjstPayMentVO" id="popCreateForm2" name="popCreateForm2" method="post" onsubmit="return false;">
<form:hidden path="adrSeq"/>
<form:hidden path="mltApprSeq"/>
</form:form>
<form:form commandName="adjstPayMentVO" id="popCreateForm" name="popCreateForm" method="post" onsubmit="return false;">
<div class="popup_wrap fee_popup" tabindex="0" data-tooltip-con="fee_popup" data-focus="fee_popup" data-focus-prev="fee_popup_close">
<div class="popup_tit">
<p>수수료 납부 금액</p> <button class="btn_popup_close tooltip-close" data-focus="fee_popup_close" title="팝업 닫기"><i></i></button>
</div>
<div class="popup_cont">
<table class="popup_tbType01 t_center">
<caption> 수수료 납부 금액 : 신청내용, 금액등 정보제공 </caption>
<colgroup>
<col style="width: 50%;">
<col style="width: 50%;">
</colgroup>
<thead>
<tr>
<th scope="col">신청내용</th>
<th scope="col">금액</th>
</tr>
</thead>
<tbody>
<c:set var="total" value="0"/>
<c:forEach var="list" items="${list}" varStatus="status">
<tr>
<td>*
<c:out value="${list.apprRson}"/>
</td>
<td>
<p class="t_bold c_222222"><fmt:formatNumber value="${list.adrCost}" pattern="#,###"/>원</p>
<c:set var="total" value="${total + list.adrCost}"/>
</td>
</tr>
</c:forEach>
</tbody>
</table>
<table class="popup_tbType01" style="margin-top: 30px;">
<caption>계좌정보, 결제금액 등 정보제공</caption>
<colgroup>
<col style="width: 95px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th scope="row">계좌정보</th>
<td>
<p class="c_e40000" id="vacctInfo">
<c:choose>
<c:when test="${list[0].accTy == '10'}">
우리은행 1005-802-193838 예금주 : 한국저작권위원회
</c:when>
<c:when test="${list[0].accTy == '20' && not empty list[0].vacct}">
<%-- <c:when test="${list[0].accTy == '20' && not empty list[0].vacct && 1==2}"> --%>
가상계좌 : <kc:code codeId="bankcd" code="${list[0].bankCode}"/> <c:out value="${list[0].vacct}" /><br>
예금주 : 한국저작권위원회<br>
</c:when>
<c:otherwise>
<span class="titType01">입금은행</span><kc:select codeId="bankcd" id="bankCode" name="bankCode"/><label for="bankCode" class="label">입금은행 선택</label><br>
<span class="titType01">구매자명</span> <input type="text" id="nmInput" name="nmInput" title="구매자명 입력" value="<c:out value="${list[0].rpplNm}" />" /><br>
<span class="titType01">메일</span> <input type="text" id="buyerEmail" name="buyerEmail" title="메일 입력" value="<c:out value="${list[0].rpplEmail}" />" />
<button class="btnType05" onclick="vBankReq()">가상계좌신청</button>
</c:otherwise>
</c:choose>
</p>
<input type="hidden" id="adrSeq2" value="<c:out value="${list[0].adrSeq}"/>" />
<input type="hidden" id="mltApprSeq2" value="<c:out value="${list[0].mltApprSeq}"/>" />
</td>
</tr>
<tr>
<th scope="row">결제금액</th>
<td>
<p><fmt:formatNumber value="${total}" pattern="#,###"/>원
<%-- <c:set var="endDe" value="202112161440" /> --%>
<c:set var="endDe" value="${list[0].dtInput}${list[0].tmInput}" />
<c:if test="${not empty endDe}">
<fmt:parseDate value="${endDe}" var="endDeFmt" pattern="yyyyMMddHHmmss" />
(납부기간 : <fmt:formatDate value="${endDeFmt}" pattern="yyyy-MM-dd HH:mm" />까지)
</c:if>
</p>
</td>
</tr>
</tbody>
</table>
<div class="btn_wrap">
<button class="btnType01 tooltip-close" data-focus="fee_popup_close" data-focus-next="fee_popup">닫기</button>
</div>
</div>
</div>
</form:form>
</body>
</html>

View File

@ -30,43 +30,18 @@
varFrom.submit();
}
function fn_egov_downFile(atchFileId, fileSn){
window.open("<c:url value='/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"'/>");
}
function fncEdit(step){
var varFrom = document.getElementById("editForm");
varFrom.action = "/web/kccadr/adjst/adjstReqRegistStep"+step+".do";
varFrom.submit();
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 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 @@
<div class="btn_wrap btn_layout03">
<div class="btn_left"></div>
<div class="btn_right">
<c:if test="${adjstReqStatusVO.pageType eq 'S'}">
<button type="button" class="btnType09 btn_list" onclick="fncGoList();">수수료 납부</button>
</c:if>
<button type="button" class="btnType11 btn_list" onclick="fncGoList();">목록</button>
</div>
</div>