견문보고서 결재상태 양식 변경.
parent
b3a8ba02b8
commit
fcca886fca
|
|
@ -254,3 +254,7 @@ body {
|
||||||
background-color:#E6E6E6;
|
background-color:#E6E6E6;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.view-modal-content{
|
||||||
|
height: 300px;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
|
@ -81,7 +81,7 @@
|
||||||
<hr class="my-1">
|
<hr class="my-1">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">내용</label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">내용</label>
|
||||||
<div class="col-sm-11 form-control-sm" id="contentDiv">
|
<div class="col-sm-11 form-control-sm view-modal-content" id="contentDiv">
|
||||||
<div th:utext="${affair.content}"></div>
|
<div th:utext="${affair.content}"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -128,67 +128,73 @@
|
||||||
<hr class="my-1">
|
<hr class="my-1">
|
||||||
<th:block th:each="rate:${affair.rateList}">
|
<th:block th:each="rate:${affair.rateList}">
|
||||||
<div class="row border-secondary text-center">
|
<div class="row border-secondary text-center">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">
|
||||||
<th:block th:each="code:${session.commonCode.get('OG')}">
|
<th:block th:each="code:${session.commonCode.get('OG')}">
|
||||||
<th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
|
<th:block th:if="${code.itemCd eq rate.ratingOrgan}" th:text="${code.itemValue}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</label>
|
</label>
|
||||||
<div class="col-11">
|
<div class="col-11">
|
||||||
<div class="row" th:if="${rate.sectionApprv eq null}">
|
<div class="row" th:if="${rate.sectionApprv eq null}">
|
||||||
<label class="col-sm-8 col-form-label col-form-label-sm text-center bg-white">결재정보가 없습니다.</label>
|
<label class="col-sm-12 col-form-label col-form-label-sm text-center bg-white">결재정보가 없습니다.</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="row border-top-0 border-secondary" th:if="${rate.sectionApprv ne null}">
|
<div class="row border-top-0 border-secondary" th:if="${rate.sectionApprv ne null}">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재결과: </label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재결과 </label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-start">
|
<label class="col-sm-1 col-form-label col-form-label-sm text-start py-3">
|
||||||
<th:block th:each="code:${session.commonCode.get('DST')}">
|
<th:block th:each="code:${session.commonCode.get('DST')}">
|
||||||
<th:block th:if="${code.itemCd eq rate.sectionApprv}" th:text="${code.itemValue}"></th:block>
|
<th:block th:if="${code.itemCd eq rate.sectionApprv}" th:text="${code.itemValue}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
</label>
|
</label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재자: </label>
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재자 </label>
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start py-3">
|
||||||
<th:block th:each="code:${session.commonCode.get('JT')}">
|
<th:block th:each="code:${session.commonCode.get('JT')}">
|
||||||
<th:block th:if="${rate.sectionTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
|
<th:block th:if="${rate.sectionTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:text="${rate.sectionNm}"></th:block>
|
<th:block th:text="${rate.sectionNm}"></th:block>
|
||||||
</label>
|
</label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재일시: </label>
|
<div class="col-7">
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
|
<div class="row">
|
||||||
</div>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-center ">결재일시 </label>
|
||||||
<div class="row border-top-0 border-secondary" th:if="${rate.sectionApprv ne null and !#strings.isEmpty(rate.sectionEtc)}">
|
<label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">기타의견: </label>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-center ">기타의견 </label>
|
||||||
<label class="col-sm-7 col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label>
|
<label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row border-top-0 border-secondary" th:if="${rate.headApprv ne null}">
|
<div class="row border-top-0 border-secondary" th:if="${rate.headApprv ne null}">
|
||||||
<th:block th:if="${rate.headApprv eq 'DST006'}">
|
<div class="col-2">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">견문평가: </label>
|
<div class="row">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-start">
|
<label class="col-sm-6 col-form-label col-form-label-sm text-center" th:classappend="${rate.headApprv eq 'DST005'?'py-3':''}">결재결과 </label>
|
||||||
<th:block th:each="code:${session.commonCode.get('AAR')}">
|
<label class="col-sm-6 col-form-label col-form-label-sm text-start" th:classappend="${rate.headApprv eq 'DST005'?'py-3':''}">
|
||||||
<th:block th:if="${code.itemCd eq rate.affairRate}"
|
<th:block th:each="code:${session.commonCode.get('DST')}">
|
||||||
th:text="|${code.itemValue}${rate.organUp eq 'T'?'(상보)':''}|"></th:block>
|
<th:block th:if="${code.itemCd eq rate.headApprv}" th:text="${code.itemValue}"></th:block>
|
||||||
|
</th:block>
|
||||||
|
</label>
|
||||||
|
<th:block th:if="${rate.headApprv eq 'DST006'}">
|
||||||
|
<label class="col-sm-6 col-form-label col-form-label-sm text-center">견문평가 </label>
|
||||||
|
<label class="col-sm-6 col-form-label col-form-label-sm text-start">
|
||||||
|
<th:block th:each="code:${session.commonCode.get('AAR')}">
|
||||||
|
<th:block th:if="${code.itemCd eq rate.affairRate}"
|
||||||
|
th:text="|${code.itemValue}${rate.organUp eq 'T'?'(상보)':''}|"></th:block>
|
||||||
|
</th:block>
|
||||||
|
</label>
|
||||||
</th:block>
|
</th:block>
|
||||||
</label>
|
</div>
|
||||||
</th:block>
|
</div>
|
||||||
<th:block th:if="${rate.headApprv eq 'DST005'}">
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center py-3">결재자 </label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재결과: </label>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-start py-3">
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-start">
|
|
||||||
<th:block th:each="code:${session.commonCode.get('DST')}">
|
|
||||||
<th:block th:if="${code.itemCd eq rate.headApprv}" th:text="${code.itemValue}"></th:block>
|
|
||||||
</th:block>
|
|
||||||
</label>
|
|
||||||
</th:block>
|
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재자: </label>
|
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
|
|
||||||
<th:block th:each="code:${session.commonCode.get('JT')}">
|
<th:block th:each="code:${session.commonCode.get('JT')}">
|
||||||
<th:block th:if="${rate.headTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
|
<th:block th:if="${rate.headTitle eq code.itemCd}" th:text="${code.itemValue}"></th:block>
|
||||||
</th:block>
|
</th:block>
|
||||||
<th:block th:text="${rate.headNm}"></th:block>
|
<th:block th:text="${rate.headNm}"></th:block>
|
||||||
</label>
|
</label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">결재일시: </label>
|
<div class="col-7">
|
||||||
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
|
<div class="row">
|
||||||
</div>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-center ">결재일시 </label>
|
||||||
<div class="row border-top-0 border-secondary" th:if="${rate.headApprv ne null and !#strings.isEmpty(rate.headEtc)}">
|
<label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
|
||||||
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">기타의견: </label>
|
<label class="col-sm-2 col-form-label col-form-label-sm text-center ">기타의견 </label>
|
||||||
<label class="col-sm-7 col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label>
|
<label class="col-sm-10 col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -201,15 +207,14 @@
|
||||||
<input type="hidden" name="affairKey" th:value="${affair.affairKey}">
|
<input type="hidden" name="affairKey" th:value="${affair.affairKey}">
|
||||||
<th:block th:if="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004')) and affair.affairStatus eq 'DST002' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
|
<th:block th:if="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004')) and affair.affairStatus eq 'DST002' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
|
||||||
<input type="hidden" name="sectionApprv" id="sectionApprv">
|
<input type="hidden" name="sectionApprv" id="sectionApprv">
|
||||||
<div class="row border-top-0 border-secondary">
|
<div class="row border-top-0 border-secondary">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">계장결재</label>
|
||||||
<div class="col-10">
|
<div class="col-10">
|
||||||
<input type="text" class="form-control form-control-sm etc" name="sectionEtc" placeholder="추가의견, 반려사유 기입">
|
<input type="text" class="form-control form-control-sm etc" name="sectionEtc" placeholder="추가의견, 반려사유 기입">
|
||||||
<input type="text" class="d-none" id="submitPrevention">
|
<input type="text" class="d-none" id="submitPrevention">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-1">
|
||||||
<input type="button" class="btn btn-sm btn-success apprvBtn" data-apprvtype="section" data-affairstate="DST004" value="승인">
|
<input type="button" class="btn btn-sm btn-success apprvBtn me-1" data-apprvtype="section" data-affairstate="DST004" value="승인">
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<input type="button" class="btn btn-sm btn-danger apprvBtn" data-apprvtype="section" data-affairstate="DST003" value="반려">
|
<input type="button" class="btn btn-sm btn-danger apprvBtn" data-apprvtype="section" data-affairstate="DST003" value="반려">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -217,11 +222,12 @@
|
||||||
<th:block th:if="${(#strings.contains(apprvAuth, 'APC001') or #strings.contains(apprvAuth, 'APC002')) and affair.affairStatus eq 'DST004' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
|
<th:block th:if="${(#strings.contains(apprvAuth, 'APC001') or #strings.contains(apprvAuth, 'APC002')) and affair.affairStatus eq 'DST004' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
|
||||||
<input type="hidden" name="headApprv" id="headApprv">
|
<input type="hidden" name="headApprv" id="headApprv">
|
||||||
<div class="row border-top-0 border-secondary">
|
<div class="row border-top-0 border-secondary">
|
||||||
|
<label class="col-sm-1 col-form-label col-form-label-sm text-center ">과장결재</label>
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
<input type="text" class="form-control form-control-sm etc" name="headEtc" placeholder="추가의견, 반려사유 기입">
|
<input type="text" class="form-control form-control-sm etc" name="headEtc" placeholder="추가의견, 반려사유 기입">
|
||||||
<input type="text" class="d-none" id="submitPrevention">
|
<input type="text" class="d-none" id="submitPrevention">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-1">
|
||||||
<select class="form-select form-select-sm" name="affairRate" id="affairRate">
|
<select class="form-select form-select-sm" name="affairRate" id="affairRate">
|
||||||
<option value="">견문평가</option>
|
<option value="">견문평가</option>
|
||||||
<th:block th:each="code:${session.commonCode.get('AAR')}">
|
<th:block th:each="code:${session.commonCode.get('AAR')}">
|
||||||
|
|
@ -229,14 +235,12 @@
|
||||||
</th:block>
|
</th:block>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto" th:unless="${userOrgan eq 'OG001'}">
|
<div class="col-1" th:unless="${userOrgan eq 'OG001'}">
|
||||||
<label for="organUp" class="form-check-label">상보여부</label>
|
<label for="organUp" class="form-check-label">상보여부</label>
|
||||||
<input type="checkbox" id="organUp" name="organUp" value="T">
|
<input type="checkbox" id="organUp" name="organUp" value="T">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
<div class="col-1">
|
||||||
<input type="button" class="btn btn-sm btn-success apprvBtn" data-apprvtype="head" data-affairstate="DST006" value="승인">
|
<input type="button" class="btn btn-sm btn-success apprvBtn me-1" data-apprvtype="head" data-affairstate="DST006" value="승인">
|
||||||
</div>
|
|
||||||
<div class="col-auto">
|
|
||||||
<input type="button" class="btn btn-sm btn-danger apprvBtn" data-apprvtype="head" data-affairstate="DST005" value="반려">
|
<input type="button" class="btn btn-sm btn-danger apprvBtn" data-apprvtype="head" data-affairstate="DST005" value="반려">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue