외사첩보망 견문 수정, 로고수정

src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html

@@ -212,7 +212,7 @@
             <th:block th:each="commonCode:${session.commonCode.get('DST')}">
               <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold"
                     th:if="${commonCode.itemCd eq apprv.state}">결재결과:</span>
-              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq apprv.state}" th:text=" ${commonCode.itemValue}"></span>
+              <span class="col-sm-1 border-end borde0r-secondary col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq apprv.state}" th:text=" ${commonCode.itemValue}"></span>
             </th:block>
 
             <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재자:</span>

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportEditModal.html

@@ -16,7 +16,7 @@
     <input type="hidden" name="wrtUserGrd" th:value="${fer.wrtUserGrd}">
     <input type="hidden" name="wrtUserNm" th:value="${fer.wrtUserNm}">
     <input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(fer.wrtDt, 'yyyy-MM-dd HH:mm')}">
-    <div class="row mb-1">
+    <div class="row mb-1 text-center">
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
@@ -29,13 +29,12 @@
     <th:block th:if="${fer.ferKey eq null}">
     <hr>
     <div class="row mb-1">
-    	<h6 class="text-center">정보협력자<br>구성</h6>
-    	<div class="text-end">
+    	<h6 class="text-start">■ 정보협력자 구성</h6>
+    	<div class="text-start">
         	<input type="button" class="btn btn-sm btn-outline-primary" id="operationPlanModalBtn" value="불러오기">
     	</div>
     </div>
-    <div class="row mb-1">
-    <div class="col-sm-1"></div>
+    <div class="row mb-1 text-center">
       <label for="opName" class="col-sm-1 col-form-label col-form-label-sm text-center">성명</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="opName" disabled>
@@ -49,8 +48,7 @@
         <input type="text" class="form-control form-control-sm" id="opPosition" disabled>
       </div>
     </div>
-    <div class="row mb-1">
-    <div class="col-sm-1"></div>
+    <div class="row mb-1 text-center">
       <label for="opJob" class="col-sm-1 col-form-label col-form-label-sm text-center">직업(직위)</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="opJob" disabled>
@@ -64,8 +62,7 @@
        <input type="text" class="form-control form-control-sm" id="opPhone" disabled>
       </div>
    </div>
-   <div class="row mb-1">
-    <div class="col-sm-1"></div>
+   <div class="row mb-1 text-center">
       <label for="opSdate" class="col-sm-1 col-form-label col-form-label-sm text-center">*운용기간</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="opSdate" disabled>
@@ -83,13 +80,12 @@
    <th:block th:unless="${fer.ferKey eq null}">
    <hr>
     <div class="row mb-1">
-    	<h6 class="text-center">정보협력자<br>구성</h6>
+    	<h6 class="text-start">정보협력자 구성</h6>
     	<div class="text-end">
         	<input type="button" class="btn btn-sm btn-outline-primary" id="operationPlanModalBtn" value="불러오기">
     	</div>
     </div>
-    <div class="row mb-1">
-    <div class="col-sm-1"></div>
+    <div class="row mb-1text-center">
       <label for="opName" class="col-sm-1 col-form-label col-form-label-sm text-center">성명</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="opName" th:value="${fer.operationPlan.opName}" disabled>
@@ -104,7 +100,6 @@
       </div>
     </div>
     <div class="row mb-1">
-    <div class="col-sm-1"></div>
       <label for="opJob" class="col-sm-1 col-form-label col-form-label-sm text-center">직업(직위)</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="opJob" th:value="${fer.operationPlan.opJob}" disabled>
@@ -119,7 +114,6 @@
       </div>
    </div>
    <div class="row mb-1">
-    <div class="col-sm-1"></div>
       <label for="opSdate" class="col-sm-1 col-form-label col-form-label-sm text-center">*운용기간</label>
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="opSdate" th:value="${fer.operationPlan.opSdate}" disabled>
@@ -136,10 +130,9 @@
    </th:block>
    <hr>
     <div class="row mb-1">
-    	<h6 class="text-center">소요예산</h6>
+    	<h6 class="text-start">■ 소요예산</h6>
     </div>
     <div class="row mb-1">
-    <div class="col-sm-1"></div>
       <label for="allocationAmount" class="col-sm-1 col-form-label col-form-label-sm text-center">*배정액(만원)</label>
       <div class="col-sm-2">
         <input type="number" class="form-control form-control-sm" id="allocationAmount" name="allocationAmount" th:value="${fer.allocationAmount}">
@@ -154,29 +147,28 @@
       </div>
     </div>
     <div class="row mb-1">
