외사활동 결재내용 출력 오류 수정.

master
강석 최 2023-03-29 11:16:11 +09:00
parent 0a19e843bd
commit 14e29ff517
1 changed files with 15 additions and 8 deletions

View File

@ -126,6 +126,7 @@
<th:block th:text="${apprv.userNm}"></th:block> <th:block th:text="${apprv.userNm}"></th:block>
</label> </label>
<th:block th:if="${apprv.userSeq eq viewUserSeq}"> <th:block th:if="${apprv.userSeq eq viewUserSeq}">
<th:block th:if="${apprv.apprvYn eq null}">
<div class="col-sm-6 border border-dark mb-0"> <div class="col-sm-6 border border-dark mb-0">
<input type="text" class="form-control form-control-sm instructions"> <input type="text" class="form-control form-control-sm instructions">
</div> </div>
@ -135,6 +136,12 @@
</div> </div>
<label class="col-sm-2 col-form-label col-form-label-sm text-start mb-0"></label> <label class="col-sm-2 col-form-label col-form-label-sm text-start mb-0"></label>
</th:block> </th:block>
<th:block th:if="${apprv.apprvYn ne null}">
<label class="col-sm-6 col-form-label col-form-label-sm text-start mb-0" th:text="${apprv.instructions}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-start mb-0" th:text="${apprv.apprvYn eq 'Y'?'승인':'반려'}"></label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start mb-0" th:text="${#temporals.format(apprv.apprvDt, 'yyyy-MM-dd')}"></label>
</th:block>
</th:block>
<th:block th:unless="${apprv.userSeq eq viewUserSeq}"> <th:block th:unless="${apprv.userSeq eq viewUserSeq}">
<label class="col-sm-6 col-form-label col-form-label-sm text-start mb-0" th:text="${apprv.instructions}"></label> <label class="col-sm-6 col-form-label col-form-label-sm text-start mb-0" th:text="${apprv.instructions}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-start mb-0" th:text="${apprv.apprvYn eq null?'대기':(apprv.apprvYn eq 'Y'?'승인':'반려')}"></label> <label class="col-sm-1 col-form-label col-form-label-sm text-start mb-0" th:text="${apprv.apprvYn eq null?'대기':(apprv.apprvYn eq 'Y'?'승인':'반려')}"></label>