From 6d488684f17e04f2070e0913030816357bf877bc Mon Sep 17 00:00:00 2001
From: TaehunPark <qkrxogns21@gmail.com>
Date: Fri, 4 Nov 2022 16:34:38 +0900
Subject: [PATCH] =?UTF-8?q?fix:=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mybatisMapper/EquipMapper.xml   | 14 +++++++-
 src/main/resources/static/css/common.css      |  3 ++
 src/main/resources/static/js/equip/equip.js   |  7 ++--
 .../templates/equip/cellPhoneEditModal.html   | 26 ++++++--------
 .../templates/equip/cellPhoneList.html        | 23 ++++++------
 .../templates/equip/equipEditModal.html       |  4 ++-
 .../resources/templates/equip/equipList.html  |  5 +--
 .../templates/equip/equipLogList.html         |  2 +-
 .../templates/equip/equipModifyModal.html     | 16 +++++----
 .../templates/equip/equipStatus.html          | 14 ++++----
 .../templates/equip/pvreUseList.html          | 10 ++++--
 .../resources/templates/equip/qirUseList.html | 10 ++++--
 .../templates/equip/useEditModal.html         | 25 ++++++-------
 .../resources/templates/equip/useHistory.html | 36 +++++++++----------
 .../templates/equip/useModifyModal.html       | 25 ++++++-------
 15 files changed, 123 insertions(+), 97 deletions(-)

diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml
index 50881d1f..02080c29 100644
--- a/src/main/resources/mybatisMapper/EquipMapper.xml
+++ b/src/main/resources/mybatisMapper/EquipMapper.xml
@@ -17,6 +17,7 @@
 					  cnt_pyeongtaek+
 					  cnt_taean+
 					  cnt_boryeong+
+					  cnt_seotd+
 					  cnt_west+
 					  cnt_mokpo+
 					  cnt_buan+
@@ -29,6 +30,7 @@
 					  cnt_changwon+
 					  cnt_tongyong+
 					  cnt_sacheon+
+					  cnt_jungtd+
 					  cnt_east+
 					  cnt_sokcho+
 					  cnt_donghe+
@@ -43,6 +45,7 @@
 			   sum(cnt_pyeongtaek) as cnt_pyeongtaek,
 			   sum(cnt_taean) as cnt_taean,
 			   sum(cnt_boryeong) as cnt_boryeong,
+			   sum(cnt_seotd) as cnt_seotd,
 			   sum(cnt_west) as cnt_west,
 			   sum(cnt_mokpo) as cnt_mokpo,
 			   sum(cnt_buan) as cnt_buan,
@@ -55,6 +58,7 @@
 			   sum(cnt_changwon) as cnt_changwon,
 			   sum(cnt_tongyong) as cnt_tongyong,
 			   sum(cnt_sacheon) as cnt_sacheon,
+			   sum(cnt_jungtd) as cnt_jungtd,
 			   sum(cnt_east) as cnt_east,
 			   sum(cnt_sokcho) as cnt_sokcho,
 			   sum(cnt_donghe) as cnt_donghe,
@@ -171,7 +175,15 @@
 									    case 
 									   	  when b.mgt_organ = 'OG026' then b.item_qty
 									   	  else 0