-      <div class="col-sm-1"></div>
       <label for="targetLocation" class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
       <div class="col-sm-8">
-      	<textarea id="targetLocation" name="note" rows="5" cols="102" th:utext="${fer.note}"></textarea>
+      	<textarea id="targetLocation" name="note" rows="5" cols="108" th:utext="${fer.note}"></textarea>
       </div>
     </div>
     <hr>
     <div class="row mb-1">
       <label for="fireExtensionReason" class="col-sm-1 col-form-label col-form-label-sm text-center">해고(연장)<br>사유</label>
       <div class="col-sm-11">
-      	<textarea id="fireExtensionReason" name="fireExtensionReason" rows="5" cols="139" th:utext="${fer.fireExtensionReason}"></textarea>
+      	<textarea id="fireExtensionReason" name="fireExtensionReason" rows="5" cols="108" th:utext="${fer.fireExtensionReason}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="performanceEvaluation" class="col-sm-1 col-form-label col-form-label-sm text-center">운용실적<br>및<br>결과분석·평가</label>
       <div class="col-sm-11">
-      	<textarea id="performanceEvaluation" name="performanceEvaluation" rows="5" cols="139" th:utext="${fer.performanceEvaluation}"></textarea>
+      	<textarea id="performanceEvaluation" name="performanceEvaluation" rows="5" cols="108" th:utext="${fer.performanceEvaluation}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
       <label for="actionOpinion" class="col-sm-1 col-form-label col-form-label-sm text-center">조치의견</label>
       <div class="col-sm-11">
-      	<textarea id="actionOpinion" name="actionOpinion" rows="5" cols="139" th:utext="${fer.actionOpinion}"></textarea>
+      	<textarea id="actionOpinion" name="actionOpinion" rows="5" cols="108" th:utext="${fer.actionOpinion}"></textarea>
       </div>
     </div>
     

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/fireExtensionReportViewModal.html

@@ -26,9 +26,8 @@
         </th:block>
       </div>
       <hr>
-      <div class="row mb-1"><h6 class="text-center">정보협력자 구성</h6></div>
-      <div class="row text-center">
-        <div class="col-sm-1"></div>
+      <div class="row mb-1"><h6 class="text-start">■ 정보협력자 구성</h6></div>
+      <div class="row text-start">
         <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:text="${fer.operationPlan.opName}"></label>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">생년월일:</label>
@@ -37,7 +36,6 @@
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${fer.operationPlan.opPosition}"></label>
       </div>
       <div class="row">  
-        <div class="col-sm-1"></div>
         <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:text="${fer.operationPlan.opJob}"></label>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">경력:</label>
@@ -46,16 +44,14 @@
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${fer.operationPlan.opPhone}"></label>
       </div>
       <div class="row">  
-        <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">운용기간:</label>
         <label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="|${fer.operationPlan.opSdate}~${fer.opEdate}|"></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" th:text="${fer.operationPlan.opRank}"></label>
      </div>
 	 <hr>
-      <div class="row mb-1"><h6 class="text-center">소요예산</h6></div>
-      <div class="row">
-        <div class="col-sm-1"></div>
+      <div class="row mb-1"><h6 class="text-start">■ 소요예산</h6></div>
+      <div class="row text-start">
         <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:text="|${fer.allocationAmount}만원|"></label>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">집행액:</label>
@@ -64,7 +60,6 @@
         <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="|${fer.allocationAmount-fer.executionAmount}만원|"></label>
       </div>
       <div class="row">
-        <div class="col-sm-1"></div>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
         <div class="col-sm-8 form-control-sm col-form-label col-form-label-sm text-start" id="contentDiv">
           <div th:utext="${#strings.replace(fer.note, lineSeparator, '<br>')}"></div>
@@ -98,16 +93,20 @@
         <th:block th:each="apprv:${fer.apprvList}">
           <div class="row">
             <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-              <label class="col-sm-2 col-form-label col-form-label-sm text-center" th:if="${commonCode.itemCd eq apprv.state}" th:text="|결재결과: ${commonCode.itemValue}|"></label>
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center" th:if="${commonCode.itemCd eq apprv.state}" >결재결과 :</label>
+              <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq apprv.state}" th:text="${commonCode.itemValue}"></label>
             </th:block>
+
             <label class="col-sm-2 col-form-label col-form-label-sm text-center">
             <th:block th:each="commonCode:${session.commonCode.get('JT')}">
                 <th:block th:if="${commonCode.itemCd eq apprv.userGrd}" th:text="|결재자: ${commonCode.itemValue} ${apprv.userNm}|"></th:block>
             </th:block>
             </label>
