Merge branch 'master' of
http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/kcc_adr_advc_git Conflicts: src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp
This commit is contained in:
myname
commit
43df0e8eea
@ -440,6 +440,13 @@
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function fncAddAgnt(rpplSeq) {
|
||||
$('#rpplSeq').val(rpplSeq);
|
||||
|
||||
var pop = document.pop;
|
||||
commonPopWindowopenForm("/kccadr/adjPgrMgr/drt/popup/addAgntPop.do", "750", "660", "addAgntPop", $('#pop'));
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
@ -453,6 +460,7 @@
|
||||
<!-- 고도화로 추가됨 -->
|
||||
<input type="hidden" id="sbmtTyCd" name="sbmtTyCd" value=""/>
|
||||
|
||||
<input type="hidden" id="rpplSeq" name="rpplSeq" />
|
||||
</form>
|
||||
<form id="dlvpop" name="dlvpop" method="post">
|
||||
<input type="hidden" id="adrNo" name="adrNo" value="<c:out value="${info.adrNo}" />" />
|
||||
@ -585,21 +593,23 @@
|
||||
<th>참관대리인</th>
|
||||
<td>
|
||||
<c:forEach var="ass" items="${assList}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.assUsrTy=='35' && ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|35|Y|${ass.assSeq}"></c:out>" <c:if test="${ass.addYn=='Y' }">selected="selected"</c:if>>출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|35|N|${ass.assSeq}"></c:out>" <c:if test="${ass.addYn=='N' }">selected="selected"</c:if>>불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.assUsrTy=='30' && ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</c:forEach>
|
||||
<c:if test="${ass.assUsrTy eq '10'}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|35|Y"></c:out>">출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|35|N"></c:out>">불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -636,20 +646,22 @@
|
||||
<th>참관대리인</th>
|
||||
<td>
|
||||
<c:forEach var="ass" items="${assList}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.assUsrTy=='45' && ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|45|Y|${ass.assSeq}"></c:out>" <c:if test="${ass.addYn=='Y' }">selected="selected"</c:if>>출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|45|N|${ass.assSeq}"></c:out>" <c:if test="${ass.addYn=='N' }">selected="selected"</c:if>>불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.assUsrTy=='40' && ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
<c:if test="${ass.assUsrTy eq '20'}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|45|Y"></c:out>">출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|45|N"></c:out>">불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')" style="height: 50px;">${ass.addUsrNm}</br>참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
@ -867,7 +879,7 @@
|
||||
</div>
|
||||
<div class="area_right">
|
||||
|
||||
<!-- <button type="button" class="btnType06" onclick="fncPrint()">출력</button> -->
|
||||
<button type="button" class="btnType06" onclick="fncPrint()">출력</button>
|
||||
<c:choose>
|
||||
<c:when test="${dlvCnt > 0}">
|
||||
<button type="button" class="btnType02" onclick="listDlvInfo();">송달정보조회</button>
|
||||
|
||||
@ -359,21 +359,22 @@
|
||||
<th>참관대리인</th>
|
||||
<td>
|
||||
<c:forEach var="ass" items="${assList}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.assUsrTy=='30' && ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|35|Y"></c:out>">출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|35|N"></c:out>">불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<%-- <c:when test="${ass.assUsrTy=='30' && ass.isAgnt eq 'N'}"> --%>
|
||||
<c:when test="${ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
<c:if test="${ass.assUsrTy eq '10'}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|35|Y"></c:out>">출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|35|N"></c:out>">불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
@ -411,20 +412,22 @@
|
||||
<th>참관대리인</th>
|
||||
<td>
|
||||
<c:forEach var="ass" items="${assList}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.assUsrTy=='40' && ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|45|Y"></c:out>">출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|45|N"></c:out>">불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.assUsrTy=='40' && ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')">참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
<c:if test="${ass.assUsrTy eq '20'}">
|
||||
<c:choose>
|
||||
<c:when test="${ass.isAgnt eq 'Y'}">
|
||||
<p>
|
||||
<c:out value="${ass.agntNm }"></c:out>
|
||||
</p>
|
||||
<select name="addAgntList" id="addAgntList" class="wid_120">
|
||||
<option value="<c:out value="${ass.agntSeq }|45|Y"></c:out>">출석</option>
|
||||
<option value="<c:out value="${ass.agntSeq }|45|N"></c:out>">불출석</option>
|
||||
</select>
|
||||
</c:when>
|
||||
<c:when test="${ass.isAgnt eq 'N'}">
|
||||
<button type="button" class="btnType01 btn_change" onclick="fncAddAgnt('${ass.addUsrId}')" style="height: 50px;">${ass.addUsrNm}</br>참관대리인등록</button>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -138,5 +138,7 @@
|
||||
</web-resource-collection>
|
||||
<auth-constraint></auth-constraint>
|
||||
</security-constraint>
|
||||
|
||||
|
||||
<!-- tomcat clustering setting -->
|
||||
<distrubutable />
|
||||
</web-app>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user