Merge branch 'hylee'

This commit is contained in:
hylee 2022-12-20 09:20:38 +09:00
commit e49bf9713f
2 changed files with 267 additions and 266 deletions

View File

@ -243,9 +243,7 @@ function fn_adjstReq_preview() {
<!-- <div class="btn_left"><button type="button" class="btnType04 btn_move" onclick="fncGoPrev();">2단계이동</button></div> -->
<div class="btn_left"><button type="button" class="btnType04 btn_move" onclick="AdjstReq.step3Save('<c:out value='${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}' />'); return false;">2단계이동</button></div>
<div class="btn_right">
<!-- <button type="button" class="btnType06 btn_preview" onclick="alert('준비중입니다.'); return false;">미리보기</button> -->
<button type="button" class="btnType06 btn_preview" onclick="fn_adjstReq_preview(); return false;" title="새창열림">미리보기</button>
<%-- <button type="button" class="btnType01" onclick="AdjstReq.stepDelete('${adjstReqVO.adrSeq}'); return false;">신청서 삭제</button> --%>
<c:choose>
<c:when test="${empty fn:trim(master.ccTy)}">
<button type="button" class="btnType01" onClick="AdjstReq.step3Save('<c:out value='${KccadrConstants.ADR_MODE_NEW}' />'); return false;">임시저장</button>

View File

@ -551,6 +551,9 @@ var AdjstReq = {
data.append("mode" , mode);
if(!confirm(msg)){
if(mode == "${KccadrConstants.ADR_MODE_UPT_TO_GOPREV}"){ // 수정 후 전 페이지
AdjstReq.fncGoPrev();
}
return false;
}