-            <label class="col-sm-4 col-form-label col-form-label-sm text-center">
-                <th:block th:text="|결제일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></th:block>
-            </label>
+
+            <div class="col-12 text-center row  border-top-0 border-secondary">
+              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재일 :</span>
+                <span class="col-sm-4 border-end border-secondary col-form-label col-form-label-sm text-start"><th:block th:text=" ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}"></th:block></span>
+            </div>
 
           </div>
         </th:block>

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeViewModal.html

@@ -8,65 +8,71 @@
   <input type="hidden" name="affairKey" id="viewModalAffairKey">
   <ul class="nav nav-tabs" id="userTab" role="tablist">
     <li class="nav-item" role="presentation">
-      <button class="nav-link active" id="boardTab" data-bs-toggle="tab" data-bs-target="#boardTabPanel" type="button" role="tab" aria-controls="boardTabPanel" aria-selected="true">본문</button>
+      <button class="nav-link active" id="boardTab" data-bs-toggle="tab" data-bs-target="#boardTabPanel" type="button"
+              role="tab" aria-controls="boardTabPanel" aria-selected="true">본문
+      </button>
     </li>
   </ul>
   <div class="tab-content bg-white border border-top-0 p-2 text-center">
     <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
       <div class="row mb-1">
         <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:text="|${ia.wrtUserGrd} ${ia.wrtUserNm}|"></label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-start"
+               th:text="|${ia.wrtUserGrd} ${ia.wrtUserNm}|"></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" th:text="${#temporals.format(ia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
+        <label class="col-sm-2 col-form-label col-form-label-sm text-start"
+               th:text="${#temporals.format(ia.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">상태</label>
         <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-        	<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq ia.iaState}" th:text="${commonCode.itemValue}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq ia.iaState}"
+                 th:text="${commonCode.itemValue}"></label>
         </th:block>
       </div>
       <hr>
       <div class="row mb-1">
-	    <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:text="|${ia.iaSdate} ~ ${ia.iaEdate}|"></label>
-	  </div>
+        <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:text="|${ia.iaSdate} ~ ${ia.iaEdate}|"></label>
+      </div>
       <div class="row mb-1">
-      	<div class="row justify-content-start text-center">
-                <table class="table table-sm table-bordered table-hover">
-                  <thead>
-                  <tr class="table-secondary">
-                    <th colspan="6">첩보수집실적</th>
-                    <th rowspan="2">허위오보</th>
-                    <th colspan="4">활용실적</th>
-                  </tr>
-                  <tr class="table-secondary">
-                  	<th>계</th>
-                    <th>특보</th>
-                    <th>중보</th>
-                    <th>통보</th>
-                    <th>조사</th>
-                    <th>무가치</th>
-                    <th>계</th>
-                    <th>외사<br>활동</th>
-                    <th>공작</th>
-                    <th>검거</th>
-                  </tr>
-                  </thead>
-                  <tbody class="table-group-divider text-center">
-                  <tr>
-	                <td th:text="${ia.totalCnt}"></td>
-	                <td th:text="${ia.specialCnt}"></td>
-	                <td th:text="${ia.middleCnt}"></td>
-	                <td th:text="${ia.tongCnt}"></td>
-	                <td th:text="${ia.joCnt}"></td>
-	                <td th:text="${ia.muCnt}"></td>
-	                <td th:text="${ia.fiCnt}"></td>
-	                <td th:text="${ia.iaTotal}"></td>
-	                <td th:text="${ia.faCnt}"></td>
-	                <td th:text="${ia.workCnt}"></td>
-	                <td th:text="${ia.arrestCnt}"></td>   	
-                  </tr>
-                  </tbody>
-                </table>
-            </div>
+        <div class="row justify-content-start text-center">
+          <table class="table table-sm table-bordered table-hover">
+            <thead>
+            <tr class="table-secondary">
+              <th colspan="6">첩보수집실적</th>
+              <th rowspan="2">허위오보</th>
+              <th colspan="4">활용실적</th>
+            </tr>
+            <tr class="table-secondary">
+              <th>계</th>
+              <th>특보</th>
+              <th>중보</th>
+              <th>통보</th>
+              <th>조사</th>
+              <th>무가치</th>
+              <th>계</th>
+              <th>외사<br>활동</th>
+              <th>공작</th>
+              <th>검거</th>
+            </tr>
+            </thead>
+            <tbody class="table-group-divider text-center">
+            <tr>
+              <td th:text="${ia.totalCnt}"></td>
+              <td th:text="${ia.specialCnt}"></td>
+              <td th:text="${ia.middleCnt}"></td>
+              <td th:text="${ia.tongCnt}"></td>
+              <td th:text="${ia.joCnt}"></td>
+              <td th:text="${ia.muCnt}"></td>
+              <td th:text="${ia.fiCnt}"></td>
+              <td th:text="${ia.iaTotal}"></td>
+              <td th:text="${ia.faCnt}"></td>
+              <td th:text="${ia.workCnt}"></td>
+              <td th:text="${ia.arrestCnt}"></td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
       </div>
       <hr>
       <div class="row">
