DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

master
강석 최 2023-01-20 11:06:15 +09:00
parent 2f55f54cfe f514f3855a
commit d90bee7272
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js
View File

@ -44,8 +44,6 @@ function getIntelligenceAnalyzeEditModal(iaKey){
$(document).on('click', '#affairModalBtn', function (){ $(document).on('click', '#affairModalBtn', function (){
const affairKey = $("input[name=affairList]"); const affairKey = $("input[name=affairList]");
console.log(affairKey);
console.log(affairKey.val());
const workStartDt = $("#iaSdate").val(); const workStartDt = $("#iaSdate").val();
const workEndDt = $("#iaEdate").val(); const workEndDt = $("#iaEdate").val();
if(!workStartDt||!workEndDt){ if(!workStartDt||!workEndDt){

4
src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html
View File

@ -132,7 +132,7 @@
</th:block> </th:block>
</div> </div>
</div> </div>
<div class="col-12" th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002' or apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and ia.iaState eq 'DST002'}"> <div class="col-12" th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and ia.iaState eq 'DST002'}">
<hr> <hr>
<form action="#" method="post" id="apprvForm"> <form action="#" method="post" id="apprvForm">
<div class="row"> <div class="row">
@ -161,7 +161,7 @@
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002' or apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and ia.iaState eq 'DST002'}"> <th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and ia.iaState eq 'DST002'}">
<button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button> <button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button>
<button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button> <button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
</th:block> </th:block>

2
src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html
View File

@ -154,7 +154,7 @@
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
</div> </div>
<div class="col-auto"> <div class="col-auto">
<th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002' or apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and op.opState eq 'DST002'}"> <th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and op.opState eq 'DST002'}">
<button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button> <button type="button" class="btn btn-danger apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST003':'DST005'}" th:value="반려">반려</button>
<button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button> <button type="button" class="btn btn-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
</th:block> </th:block>