From 4ae6c8085192f64d6150763133641d0fc78240e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Mon, 12 Dec 2022 18:53:35 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EC=88=98=EC=A0=95.=20=EC=B2=A9=EB=B3=B4?=
 =?UTF-8?q?=EC=88=98=EC=A7=91=ED=99=9C=EB=8F=99=20=EB=AA=A8=EB=8B=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EC=9E=91=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../igActivities/fpiMgt/affair/affairMgt.js   |  16 +-
 .../fpiMgt/affair/affairEditModal.html        |  41 +-
 .../igActivities/fpiMgt/affair/affairMgt.html |   2 +-
 .../fpiMgt/affair/affairViewModal.html        | 387 ++++++++----------
 4 files changed, 206 insertions(+), 240 deletions(-)

diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
index d38c6a2d..b6d8272b 100644
--- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
+++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js
@@ -168,23 +168,12 @@ function getAffairEditModal(affairKey){
     success: function(html){
       $("#affairEditModalContent").empty().append(html)
       $("#affairEditModal").modal('show');
-      $("#reportDt, #autoDelete").datepicker({
+      $("#reportDt").datepicker({
         format: "yyyy-mm-dd",
         language: "ko",
         autoclose: true
       });
-      $("#content").summernote({
-        lang:'ko-KR',
-        height: 270,
-        disableDragAndDrop: true,
-        toolbar: [
-          ['style', ['style']],
-          ['font', ['bold', 'underline', 'clear']],
-          ['color', ['color']],
-          ['para', ['ul', 'ol', 'paragraph']],
-          ['table', ['table']]
-        ]
-      });
+      setEditor('editor', '470');
       setUploadDiv();
     },
     error:function(){
@@ -205,6 +194,7 @@ function saveAffair(affairStatus){
       $(".text-decoration-line-through").each(function (idx, el){
         formData.append('fileSeq', $(el).attr("data-fileseq"));
       })
+      formData.append('content', CrossEditor.GetBodyValue());
       $.ajax({
         type : 'POST',
         data : formData,
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
index c4b8bf8d..853c48e8 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
@@ -20,19 +20,25 @@
       <div class="col-sm-2">
         <input type="text" class="form-control form-control-sm" id="wrtUserNm" name="wrtUserNm" th:value="${affair.wrtUserNm}" readonly>
       </div>
+      <label th:for="${accessAuth eq 'ACC003'?'reportDt': ''}" 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" th:id="${accessAuth eq 'ACC003'?'reportDt': ''}" name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
+      </div>
+      <label for="viewStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
+      <div class="col-sm-2">
+        <select class="form-select form-select-sm" id="viewStatus" name="viewStatus">
+          <option value="">선택</option>
+          <th:block th:each="code:${session.commonCode.get('AVS')}">
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.viewStatus}"></option>
+          </th:block>
+        </select>
+      </div>
     </div>
-    <label for="reportDt" 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="reportDt" name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
-    </div>
-    <label for="viewStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
-    <div class="col-sm-2">
-      <select class="form-select form-select-sm" id="viewStatus" name="viewStatus">
-        <option value="">선택</option>
-        <th:block th:each="code:${session.commonCode.get('AVS')}">
-          <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.viewStatus}"></option>
-        </th:block>
-      </select>
+    <div class="row mb-1">
+      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
+      <div class="col-sm-11">
+        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${affair.title}">
+      </div>
     </div>
     <div class="row mb-1">
       <label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">분야1</label>
@@ -73,15 +79,10 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
+      <label for="editor" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
       <div class="col-sm-11">
-        <input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${affair.title}">
-      </div>
-    </div>
-    <div class="row mb-1">
-      <label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
-      <div class="col-sm-11">
-        <textarea id="content" name="content" th:utext="${affair.content}"></textarea>
+        <div id="editor"></div>
+        <textarea id="content" class="d-none" th:utext="${affair.content}"></textarea>
       </div>
     </div>
     <div class="row mb-1">
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
index 606f7080..5f70681e 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
@@ -238,7 +238,6 @@
             </div>
             <div class="row justify-content-between">
               <div class="col-auto">
-                <input type="button" class="btn btn-success" value="등록" id="addAffairBtn" th:unless="${accessAuth eq 'ACC001'}">
               </div>
               <div class="col-auto">
                 <nav aria-label="Page navigation">
@@ -266,6 +265,7 @@
                 </nav>
               </div>
               <div class="col-auto">
+                <input type="button" class="btn btn-success" value="등록" id="addAffairBtn" th:unless="${accessAuth eq 'ACC001'}">
                 <input type="button" class="btn btn-warning" value="결재" id="tableApprvBtn" th:if="${page eq 'stay' and apprvAuth ne null}" th:data-apprvauth="${apprvAuth}">
               </div>
             </div>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
index b0e3c395..da8efcb0 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
@@ -5,239 +5,214 @@
   <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
 </div>
 <div class="modal-body">
-  <div class="row">
-    <div class="col-12">
-      <input type="hidden" name="affairKey" id="viewModalAffairKey" th:value="${affair.affairKey}">
-      <input type="hidden" name="wrtOrgan" th:value="${affair.wrtOrgan}">
-      <input type="hidden" name="affairStatus" id="affairStatus" th:value="${affair.affairStatus}">
+  <input type="hidden" name="affairKey" id="viewModalAffairKey" th:value="${affair.affairKey}">
+  <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>
+    </li>
+    <li class="nav-item" role="presentation" th:if="${#lists.size(affair.fileList)>0}">
+      <button class="nav-link" id="fileTab" data-bs-toggle="tab" data-bs-target="#fileTabPanel" type="button" role="tab" aria-controls="fileTabPanel" aria-selected="false" th:text="${#strings.concat('첨부파일(', #lists.size(affair.fileList), ')')}"></button>
+    </li>
+  </ul>
+  <div class="tab-content bg-white border border-top-0 p-2">
+    <div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
       <div class="row mb-1">
-        <label for="wrtUserNm" 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 border-0" id="wrtUserNm" name="wrtUserNm" th:value="${affair.wrtUserNm}" readonly>
-        </div>
-        <label for="wrtDt" 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 border-0" id="wrtDt" name="wrtDt" th:value="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
-        </div>
-        <label class="col-sm-1 col-form-label col-form-label-sm text-center"></label>
-        <div class="col-sm-2"></div>
-        <label for="affairStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">상태</label>
-        <div class="col-sm-2">
-          <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-            <input type="text" class="form-control form-control-sm border-0" th:if="${commonCode.itemCd eq affair.affairStatus}" th:value="${commonCode.itemValue}" readonly>
+        <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="${affair.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(affair.reportDt, 'yyyy-MM-dd')}"></label>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
+        <th:block th:each="code:${session.commonCode.get('AVS')}">
+          <th:block th:if="${code.itemCd eq affair.viewStatus}">
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
           </th:block>
-        </div>
-      </div>
-      <div class="row mb-1">
-        <label for="reportDt" 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 border-0" id="reportDt" name="reportDt" th:value="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}" readonly>
-        </div>
-        <label for="autoDelete" 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 border-0" id="autoDelete" name="autoDelete" th:value="${#temporals.format(affair.autoDelete, 'yyyy-MM-dd')}" readonly>
-        </div>
-        <label for="viewStatus" class="col-sm-1 col-form-label col-form-label-sm text-center">공개여부</label>
-        <div class="col-sm-2">
-          <th:block th:each="code:${session.commonCode.get('AVS')}">
-            <th:block th:if="${code.itemCd eq affair.viewStatus}">
-              <input type="text" class="form-control form-control-sm border-0" id="viewStatus" th:value="${code.itemValue}" readonly>
-            </th:block>
+        </th:block>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">상태</label>
+        <th:block th:each="code:${session.commonCode.get('DST')}">
+          <th:block th:if="${code.itemCd eq affair.affairStatus}">
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
           </th:block>
-        </div>
-      </div>
-      <div class="row mb-1">
-        <label for="affairType1" class="col-sm-1 col-form-label col-form-label-sm text-center">분야1</label>
-        <div class="col-sm-2">
-          <th:block th:each="code:${session.commonCode.get('DC01')}">
-            <th:block th:if="${code.itemCd eq affair.affairType1}">
-              <input type="text" class="form-control form-control-sm border-0" id="affairType1" th:value="${code.itemValue}" readonly>
-            </th:block>
-          </th:block>
-        </div>
-        <label for="affairType2" class="col-sm-1 col-form-label col-form-label-sm text-center">분야2</label>
-        <div class="col-sm-2">
-          <th:block th:each="code:${session.commonCode.get('DC02')}">
-            <th:block th:if="${code.itemCd eq affair.affairType2}">
-              <input type="text" class="form-control form-control-sm border-0" id="affairType2" th:value="${code.itemValue}" readonly>
-            </th:block>
-          </th:block>
-        </div>
-        <label for="affairType3" class="col-sm-1 col-form-label col-form-label-sm text-center">분야3</label>
-        <div class="col-sm-2">
-          <th:block th:each="code:${session.commonCode.get('DC03')}">
-            <th:block th:if="${code.itemCd eq affair.affairType3}">
-              <input type="text" class="form-control form-control-sm border-0" id="affairType3" th:value="${code.itemValue}" readonly>
-            </th:block>
-          </th:block>
-        </div>
-        <label for="affairType4" class="col-sm-1 col-form-label col-form-label-sm text-center">분야4</label>
-        <div class="col-sm-2">
-          <th:block th:each="code:${session.commonCode.get('DC04')}">
-            <th:block th:if="${code.itemCd eq affair.affairType4}">
-              <input type="text" class="form-control form-control-sm border-0" id="affairType4" th:value="${code.itemValue}" readonly>
-            </th:block>
-          </th:block>
-        </div>
+        </th:block>
       </div>
       <hr>
       <div class="row">
-        <div class="col-8">
-          <div class="row">
-            <label for="title" class="col-sm-2 col-form-label text-center">제목</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control form-control-sm border-0" id="title" name="title" th:value="${affair.title}" readonly>
-            </div>
-          </div>
-          <hr>
-          <div class="row">
-            <label for="contentDiv" class="col-sm-2 col-form-label text-center">내용</label>
-            <div class="col-sm-10" id="contentDiv">
-              <div th:utext="${affair.content}"></div>
-            </div>
-          </div>
-          <hr>
-          <div class="row mb-1">
-            <label for="hashTags" class="col-sm-2 col-form-label text-center">해시태그</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control form-control-sm border-0" id="hashTags" name="hashTags" th:value="${affair.hashTags}" readonly>
-            </div>
-          </div>
-          <div class="row mb-1">
-            <label for="etc" class="col-sm-2 col-form-label text-center">비고</label>
-            <div class="col-sm-10">
-              <input type="text" class="form-control form-control-sm border-0" id="etc" name="etc" th:value="${affair.etc}" readonly>
-            </div>
-          </div>
-        </div>
-        <div class="col-4">
-          <table class="table">
-            <thead>
-            <tr>
-              <th>파일명</th>
-              <th>사이즈</th>
-            </tr>
-            </thead>
-            <tbody>
-            <th:block th:if="${#lists.isEmpty(affair.fileList)}">
-              <tr>
-                <td colspan="2">파일이 없습니다.</td>
-              </tr>
-            </th:block>
-            <th:block th:unless="${#lists.isEmpty(affair.fileList)}">
-              <th:block th:each="file:${affair.fileList}">
-                <tr class="fileInfoTr">
-                  <td><a href="#" class="fileDownLink" data-board="affair"
-                         th:data-parentkey="${file.affairKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
-                  <td th:text="${file.fileSize}"></td>
-                </tr>
-              </th:block>
-            </th:block>
-            </tbody>
-          </table>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
+        <label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${affair.title}"></label>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">분야1</label>
+        <th:block th:each="code:${session.commonCode.get('DC01')}">
+          <th:block th:if="${code.itemCd eq affair.affairType1}">
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
+          </th:block>
+        </th:block>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">분야2</label>
+        <th:block th:each="code:${session.commonCode.get('DC02')}">
+          <th:block th:if="${code.itemCd eq affair.affairType2}">
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
+          </th:block>
+        </th:block>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">분야3</label>
+        <th:block th:each="code:${session.commonCode.get('DC03')}">
+          <th:block th:if="${code.itemCd eq affair.affairType3}">
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
+          </th:block>
+        </th:block>
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">분야4</label>
+        <th:block th:each="code:${session.commonCode.get('DC04')}">
+          <th:block th:if="${code.itemCd eq affair.affairType4}">
+            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${code.itemValue}"></label>
+          </th:block>
+        </th:block>
+      </div>
+      <hr>
+      <div class="row">
+        <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 th:utext="${affair.content}"></div>
         </div>
       </div>
-      <th:block th:unless="${#lists.isEmpty(affair.rateList)}">
+      <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-11 col-form-label col-form-label-sm text-start" th:text="${affair.hashTags}"></label>
+      </div>
+      <div class="row mb-1">
+        <label class="col-sm-1 col-form-label col-form-label-sm text-center">비고</label>
+        <label class="col-sm-11 col-form-label col-form-label-sm text-start" th:text="${affair.etc}"></label>
+      </div>
+    </div>
+    <div class="tab-pane fade p-2" id="fileTabPanel" role="tabpanel" tabindex="0">
+      <table class="table">
+        <thead>
+        <tr>
+          <th>파일명</th>
+          <th>사이즈</th>
+        </tr>
+        </thead>
+        <tbody>
+        <th:block th:if="${#lists.isEmpty(affair.fileList)}">
+          <tr>
+            <td colspan="2">파일이 없습니다.</td>
+          </tr>
+        </th:block>
+        <th:block th:unless="${#lists.isEmpty(affair.fileList)}">
+          <th:block th:each="file:${affair.fileList}">
+            <tr class="fileInfoTr">
+              <td><a href="#" class="fileDownLink" data-board="affair"
+                     th:data-parentkey="${file.affairKey}" th:data-fileseq="${file.fileSeq}" th:text="|${file.origNm}.${file.fileExtn}|"></a></td>
+              <td th:text="${file.fileSize}"></td>
+            </tr>
+          </th:block>
+        </th:block>
+        </tbody>
+      </table>
+    </div>
+    <div class="row">
+      <div class="col-12" th:unless="${#lists.isEmpty(affair.rateList)}">
         <hr>
         <th:block th:each="rate:${affair.rateList}">
           <div class="row py-1">
-            <div class="col-auto">
-              <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                <p th:if="${commonCode.itemCd eq rate.ratingOrgan}" th:text="${commonCode.itemValue}"></p>
+            <label class="col-sm-1 col-form-label col-form-label-sm text-center">
+              <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>
-            </div>
+            </label>
             <div class="col-auto">
               <div class="row" th:if="${rate.sectionApprv eq null}">
-                <div class="col-auto">
-                  <p>결재정보가 없습니다.</p>
-                </div>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재정보가 없습니다.</label>
               </div>
               <div class="row" th:if="${rate.sectionApprv ne null}">
-                <div class="col-auto">
-                  <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                    <span th:if="${commonCode.itemCd eq rate.sectionApprv}" th:text="|결재결과: ${commonCode.itemValue}|"></span>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재결과: </label>
+                <label class="col-sm-auto 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.sectionApprv}" th:text="${code.itemValue}"></th:block>
                   </th:block>
-                  <span th:text="|결재자: ${rate.sectionNm}|"></span>
-                </div>
-                <div class="col-auto">
-                  <span th:text="|결재일시: ${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}|"></span>
-                </div>
-                <div class="col-12">
-                  <span th:text="|기타의견: ${rate.sectionEtc eq null?'':rate.sectionEtc}|"></span>
-                </div>
+                </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재자: </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.sectionNm}"></label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재일시: </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.sectionApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
+              </div>
+              <div class="row" th:if="${rate.sectionApprv ne null and !#strings.isEmpty(rate.sectionEtc)}">
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">기타의견: </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.sectionEtc}"></label>
               </div>
               <div class="row" th:if="${rate.headApprv ne null}">
-                <div class="col-auto" th:data-headapprv="${rate.headApprv}">
-                  <th:block th:if="${rate.headApprv eq 'DST006'}">
-                    <th:block th:each="commonCode:${session.commonCode.get('AAR')}">
-                      <span th:if="${commonCode.itemCd eq rate.affairRate}" th:text="|견문평가: ${commonCode.itemValue} ${rate.organUp eq 'T'?'(상보)':''}|"></span>
+                <th:block th:if="${rate.headApprv eq 'DST006'}">
+                  <label class="col-sm-auto col-form-label col-form-label-sm text-center">견문평가: </label>
+                  <label class="col-sm-auto 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 th:if="${rate.headApprv eq 'DST005'}">
+                  <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재결과: </label>
+                  <label class="col-sm-auto 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>
-                  <th:block th:if="${rate.headApprv eq 'DST005'}">
-                    <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                      <span th:if="${commonCode.itemCd eq rate.headApprv}" th:text="|결재결과: ${commonCode.itemValue}|"></span>
-                    </th:block>
-                  </th:block>
-                  <span th:text="|결재자: ${rate.headNm}|"></span>
-                </div>
-                <div class="col-auto">
-                  <span th:text="|결재일시: ${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}|"></span>
-                </div>
-                <div class="col-12">
-                  <span th:text="|기타의견: ${rate.headEtc eq null?'':rate.headEtc}|"></span>
-                </div>
+                  </label>
+                </th:block>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재자: </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.headNm}"></label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">결재일시: </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${#temporals.format(rate.headApprvDt, 'yyyy-MM-dd HH:mm:ss')}"></label>
+              </div>
+              <div class="row" th:if="${rate.headApprv ne null and !#strings.isEmpty(rate.headEtc)}">
+                <label class="col-sm-auto col-form-label col-form-label-sm text-center">기타의견: </label>
+                <label class="col-sm-auto col-form-label col-form-label-sm text-start" th:text="${rate.headEtc}"></label>
               </div>
             </div>
           </div>
         </th:block>
-      </th:block>
-    </div>
-    <div class="col-12" th:if="${apprvAuth ne null}">
-      <form action="#" method="post" id="apprvForm">
-        <input type="hidden" name="affairKey" th:value="${affair.affairKey}">
-        <th:block th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and affair.affairStatus eq 'DST002'}">
-          <input type="hidden" name="sectionApprv" id="sectionApprv">
-          <div class="row">
-            <div class="col-10">
-              <input type="text" class="form-control form-control-sm etc" name="sectionEtc" placeholder="추가의견, 반려사유 기입">
-              <input type="text" class="d-none" id="submitPrevention">
+      </div>
+      <div class="col-12" th:if="${apprvAuth ne null}">
+        <form action="#" method="post" id="apprvForm">
+          <input type="hidden" name="affairKey" th:value="${affair.affairKey}">
+          <th:block th:if="${(apprvAuth eq 'APC003' or apprvAuth eq 'APC004') and affair.affairStatus eq 'DST002' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
+            <input type="hidden" name="sectionApprv" id="sectionApprv">
+            <div class="row">
+              <div class="col-10">
+                <input type="text" class="form-control form-control-sm etc" name="sectionEtc" placeholder="추가의견, 반려사유 기입">
+                <input type="text" class="d-none" id="submitPrevention">
+              </div>
+              <div class="col-auto">
+                <input type="button" class="btn btn-sm btn-success apprvBtn" 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="반려">
+              </div>
             </div>
-            <div class="col-auto">
-              <input type="button" class="btn btn-sm btn-success apprvBtn" data-apprvtype="section" data-affairstate="DST004" value="승인">
+          </th:block>
+          <th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and affair.affairStatus eq 'DST004' and affair.rateList.get(0).ratingOrgan eq userOrgan}">
+            <input type="hidden" name="headApprv" id="headApprv">
+            <div class="row">
+              <div class="col-8">
+                <input type="text" class="form-control form-control-sm etc" name="headEtc" placeholder="추가의견, 반려사유 기입">
+                <input type="text" class="d-none" id="submitPrevention">
+              </div>
+              <div class="col-auto">
+                <select class="form-select form-select-sm" name="affairRate" id="affairRate">
+                  <option value="">견문평가</option>
+                  <th:block th:each="ratingCode:${ratingCodeList}">
+                    <option th:value="${ratingCode.itemCd}" th:text="${ratingCode.itemValue}"></option>
+                  </th:block>
+                </select>
+              </div>
+              <div class="col-auto" th:unless="${userOrgan eq 'OG001'}">
+                <label for="organUp" class="form-check-label">상보여부</label>
+                <input type="checkbox" id="organUp" name="organUp" value="T">
+              </div>
+              <div class="col-auto">
+                <input type="button" class="btn btn-sm btn-success apprvBtn" 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="반려">
+              </div>
             </div>
-            <div class="col-auto">
-              <input type="button" class="btn btn-sm btn-danger apprvBtn" data-apprvtype="section" data-affairstate="DST003" value="반려">
-            </div>
-          </div>
-        </th:block>
-        <th:block th:if="${(apprvAuth eq 'APC001' or apprvAuth eq 'APC002') and affair.affairStatus eq 'DST004'}">
-          <input type="hidden" name="headApprv" id="headApprv">
-          <div class="row">
-            <div class="col-8">
-              <input type="text" class="form-control form-control-sm etc" name="headEtc" placeholder="추가의견, 반려사유 기입">
-              <input type="text" class="d-none" id="submitPrevention">
-            </div>
-            <div class="col-auto">
-              <select class="form-select form-select-sm" name="affairRate" id="affairRate">
-                <option value="">견문평가</option>
-                <th:block th:each="ratingCode:${ratingCodeList}">
-                  <option th:value="${ratingCode.itemCd}" th:text="${ratingCode.itemValue}"></option>
-                </th:block>
-              </select>
-            </div>
-            <div class="col-auto" th:unless="${userOrgan eq 'OG001'}">
-              <label for="organUp" class="form-check-label">상보여부</label>
-              <input type="checkbox" id="organUp" name="organUp" value="T">
-            </div>
-            <div class="col-auto">
-              <input type="button" class="btn btn-sm btn-success apprvBtn" 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="반려">
-            </div>
-          </div>
-        </th:block>
-      </form>
+          </th:block>
+        </form>
+      </div>
     </div>
   </div>
 </div>