@@ -111,67 +117,94 @@
         <th:block th:each="apprv:${ia.apprvList}">
           <div class="row">
             <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-              <label class="col-sm-2 col-form-label col-form-label-sm text-center" th:if="${commonCode.itemCd eq apprv.state}" th:text="|결재결과: ${commonCode.itemValue}|"></label>
-            </th:block>
-            <label class="col-sm-2 col-form-label col-form-label-sm text-center">
-            <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                <th:block th:if="${commonCode.itemCd eq apprv.userGrd}" th:text="|결제자: ${commonCode.itemValue} ${apprv.userNm}|"></th:block>
+              <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold"
+                     th:if="${commonCode.itemCd eq apprv.state}">결재결과:</label>
+              <label class="col-sm-2 col-form-label col-form-label-sm text-start"
+                     th:if="${commonCode.itemCd eq apprv.state}" th:text="${commonCode.itemValue}"></label>
             </th:block>
+
+
+            <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
+              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold" th:if="${commonCode.itemCd eq apprv.userGrd}" >결재자:</span>
+              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-start" th:if="${commonCode.itemCd eq apprv.userGrd}" th:text="${commonCode.itemValue} ${apprv.userNm}" ></span>
+            </th:block>-->
+
+            <label class="col-sm-2 col-form-label col-form-label-sm text-center fw-bold">
+
+              <th:block th:each="commonCode:${session.commonCode.get('JT')}">
+                <th:block th:if="${commonCode.itemCd eq apprv.userGrd}"
+                          th:text="|결재자 : ${commonCode.itemValue} ${apprv.userNm}|"></th:block>
+              </th:block>
             </label>
-            <label class="col-sm-2 col-form-label col-form-label-sm text-center">
-                <th:block th:text="|관리관 의견: ${apprv.opinion}|"></th:block>
-            </label>
-            <label class="col-sm-2 col-form-label col-form-label-sm text-center">
-                <th:block th:text="|지시사항: ${apprv.Instruction}|"></th:block>
-            </label>
-            <label class="col-sm-4 col-form-label col-form-label-sm text-center">
-                <th:block th:text="|결제일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></th:block>
-            </label>
+
+            <div class="col-12 text-center row  border-top-0 border-secondary">
+              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">관리관의견 : </span>
+              <span class="col-sm-5 border-end border-secondary col-form-label col-form-label-sm text-start fw-bold"><th:block
+                  th:text="${apprv.opinion}"></th:block></span>
+            </div>
+            <div class="col-12 text-center row  border-top-0 border-secondary">
+              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">지시사항 : </span>
+              <span class="col-sm-5 border-end border-secondary col-form-label col-form-label-sm text-start fw-bold"><th:block
+                  th:text="${apprv.Instruction}"></th:block></span>
+
+            </div>
+
+            <div class="col-12 text-center row  border-top-0 border-secondary">
+              <span class="col-sm-1 border-end border-secondary col-form-label col-form-label-sm text-center fw-bold">결재일시 : </span>
+              <span class="col-sm-5 border-end border-secondary col-form-label col-form-label-sm text-start "><th:block
+                  th:text="${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}"></th:block></span>
+
+            </div>
+
 
           </div>
         </th:block>
       </div>
-      </div>
-      <div class="col-12" th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and ia.iaState eq 'DST002'}">
-	    <hr>
-        <form action="#" method="post" id="apprvForm">
+    </div>
+    <div class="col-12" th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and ia.iaState eq 'DST002'}">
+      <hr>
+      <form action="#" method="post" id="apprvForm">
         <div class="row">
-            <input type="hidden" name="iaKey" th:value="${ia.iaKey}">
+          <input type="hidden" name="iaKey" th:value="${ia.iaKey}">
           ]
 
