Merge branch 'hylee'

Conflicts:
	src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnDetailTab0.jsp
	src/main/webapp/WEB-INF/jsp/kccadr/adjCourtCnctn/adjCourtCnctnList.jsp
This commit is contained in:
hylee 2024-02-19 15:39:37 +09:00
commit 0a3e3f2654
2 changed files with 8 additions and 1 deletions

View File

@ -127,7 +127,7 @@ function updateMemo(div){
}
function fn_updateCrtStatCd(val){
var msg = "수락 하시겠습니까?";
var msg = "진행 하시겠습니까?";
if(confirm(msg)){
$('#crtStatCdForm > #crtStatCd').val(val);
@ -433,6 +433,9 @@ function fn_updateCrtStatCd(val){
<c:if test="${courtVO.crtStatCd*1 == 101050}">
<button type="button" class="btnType06" onclick="fn_updateCrtStatCd('200000');">사무수행 수락</button>
</c:if>
<c:if test="${courtVO.crtStatCd*1 == 200000}">
<button type="button" class="btnType06" onclick="fn_updateCrtStatCd('200010');">조정위원 종결 처리</button>
</c:if>
</c:if>
<button type="button" class="btnType03" onclick="fn_GoList(); return false;">목록</button>
</div>

View File

@ -206,6 +206,10 @@ function setSearchMonthDate(month) {
<input type="checkbox" id="ckStsList4" name="ckStsList" value="200000">
<label for="ckStsList4">조정진행</label>
</span>
<span>
<input type="checkbox" id="ckStsList45" name="ckStsList" value="200010">
<label for="ckStsList45">조정위원종결</label>
</span>
<span>
<input type="checkbox" id="ckStsList7" name="ckStsList" value="201010">
<label for="ckStsList7">종결결재</label>