-									   end as cnt_seoguipo
+									   end as cnt_seoguipo,
+									   case 
+									   	  when b.mgt_organ = 'OG027' then b.item_qty
+									   	  else 0
+									   end as cnt_seotd,
+									   case 
+									   	  when b.mgt_organ = 'OG028' then b.item_qty
+									   	  else 0
+									   end as cnt_jungtd
 								from (select category_cd,
 											   item_cd,
 											   item_value
diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css
index 1b428011..4f83a0bc 100644
--- a/src/main/resources/static/css/common.css
+++ b/src/main/resources/static/css/common.css
@@ -84,6 +84,9 @@
 .pl-15{
   padding-left: 15%;
 }
+.pl-23{
+  padding-left: 23%;
+}
 .display-none{
 	display:none
 }
\ No newline at end of file
diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js
index 6795c905..36c30aff 100644
--- a/src/main/resources/static/js/equip/equip.js
+++ b/src/main/resources/static/js/equip/equip.js
@@ -1,5 +1,4 @@
 
-
 $(document).ready(function(){
 	$(".table_id").each(function(){
 		var rows = $(".table_id:contains('"+$(this).text()+"')");
@@ -12,8 +11,6 @@ $(document).ready(function(){
 	
 });
 	
-
-
 $(document).on('click', '#addEquip', function (){
    $.ajax({
     url: '/equip/equipEditModal',
@@ -120,7 +117,7 @@ function showUpdateModal(equKey){
 		    type: 'GET',
 		    dataType:"html",
 		    success: function(html){
-		      $("#configEqu").empty().append(html)
+		      $("#equipEditModalContent").empty().append(html)
 		      $("#equipModifyModal").modal('show');
 		      $(".mStoredYear").datepicker({
 						 minViewMode: 'years',
@@ -136,6 +133,7 @@ function showUpdateModal(equKey){
 
 $(document).on('click', '#addImgBtn', function (){
 	$("#imgUpload").remove();
+	$("#addImgBtn").hide();
 	$("#imgUpdate").show();
  
 })
@@ -144,6 +142,7 @@ function deleteImg(equKey,versionNo){
 	$('#equipModifyForm').append('<input type="hidden" name="deleteFileKey" value="'+equKey+'">',
 								 '<input type="hidden" name="deleteFileVnum" value="'+versionNo+'">');
 	$("#imgUpload").remove();
+	$("#deleteImgBtn").hide();
 	$("#imgUpdate").show();
 }
 
diff --git a/src/main/resources/templates/equip/cellPhoneEditModal.html b/src/main/resources/templates/equip/cellPhoneEditModal.html
index d9f1bc62..729d936f 100644
--- a/src/main/resources/templates/equip/cellPhoneEditModal.html
+++ b/src/main/resources/templates/equip/cellPhoneEditModal.html
@@ -85,22 +85,16 @@
 </div>
 <div class="modal-footer justify-content-between">
 	<div class="col-auto">
-		<th:block th:if="${info.phoneKey eq null}">
-			<button type="button" class="btn btn-secondary"
-				data-bs-dismiss="modal">닫기</button>
-		</th:block>
-		<th:block th:unless="${info.phoneKey eq null}">
-			<button type="button" class="btn btn-secondary" id="btn-close"
-				data-bs-dismiss="modal">닫기</button>
-		</th:block>
-		<button type="button" class="btn btn-primary" id="saveCellPhone"
-			th:if="${info.phoneKey eq null}">저장</button>
-		<th:block th:if="${info.phoneKey != null}">
-		<button type="button" class="btn btn-warning" id="updateCellPhone"
-			th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
-		<button type="button" class="btn btn-danger" id="deleteCellPhoneM"
-			th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제</button>
-		</th:block>
+		<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+	<th:block th:if="${info.phoneKey != null}">
+		<button type="button" class="btn btn-danger" id="deleteCellPhoneM"th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">삭제</button>
+	</th:block>
+	</div>
+	<div class="col-auto">
+		<button type="button" class="btn btn-primary" id="saveCellPhone" th:if="${info.phoneKey eq null}">저장</button>
+	<th:block th:if="${info.phoneKey != null}">
+		<button type="button" class="btn btn-warning" id="updateCellPhone" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>	
+	</th:block>
 	</div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/equip/cellPhoneList.html b/src/main/resources/templates/equip/cellPhoneList.html
index 753330fc..d827c42e 100644
--- a/src/main/resources/templates/equip/cellPhoneList.html
+++ b/src/main/resources/templates/equip/cellPhoneList.html
@@ -26,16 +26,19 @@
               </div>
               <div class="col-auto">
                 <div class="row justify-content-end">
-                  <div class="col-auto">
-                    <input type="text" class="form-control form-control-sm">
-                  </div>
-                  <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                  <input type="submit" class="btn btn-sm btn-primary col-auto display-none" id="searchBtn" value="검색">
                 </div>
               </div>
             </div>
           </form>
-          <button data-bs-toggle="modal" data-bs-target="#webexModal" >웹엑스 접속방법</button>
-          <button id="goExcel">엑셀다운</button>
+          <div class="row justify-content-between pe-3 py-1">
+	          <div class="col-auto">
+	          	<button data-bs-toggle="modal" class="btn btn-success" data-bs-target="#webexModal" >웹엑스 접속방법</button>
+	          </div>
+	          <div class="col-auto">
+	          	<button class="btn btn-success" id="goExcel">엑셀다운</button>
+	          </div>
+          </div>
           <div class="row justify-content-start">
             <div class="col-12">
               <div class="card">
@@ -101,7 +104,7 @@
                       </nav>
                     </div>
                     <div class="col-auto">
-	                    <button type="button" class="btn btn-success"id="addCellPhone" th:unless="${accessAuth eq 'ACC001'}">등록</button>
+	                    <button type="button" class="btn btn-primary"id="addCellPhone" th:unless="${accessAuth eq 'ACC001'}">등록</button>
                   	</div>
                   </div>
                 </div>
@@ -129,16 +132,16 @@
 	<div class="modal fade" id="webexModal" data-bs-backdrop="static"
 		data-bs-keyboard="false" tabindex="-1"
 		aria-labelledby="userInsertModalLabel" aria-hidden="true">
-		<div class="modal-dialog modal-lg">
+		<div class="modal-dialog modal-lg pt-5">
 			<div class="modal-content ">
 				<div class="modal-header">
 					<h5 class="modal-title" id="translatorInsertModalLabel">웹엑스 접속방법</h5>
 					<button type="button" class="btn-close" data-bs-dismiss="modal"
 						aria-label="Close"></button>
 				</div>
-				<div class="col-auto">
+				<div class="col-auto pt-5 py-5">
 				<div class="text-center">
-					<h6>Cisco WebEx Meeting 설치 > 회원가입 > 미팅에 참여 클릭 > 미팅번호 입력</h6>
+					<h5>Cisco WebEx Meeting 설치 > 회원가입 > 미팅에 참여 클릭 > 미팅번호 입력</h5>
 				</div>
 				</div>
 			</div>
diff --git a/src/main/resources/templates/equip/equipEditModal.html b/src/main/resources/templates/equip/equipEditModal.html
index 5688a163..c193ccaf 100644
--- a/src/main/resources/templates/equip/equipEditModal.html
+++ b/src/main/resources/templates/equip/equipEditModal.html
@@ -79,7 +79,9 @@
 </div>
 <div class="modal-footer justify-content-between">
   <div class="col-auto">
-    <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 class="col-auto">
     <button type="button" class="btn btn-primary" id="saveEquip">저장</button>
   </div>
 </div>
diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html
index c0d1289f..8a21a49a 100644
--- a/src/main/resources/templates/equip/equipList.html
+++ b/src/main/resources/templates/equip/equipList.html
@@ -26,10 +26,7 @@
               </div>
               <div class="col-auto">
                 <div class="row justify-content-end">
-                  <div class="col-auto">
-                    <input type="text" class="form-control form-control-sm">
-                  </div>
-                  <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                  <input type="submit" class="btn btn-sm btn-primary col-auto display-none" id="searchBtn" value="검색">
                 </div>
               </div>
             </div>
diff --git a/src/main/resources/templates/equip/equipLogList.html b/src/main/resources/templates/equip/equipLogList.html
index 2d9f98e0..cb03ade1 100644
--- a/src/main/resources/templates/equip/equipLogList.html
+++ b/src/main/resources/templates/equip/equipLogList.html
@@ -34,7 +34,7 @@
               </div>
               <div class="col-auto">
                 <div class="row justify-content-end">
-                  <input type="submit" class="btn btn-sm btn-primary col-auto" id="searchBtn" value="검색">
+                  <input type="submit" class="btn btn-sm btn-primary col-auto display-none" id="searchBtn" value="검색">
                 </div>
               </div>
             </div>
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html
index c31ef417..986fc4de 100644
--- a/src/main/resources/templates/equip/equipModifyModal.html
+++ b/src/main/resources/templates/equip/equipModifyModal.html
@@ -72,27 +72,31 @@
         <input type="text" class="form-control" name="note" th:value="${equInfo.note}">
       </div>
     </div>
-    <div class="row mb-3">
+    <div class="row mb-2">
       <label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">장비사진</label>
       <div class="col-sm-6">
       	<div id="imgUpload">
 	        <input type="text" name="noUpdateImg" class="form-control" th:value="${equInfo.origNm}" readonly th:if="${not #strings.isEmpty(equInfo.origNm)}">
-	        <input type="button" id="deleteImgBtn" value="삭제" th:if="${not #strings.isEmpty(equInfo.origNm)}" th:attr="onclick=|deleteImg('${equInfo.equKey}','${equInfo.versionNo}')|">
 	        <input type="text" class="form-control" value="등록된 사진이 없습니다." readonly th:if="${#strings.isEmpty(equInfo.origNm)}">
-	        <input type="button" id="addImgBtn" value="추가" th:if="${#strings.isEmpty(equInfo.origNm)}">
-        </div>
+        </div>       
       	<div id="imgUpdate" style="display:none">
         	<input type="file" class="form-control" name="file" accept="image/gif,image/jpeg,image/png">
         </div>
       </div>
+      <div class="col-sm-1">	       
+	        <input type="button" class="btn btn-danger" id="deleteImgBtn" value="X" th:if="${not #strings.isEmpty(equInfo.origNm)}" th:attr="onclick=|deleteImg('${equInfo.equKey}','${equInfo.versionNo}')|">
+	        <input type="button" class="btn btn-primary" id="addImgBtn" value="+" th:if="${#strings.isEmpty(equInfo.origNm)}">
+	  </div>
     </div>
   </form>
 </div>
 <div class="modal-footer justify-content-between">
   <div class="col-auto">
-    <button type="button" class="btn btn-secondary" id="btn-close" data-bs-dismiss="modal">닫기</button>
+  	<button type="button" class="btn btn-secondary" id="btn-close" data-bs-dismiss="modal">닫기</button>
+ 	<button type="button" class="btn btn-danger" id="deleteEquip" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">삭제</button>
+  </div>
+  <div class="col-auto">
     <button type="button" class="btn btn-warning" id="updateEquip" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">수정</button>
-  	<button type="button" class="btn btn-danger" id="deleteEquip" th:if="${accessAuth eq 'ACC003'} or ${wrtUserSeq eq userSeq}">삭제</button>
   </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/equip/equipStatus.html b/src/main/resources/templates/equip/equipStatus.html
index a1bc652d..a0f53ab1 100644
--- a/src/main/resources/templates/equip/equipStatus.html
+++ b/src/main/resources/templates/equip/equipStatus.html
@@ -23,7 +23,7 @@
         <div class="card-body">
           <form method="get" th:action="@{/userMgt/userMgtPage}">
           <input type="hidden" name="userStatus" id="userStatus" >
-            <div class="row justify-content-between pe-3 py-1">
+            <div class="row justify-content-end pe-3 py-1">
               <div class="col-auto">
               <input type="button" class="btn btn-success" id="statusExcel" value="엑셀다운">
                 <div class="row justify-content-end">
@@ -39,14 +39,13 @@
                     <table class="table table-hover table-bordered">
                       <thead>
                       <tr>
-                      	<th rowspan="2">연번</th>
                         <th rowspan="2">분류</th>
                         <th rowspan="2">세부분류</th>
                         <th rowspan="2">총계</th>
                         <th rowspan="2">본청</th>                    
-                      	<th colspan="5">중부</th>
-                      	<th colspan="7">서해</th>
-                      	<th colspan="6">남해</th>
+                      	<th colspan="6">중부</th>
+                      	<th colspan="6">서해</th>
+                      	<th colspan="7">남해</th>
                       	<th colspan="5">동해</th>
                       	<th colspan="3">제주</th>
                       </tr>
@@ -56,6 +55,7 @@
                         <th>평택서</th>
                         <th>태안서</th>
                         <th>보령서</th>
+                        <th>서특단</th>
                         <th>청</th>
                         <th>목포서</th>
                         <th>부안서</th>
@@ -68,6 +68,7 @@
                         <th>창원서</th>
                         <th>통영서</th>
                         <th>사천서</th>
+                        <th>중특단</th>
                         <th>청</th>
                         <th>속초서</th>
                         <th>동해서</th>
@@ -80,7 +81,6 @@
                       </thead>
                       <tbody class="table-group-divider">
                       <tr class="" th:each="equip,index:${equipList}">
-	                      <td th:text="${index.index+1}"></td> 
 	                      <td class="table_id" th:text="${equip.equ_type}"></td>
 	                      <td th:text="${equip.item_value}" style="color: blue;  cursor:pointer;" th:onclick="|location.href='@{/equip/List(detailType=${equip.item_cd})}'|"></td>
 	                      <td th:text="${equip.total}"></td>
@@ -90,6 +90,7 @@
 	                      <td th:text="${equip.cnt_pyeongtaek}"></td>
 	                      <td th:text="${equip.cnt_taean}"></td>
 	                      <td th:text="${equip.cnt_boryeong}"></td>
+	                      <td th:text="${equip.cnt_seotd}"></td>
 	                      <td th:text="${equip.cnt_west}"></td>
 	                      <td th:text="${equip.cnt_mokpo}"></td>
 	                      <td th:text="${equip.cnt_buan}"></td>
@@ -102,6 +103,7 @@
 	                      <td th:text="${equip.cnt_changwon}"></td>
 	                      <td th:text="${equip.cnt_tongyong}"></td>
 	                      <td th:text="${equip.cnt_sacheon}"></td>
+	                      <td th:text="${equip.cnt_jungtd}"></td>
 	                      <td th:text="${equip.cnt_east}"></td>
 	                      <td th:text="${equip.cnt_sokcho}"></td>
 	                      <td th:text="${equip.cnt_donghe}"></td>
diff --git a/src/main/resources/templates/equip/pvreUseList.html b/src/main/resources/templates/equip/pvreUseList.html
index dbbb9151..921aa48e 100644
--- a/src/main/resources/templates/equip/pvreUseList.html
+++ b/src/main/resources/templates/equip/pvreUseList.html
@@ -14,7 +14,7 @@
       <div class="col-12 card text-center">
         <div class="card-body">
           <form id="searchFm" method="get" th:action="@{/equip/pvreUseList}">
-          	<input type="hidden" name="excel">
+          <input type="hidden" name="excel">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-between pe-3 py-1">
               <div class="col-auto">
@@ -24,6 +24,11 @@
                   </th:block>
                 </select>
               </div>
+              <div class="col-auto">
+              <button type="button" class="btn btn-success" id="goExcel">엑셀다운</button>
+              </div>
+            </div>
+            <div class="row justify-content-end pe-3 py-1">
               <div class="col-auto">
                   <div class="row justify-content-end">
                     <div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
@@ -60,8 +65,7 @@
                   </div>
                 </div>
             </div>
-          </form>
-          <button id="goExcel">엑셀다운</button>
+          </form>        
           <div class="row justify-content-start">
             <div class="col-12">
               <div class="card">
diff --git a/src/main/resources/templates/equip/qirUseList.html b/src/main/resources/templates/equip/qirUseList.html
index 9145fc74..9f6af868 100644
--- a/src/main/resources/templates/equip/qirUseList.html
+++ b/src/main/resources/templates/equip/qirUseList.html
@@ -24,6 +24,11 @@
                   </th:block>
                 </select>
               </div>
+              <div class="col-auto">
+              <button type="button" class="btn btn-success" id="goExcel">엑셀다운</button>
+              </div>
+            </div>
+            <div class="row justify-content-end pe-3 py-1">
               <div class="col-auto">
                   <div class="row justify-content-end">
                     <div class="col-auto" th:if="${accessAuth eq 'ACC003'}">
@@ -60,8 +65,7 @@
                   </div>
                 </div>
             </div>
-          </form>
-          <button id="goExcel">엑셀다운</button>
+          </form>         
           <div class="row justify-content-start">
             <div class="col-12">
               <div class="card">
@@ -126,7 +130,7 @@
                     </div>
                     <div class="col-auto">
                     <button type="button" class="btn btn-success"id="historyBtn">수정이력</button>
-                    <button type="button" class="btn btn-success"id="addQir" th:unless="${accessAuth eq 'ACC001'}">등록</button>
+                    <button type="button" class="btn btn-primary"id="addQir" th:unless="${accessAuth eq 'ACC001'}">등록</button>
                   </div>
                   </div>
                 </div>
diff --git a/src/main/resources/templates/equip/useEditModal.html b/src/main/resources/templates/equip/useEditModal.html
index ce7a03d6..3d37b623 100644
--- a/src/main/resources/templates/equip/useEditModal.html
+++ b/src/main/resources/templates/equip/useEditModal.html
@@ -11,14 +11,14 @@
   	<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 
 </div>
-<div class="modal-body">
+<div class="modal-body pl-23">
   <form id="useFm" method="post">
         <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
    		<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     	<input type="hidden" name="useType" th:value="${useType}">
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용관서</label>        
-            <div class="col-sm-3">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용관서</label>        
+            <div class="col-sm-5">
             	<select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
                   <option value="">선택</option>
                   <th:block th:each="organList:${organList}">
@@ -28,14 +28,14 @@
             </div>
           </div>        
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용일시</label>
-            <div class="col-sm-4">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용일시</label>
+            <div class="col-sm-5">
                   <input type="text" class="form-control" id="useDt" name="useDt" readonly>
             </div>
           </div> 
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용사유</label>        
-            <div class="col-sm-3">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용사유</label>        
+            <div class="col-sm-5">
                <select class="form-select form-select-sm" id="detailType" name="detailType">
                   <option value="">선택</option>
                   <th:block th:if="${useType eq 'PVRE'}">
@@ -53,14 +53,14 @@
             </div>
           </div>
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용인원</label>
-            <div class="col-sm-4">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용인원</label>
+            <div class="col-sm-5">
                   <input type="number" class="form-control" id="peopleCnt" name="peopleCnt">
             </div>
           </div> 
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">비고</label>
-            <div class="col-sm-4">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">비고</label>
+            <div class="col-sm-5">
                   <input type="text" class="form-control" id="description" name="description">
             </div>
           </div>                  
@@ -69,8 +69,9 @@
 <div class="modal-footer justify-content-between">
   <div class="col-auto">
     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+  </div>
+  <div class="col-auto">
     <button type="button" class="btn btn-primary" id="saveUse">저장</button>
-
   </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/equip/useHistory.html b/src/main/resources/templates/equip/useHistory.html
index 6ca32d45..9570051f 100644
--- a/src/main/resources/templates/equip/useHistory.html
+++ b/src/main/resources/templates/equip/useHistory.html
@@ -12,7 +12,7 @@
           <div class="row">
           </div>
           <div class="row justify-content-start">
-            <div class="col-4">
+            <div class="col-6">
               <div class="card">
                 <div class="card-body">
                   <div class="row">
@@ -38,37 +38,37 @@
                 </div>
               </div>
             </div>
-            <div class="col-8" id="valueDiv">
+            <div class="col-6" id="valueDiv">
             <div class="row mb-3">
-		      <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">사용관서</label>
-		      <div class="col-sm-6">
-		        <input type="text" id="vSosok" disabled>
+		      <label for="cat1Cd" class="col-sm-3 col-form-label col-form-label-sm text-center">사용관서</label>
+		      <div class="col-sm-8">
+		        <input type="text" class="form-control" id="vSosok" disabled>
 		      </div>
 		    </div>
            <div class="row mb-3">
-		      <label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">사용일시</label>
-		      <div class="col-sm-6">
-		        <input type="text" id="vUseDt" disabled>
+		      <label for="cat1Cd" class="col-sm-3 col-form-label col-form-label-sm text-center">사용일시</label>
+		      <div class="col-sm-8">
+		        <input type="text" class="form-control" id="vUseDt" disabled>
 		      </div>
 		    </div>
 		    <div class="row mb-3">
-		      <label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">사용사유</label>
-		      <div class="col-sm-6">
-		        <input type="text" id="vDetailType" disabled>
-		        <input type="text" id="vDetailSelf" disabled>
+		      <label for="cat2Cd" class="col-sm-3 col-form-label col-form-label-sm text-center">사용사유</label>
+		      <div class="col-sm-8">
+		        <input type="text" class="form-control" id="vDetailType" disabled>
+		        <input type="text" class="form-control" id="vDetailSelf" disabled>
 		      </div>	
 		    </div>
 		    <div class="row mb-3">
-		      <label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">사용인원</label>
-		      <div class="col-sm-6">
-		        <input type="text" id="vCnt" disabled>
+		      <label for="cat3Cd" class="col-sm-3 col-form-label col-form-label-sm text-center">사용인원</label>
+		      <div class="col-sm-8">
+		        <input type="text" class="form-control" id="vCnt" disabled>
 		      </div>
 		    </div>
 
 		    <div class="row mb-3">
-		      <label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
-		      <div class="col-sm-6">
-		        <input type="text" id="vDescription" disabled>
+		      <label for="cat3Cd" class="col-sm-3 col-form-label col-form-label-sm text-center">비고</label>
+		      <div class="col-sm-8">
+		        <input type="text" class="form-control" id="vDescription" disabled>
 		      </div>
 		    </div>
             </div> 
diff --git a/src/main/resources/templates/equip/useModifyModal.html b/src/main/resources/templates/equip/useModifyModal.html
index c94b4b3f..9cd83ff6 100644
--- a/src/main/resources/templates/equip/useModifyModal.html
+++ b/src/main/resources/templates/equip/useModifyModal.html
@@ -11,7 +11,7 @@
   	<button type="button" class="btn-close" id="closeModal" data-bs-dismiss="modal" aria-label="Close"></button>
 
 </div>
-<div class="modal-body">
+<div class="modal-body pl-23">
   <form id="useUpdateFm" method="post">
         <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
    		<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
@@ -19,8 +19,8 @@
     	<input type="hidden" name="useType" th:value="${info.useType}">
     	<input type="hidden" name="versionNo" th:value="${info.versionNo}">
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용관서</label>        
-            <div class="col-sm-3">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용관서</label>        
+            <div class="col-sm-5">
             	<select class="form-select form-select-sm" id="mMgtOrgan" name="mgtOrgan" disabled>
                   <option value="">선택</option>
                   <th:block th:each="organList:${organList}">
@@ -30,14 +30,14 @@
             </div>
           </div>        
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용일시</label>
-            <div class="col-sm-4">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용일시</label>
+            <div class="col-sm-5">
                   <input type="text" class="form-control" id="mUseDt" name="useDt" th:value="${info.useDt}" readonly>
             </div>
           </div> 
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용사유</label>        
-            <div class="col-sm-3">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용사유</label>        
+            <div class="col-sm-5">
                <select class="form-select form-select-sm" id="mDetailType" name="detailType">
                   <option value="">선택</option>
                   <th:block th:if="${info.useType eq 'PVRE'}">
@@ -55,14 +55,14 @@
             </div>
           </div>
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">사용인원</label>
-            <div class="col-sm-4">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">사용인원</label>
+            <div class="col-sm-5">
                   <input type="number" class="form-control" id="mPeopleCnt" name="peopleCnt" th:value="${info.peopleCnt}">
             </div>
           </div> 
           <div class="mb-3 row">
-            <label for="ogCd" class="col-sm-2 col-form-label text-center">비고</label>
-            <div class="col-sm-4">
+            <label for="ogCd" class="col-sm-3 col-form-label text-center">비고</label>
+            <div class="col-sm-5">
                   <input type="text" class="form-control" id="mDescription" name="description" th:value="${info.description}">
             </div>
           </div>                  
@@ -71,8 +71,9 @@
 <div class="modal-footer justify-content-between">
   <div class="col-auto">
     <button type="button" class="btn btn-secondary" id="closeModal" data-bs-dismiss="modal">닫기</button>
+  </div>
+  <div class="col-auto">
     <button type="button" class="btn btn-warning" id="updateUse" th:if="${accessAuth eq 'ACC003'} or ${info.wrtUserSeq eq userSeq}">수정</button>
-
   </div>
 </div>
 </html>
\ No newline at end of file