-            <input type="hidden" name="state" id="viewModalApprvValue">
-            <div class="row">
-            	<label class="col-sm-1 col-form-label col-form-label-sm text-center">관리관 의견</label>
-	            <div class="col-10">
-	            	<input type="text" class="form-control form-control-sm" name="opinion">
-	            </div>
+          <input type="hidden" name="state" id="viewModalApprvValue">
+          <div class="row">
+            <label class="col-sm-1 col-form-label col-form-label-sm text-center">관리관 의견</label>
+            <div class="col-10">
+              <input type="text" class="form-control form-control-sm" name="opinion">
+            </div>
+          </div>
+          <br/><br/>
+          <div class="row">
+            <label class="col-sm-1 col-form-label col-form-label-sm text-center">지시사항</label>
+            <div class="col-10">
+              <input type="text" class="form-control form-control-sm" name="Instruction">
             </div>
-            <br/><br/>
-            <div class="row">
-	            <label class="col-sm-1 col-form-label col-form-label-sm text-center">지시사항</label>
-	            <div class="col-10">
-	            	<input type="text" class="form-control form-control-sm" name="Instruction">
-	            </div>
           </div>
         </div>
       </form>
-      </div>
+    </div>
   </div>
 </div>
 <div class="modal-footer justify-content-between bg-light">
-<div class="col-auto">
-<!--	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
-</div>
-<div class="col-auto">
-  <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-success apprvBtn" th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인</button>
-  </th:block>
-  <th:block th:unless="${ia.iaState eq 'DST004' or ia.iaState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
-    <th:block th:if="${userSeq eq ia.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
-      <button type="button" class="btn btn-warning" th:data-iakey="${ia.iaKey}" id="editBtn">수정</button>
+  <div class="col-auto">
+    <!--	<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
+  </div>
+  <div class="col-auto">
+    <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-success apprvBtn"
+              th:data-planstate="${apprvAuth eq 'APC004'||apprvAuth eq 'APC003'?'DST004':'DST006'}" th:value="승인">승인
+      </button>
     </th:block>
-  </th:block>
-</div>
+    <th:block th:unless="${ia.iaState eq 'DST004' or ia.iaState eq 'DST006'}"><!--승인 상태일때는 수정 불가 -->
+      <th:block th:if="${userSeq eq ia.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
+        <button type="button" class="btn btn-warning" th:data-iakey="${ia.iaKey}" id="editBtn">수정</button>
+      </th:block>
+    </th:block>
+  </div>
 
 </div>

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanEditModal.html

@@ -30,7 +30,7 @@
       </div>
     </div>
     <hr>
-    <div class="row mb-1"><h6 class="text-center">정보협력자 구성</h6></div>
+    <div class="row mb-1"><h6 class="text-center">■ 정보협력자 구성</h6></div>
     <div class="row mb-1">
     <div class="col-sm-1"></div>
       <label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">*성명</label>

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/operationPlanViewModal.html

@@ -31,7 +31,7 @@
         </th:block>
       </div>
       <hr>
-      <div class="row mb-1"><h6 class="">정보협력자 구성</h6></div>
+      <div class="row mb-1"><h6 class="">■ 정보협력자 구성</h6></div>
       <div class="row text-center">
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">성명:</label>
         <label class="col-sm-3 col-form-label col-form-label-sm text-start" th:text="${op.opName}"></label>

src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html

@@ -71,7 +71,7 @@
     <div class="row mb-1">
       <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">*대상지정<br>사유</label>
       <div class="col-sm-11">
-      	<textarea id="mdReason" name="mdReason" rows="5" cols="139" th:utext="${md.mdReason}"></textarea>
+      	<textarea id="mdReason" name="mdReason" rows="5" cols="108" th:utext="${md.mdReason}"></textarea>
       </div>
     </div>
     <div class="row mb-1">

src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html

@@ -37,7 +37,6 @@
       </div>
       <hr>
       <div class="row mb-1"><h6 class="text-center">모니터링 대상자</h6></div>
-      <br>
       <div class="row">
         <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:text="${md.mdName}"></label>
@@ -111,7 +110,7 @@
             <label class="col-sm-2 col-form-label col-form-label-sm text-center">
                 <th:block th:text="|기타의견: ${apprv.etc}|"></th:block>
             </label>
-            <label class="col-sm-2 col-form-label col-form-label-sm text-center">
+            <label class="col-sm-4 col-form-label col-form-label-sm text-center">
                 <th:block th:text="|결제일시: ${#temporals.format(apprv.saveDt, 'yyyy-MM-dd HH:mm:ss')}|"></th:block>
             </label>