외사장비 모달 수정 완료

첩보수집활동 모달 작업 시작.
강석 최 2022-12-12 16:37:53 +09:00
parent 3df21b009a
commit c30d94f9d4
17 changed files with 1206 additions and 1248 deletions

View File

@ -2,10 +2,7 @@ package com.dbnt.faisp.main.equip;
import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
import com.dbnt.faisp.main.equip.model.CellPhone;
import com.dbnt.faisp.main.equip.model.Equip;
import com.dbnt.faisp.main.equip.model.EquipLog;
import com.dbnt.faisp.main.equip.model.UseList;
import com.dbnt.faisp.main.equip.model.*;
import com.dbnt.faisp.main.equip.service.EquipService;
import com.dbnt.faisp.main.organMgt.service.OrganConfigService;
import com.dbnt.faisp.main.userInfo.model.UserInfo;
@ -148,7 +145,7 @@ public class EquipController {
@GetMapping("/getEquipImg")
public void getThumbImage(Equip equip , HttpServletResponse response) throws Exception {
Equip dbImg = equipService.selectEquipInfo(equip);
EquipFile dbImg = equipService.selectEquipFile(equip);
String realFile = dbImg.getFilePath()+"/"+ dbImg.getConvNm();
String fileNm = dbImg.getConvNm();

View File

@ -190,28 +190,13 @@ public class EquipService {
return equip.getEquKey();
}
public void updateFile(Equip equip,Equip equipTmp, MultipartHttpServletRequest mRequest) throws Exception {
public void updateFile(Equip equip, Equip equipTmp, MultipartHttpServletRequest mRequest) throws Exception {
try {
String path = fileDir+equ;
String FileSize;
File dir = new File(path);
if(!dir.exists()) dir.mkdir();
//이미지 삭제했을경우
if(equip.getDeleteFileKey() != null) {
EquipFile equFile = new EquipFile();
equFile.setEquKey(equip.getDeleteFileKey());
equFile.setVersionNo(equip.getDeleteFileVnum());
EquipFile dbEquFile = equipFileRepository.findById(new EquipFileId(equFile.getEquKey(), equFile.getVersionNo())).orElse(null);
if(dbEquFile != null) {
File file = new File(dbEquFile.getFilePath(), dbEquFile.getConvNm());
if(file.exists()) {
file.delete();
}
}
}
//파일등록
List<MultipartFile> mFiles = mRequest.getFiles("file");
for(int i = 0; i < mFiles.size(); i++) {
@ -407,5 +392,7 @@ public class EquipService {
}
public EquipFile selectEquipFile(Equip equip) {
return equipFileRepository.findById(new EquipFileId(equip.getEquKey(), equip.getVersionNo())).orElse(null);
}
}

View File

@ -96,9 +96,6 @@
.pl-15{
padding-left: 15%;
}
.pl-23{
padding-left: 23%;
}
.w-30{
width: 30%!important;
}

View File

@ -118,7 +118,7 @@ function showUpdateModal(equKey){
type: 'GET',
dataType:"html",
success: function(html){
$("#equipEditModalContent").empty().append(html)
$("#equipModifyModalContent").empty().append(html)
$("#equipModifyModal").modal('show');
$(".mStoredYear").datepicker({
minViewMode: 'years',
@ -186,7 +186,7 @@ $(document).on('click', '#updateEquip', function (){
$(document).on('click', '#historyBtn', function (){
if($('input:checkbox[name=equChk]:checked').length < 1){
alert("게시물을 선택해주세요")
alert("장비를 선택해주세요")
return false;
}
if($('input:checkbox[name=equChk]:checked').length > 1){
@ -201,8 +201,8 @@ $(document).on('click', '#historyBtn', function (){
type: 'GET',
dataType:"html",
success: function(html){
$("#configEqu").empty().append(html)
$("#equipModifyModal").modal('show');
$("#equipHistoryModalContent").empty().append(html)
$("#equipHistoryModal").modal('show');
},
error:function(){
@ -232,8 +232,8 @@ $(document).on('click', '.historyInfoTr', function (){
$('#vItemQty').val(data.itemQty);
$('#vItemCondition').val(data.itemCondition);
$('#vNote').val(data.note);
$('#vImgName').val(data.origNm);
$('#vImgName').attr("src", "/equip/getEquipImg?equKey="+data.equKey+"&versionNo="+data.versionNo);
$('#vImgName').show();
},
error:function(){

View File

@ -82,11 +82,11 @@ $(document).on('click', '.useTr', function (event){
const useNo = $(target).parent('tr').data("useno");
const useType = $(target).parent('tr').data("usetype");
const mgtOrgan = $(target).parent('tr').data("mgtorgan");
showMdifyModal(useNo,useType,mgtOrgan);
showModifyModal(useNo,useType,mgtOrgan);
}
});
function showMdifyModal(useNo,useType,mgtOrgan){
function showModifyModal(useNo,useType,mgtOrgan){
$.ajax({
url: '/equip/useModifyModal',
data: {useNo: useNo,
@ -138,7 +138,7 @@ $(document).on('click', '#updateUse', function (){
success : function(data) {
alert("수정되었습니다.");
contentFade("out");
showMdifyModal(data.useNo,data.useType,data.mgtOrgan);
showModifyModal(data.useNo,data.useType,data.mgtOrgan);
},
error : function(xhr, status) {
alert("수정에 실패하였습니다.")

View File

@ -20,7 +20,7 @@
<input type="hidden" name="wrtTitle" th:value="${info.wrtTitle}">
<input type="hidden" name="wrtUserSeq" th:value="${info.wrtUserSeq}">
<input type="hidden" name="wrtNm" th:value="${info.wrtNm}">
<div class="row mb-3">
<div class="row mb-1">
<label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" id="mgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
@ -39,7 +39,7 @@
</div>
</div>
<div class="row mb-1">
<label for="ogCd" class="col-sm-4 col-form-label text-center">사용자</label>
<label for="ogCd" class="col-sm-4 col-form-label col-form-label-sm text-center">사용자</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" id="pUserSeq" name="pUserSeq">
<option value="">선택</option>
@ -51,34 +51,34 @@
</select>
</div>
</div>
<div class="row mb-3">
<div class="row mb-1">
<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" class="form-control" id="telNo" name="telNo" th:value="${info.telNo}" placeholder="EX: 010-0000-0000">
<input type="text" class="form-control form-control-sm" id="telNo" name="telNo" th:value="${info.telNo}" placeholder="EX: 010-0000-0000">
</div>
</div>
<div class="row mb-3">
<div class="row mb-1">
<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" class="form-control" id="extMail" name="extMail" th:value="${info.extMail}" placeholder="EX: test@test.com">
<input type="text" class="form-control form-control-sm" id="extMail" name="extMail" th:value="${info.extMail}" placeholder="EX: test@test.com">
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">웹엑스<br>미팅번호</label>
<div class="row mb-1">
<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" class="form-control" id="webexNo" name="webexNo" th:value="${info.webexNo}">
<input type="text" class="form-control form-control-sm" id="webexNo" name="webexNo" th:value="${info.webexNo}">
</div>
</div>
<div class="row mb-3">
<div class="row mb-1">
<label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">카카오톡 ID</label>
<div class="col-sm-6">
<input type="text" class="form-control" id="katalkId" name="katalkId" th:value="${info.katalkId}">
<input type="text" class="form-control form-control-sm" id="katalkId" name="katalkId" th:value="${info.katalkId}">
</div>
</div>
<div class="row mb-3">
<div class="row mb-1">
<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" class="form-control" id="description" name="description" th:value="${info.description}">
<input type="text" class="form-control form-control-sm" id="description" name="description" th:value="${info.description}">
</div>
</div>
</form>

View File

@ -117,14 +117,8 @@
</main>
<div class="modal fade" id="cellPhoneEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content" id="cellPhoneEditModalContent">
<div class="modal-header bg-dark">
</div>
<div class="modal-body">
<div class="tab-content bg-white border border-top-0" id="configCellPhone">
</div>
</div>
</div>
</div>
</div>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel">등록</h5>
<h5 class="modal-title text-white" id="menuEditModalLabel">장비 등록</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
@ -43,13 +43,13 @@
<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" class="form-control storedYear" name="storedYear" readonly>
<input type="text" class="form-control form-control-sm storedYear" name="storedYear" readonly>
</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="number" class="form-control" id="itemQty" name="itemQty" placeholder="수량 직접입력">
<input type="number" class="form-control form-control-sm" id="itemQty" name="itemQty" placeholder="수량 직접입력">
</div>
</div>
<div class="row mb-3">
@ -66,13 +66,13 @@
<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" class="form-control" name="note">
<input type="text" class="form-control form-control-sm" name="note">
</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="file" class="form-control" name="file" accept="image/gif,image/jpeg,image/png">
<input type="file" class="form-control form-control-sm" name="file" accept="image/gif,image/jpeg,image/png">
</div>
</div>
</form>

View File

@ -1,22 +1,16 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="modal-header bg-dark">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white">수정이력</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="row mx-0">
<div class="col-100 card text-center">
<div class="card-body">
<div class="row">
</div>
<div class="row justify-content-start">
<div class="col-4">
</div>
<div class="modal-body text-center">
<div class="card">
<div class="card-body">
<div class="row">
<div class="row justify-content-start">
<div class="col-4">
<table class="table table-sm table-hover table-bordered" id="categoryTable">
<thead>
<tr class="table-secondary">
@ -37,67 +31,63 @@
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="col-8" id="valueDiv">
<div class="row mb-3">
<label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
<label for="vSosok" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
<div class="col-sm-6">
<input type="text" id="vSosok" readonly>
<input type="text" class="form-control form-control-sm" id="vSosok" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">분류</label>
<label for="vEquType" class="col-sm-4 col-form-label col-form-label-sm text-center">분류</label>
<div class="col-sm-6">
<input type="text" id="vEquType" readonly>
<input type="text" class="form-control form-control-sm" id="vEquType" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">세부분류</label>
<label for="vDetailType" class="col-sm-4 col-form-label col-form-label-sm text-center">세부분류</label>
<div class="col-sm-6">
<input type="text" id="vDetailType" readonly>
<input type="text" class="form-control form-control-sm" id="vDetailType" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">취득연도</label>
<label for="vStoredYear" class="col-sm-4 col-form-label col-form-label-sm text-center">취득연도</label>
<div class="col-sm-6">
<input type="text" id="vStoredYear" readonly>
<input type="text" class="form-control form-control-sm" id="vStoredYear" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">보유량</label>
<label for="vItemQty" class="col-sm-4 col-form-label col-form-label-sm text-center">보유량</label>
<div class="col-sm-6">
<input type="text" id="vItemQty" readonly>
<input type="text" class="form-control form-control-sm" id="vItemQty" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">상태</label>
<label for="vItemCondition" class="col-sm-4 col-form-label col-form-label-sm text-center">상태</label>
<div class="col-sm-6">
<input type="text" id="vItemCondition" readonly>
<input type="text" class="form-control form-control-sm" id="vItemCondition" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
<label for="vNote" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
<div class="col-sm-6">
<input type="text" id="vNote" readonly>
<input type="text" class="form-control form-control-sm" id="vNote" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">장비사진</label>
<label for="vImgName" class="col-sm-4 col-form-label col-form-label-sm text-center">장비사진</label>
<div class="col-sm-6">
<input type="text" id="vImgName" readonly>
<img id="vImgName" src="" alt="첨부이미지" style="width: 100%; height: 100%; display: none;" />
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer justify-content-between bg-light">
</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>
</div>
</div>
</div>
</html>

View File

@ -13,10 +13,12 @@
<div class="row mx-0">
<div class="col-12 card bg-light text-center">
<div class="card-body">
<div class="row justify-content-between py-1">
<div class="col-auto">
<form method="get" th:action="@{/equip/List}">
<input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<input type="hidden" name="detailType" th:value="${searchParams.detailType}">
<div class="row justify-content-between py-1">
<div class="col-row">
<div class="col-auto">
<select class="form-select form-select-sm" name="rowCnt" id="rowCnt">
<th:block th:each="num : ${#numbers.sequence(1,5)}">
@ -31,6 +33,11 @@
</div>
</div>
</form>
</div>
<div class="col-auto">
<a class="btn btn-info" href="/equip/equipStatus">돌아가기</a>
</div>
</div>
<div class="row justify-content-start">
<div class="col-12">
<div class="card">
@ -113,15 +120,15 @@
</div>
</main>
<div class="modal fade" id="equipModifyModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
<div class="modal fade" id="equipModifyModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="equipModifyModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content" id="equipModifyModalContent">
</div>
</div>
</div>
<div class="modal fade" id="equipHistoryModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="equipHistoryModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-content" id="equipEditModalContent">
<div class="modal-header bg-dark">
</div>
<div class="modal-body">
<div class="tab-content border bg-white border-top-0" id="configEqu">
</div>
</div>
<div class="modal-content" id="equipHistoryModalContent">
</div>
</div>
</div>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel">수정</h5>
<h5 class="modal-title text-white" id="menuEditModalLabel">장비 수정</h5>
<button type="button" class="btn-close modalCloseBtn f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
@ -11,7 +11,7 @@
<input type="hidden" id="mEquKey" name="equKey" th:value="${equInfo.equKey}">
<input type="hidden" name="versionNo" th:value="${equInfo.versionNo}">
<div class="row mb-3">
<label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
<label for="mMgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">관리처</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" id="mMgtOrgan" name="mgtOrgan" th:disabled="${accessAuth ne 'ACC003'}">
<option value="">선택</option>
@ -22,7 +22,7 @@
</div>
</div>
<div class="row mb-3">
<label for="cat1Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">분류</label>
<label for="equType" class="col-sm-4 col-form-label col-form-label-sm text-center">분류</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" id="equType" name="equType">
<option value="">-분류 선택-</option>
@ -33,7 +33,7 @@
</div>
</div>
<div class="row mb-3">
<label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">세부분류</label>
<label for="detailType" class="col-sm-4 col-form-label col-form-label-sm text-center">세부분류</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" id="detailType" name="detailType">
<option value="">-세부분류 선택-</option>
@ -44,21 +44,21 @@
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">취득연도</label>
<label for="storedYear" class="col-sm-4 col-form-label col-form-label-sm text-center">취득연도</label>
<div class="col-sm-6">
<input type="text" class="form-control mStoredYear" name="storedYear" th:value="${equInfo.storedYear}" readonly>
<input type="text" class="form-control form-control-sm mStoredYear" id="storedYear" name="storedYear" th:value="${equInfo.storedYear}" readonly>
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">보유량</label>
<label for="mItemQty" class="col-sm-4 col-form-label col-form-label-sm text-center">보유량</label>
<div class="col-sm-6">
<input type="number" class="form-control" id="mItemQty" name="itemQty" th:value="${equInfo.itemQty}" placeholder="수량 직접입력">
<input type="number" class="form-control form-control-sm" id="mItemQty" name="itemQty" th:value="${equInfo.itemQty}" placeholder="수량 직접입력">
</div>
</div>
<div class="row mb-3">
<label for="cat2Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">상태</label>
<label for="itemCondition" class="col-sm-4 col-form-label col-form-label-sm text-center">상태</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" name="itemCondition">
<select class="form-select form-select-sm" id="itemCondition" name="itemCondition">
<option value="">상태 선택</option>
<th:block th:each="commonCode:${session.commonCode.get('ITCON')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd} == ${equInfo.itemCondition}"></option>
@ -67,25 +67,29 @@
</div>
</div>
<div class="row mb-3">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
<label for="note" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
<div class="col-sm-6">
<input type="text" class="form-control" name="note" th:value="${equInfo.note}">
<input type="text" class="form-control form-control-sm" id="note" name="note" th:value="${equInfo.note}">
</div>
</div>
<div class="row mb-2">
<label for="cat3Cd" class="col-sm-4 col-form-label col-form-label-sm text-center">장비사진</label>
<label for="imgUpload" 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="text" class="form-control" value="등록된 사진이 없습니다." readonly th:if="${#strings.isEmpty(equInfo.origNm)}">
<input type="text" name="noUpdateImg" class="form-control form-control-sm" th:value="${equInfo.origNm}" readonly th:if="${not #strings.isEmpty(equInfo.origNm)}">
<input type="text" class="form-control form-control-sm" value="등록된 사진이 없습니다." readonly th:if="${#strings.isEmpty(equInfo.origNm)}">
</div>
<div id="imgUpdate" style="display:none">
<input type="file" class="form-control" name="file" accept="image/gif,image/jpeg,image/png">
<input type="file" class="form-control form-control-sm" 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)}">
<button type="button" class="btn btn-sm btn-danger" id="deleteImgBtn" th:if="${not #strings.isEmpty(equInfo.origNm)}" th:attr="onclick=|deleteImg('${equInfo.equKey}','${equInfo.versionNo}')|">
<i class="bi bi-x"></i>
</button>
<button type="button" class="btn btn-primary" id="addImgBtn" th:if="${#strings.isEmpty(equInfo.origNm)}">
<i class="bi bi-plus"></i>
</button>
</div>
</div>
</form>

View File

@ -126,14 +126,8 @@
</main>
<div class="modal fade" id="equipEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content" id="equipEditModalContent">
<div class="modal-header bg-dark">
</div>
<div class="modal-body">
<div class="tab-content bg-white border border-top-0" id="configInfo">
</div>
</div>
</div>
</div>
</div>

View File

@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<option value="">-세부분류 선택-</option>
<th:block th:each="commonCode:${session.commonCode.get(equType)}">
<option value="">-세부분류 선택-</option>
<th:block th:each="commonCode:${session.commonCode.get(equType)}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"></option>
</th:block>
</th:block>
</html>

View File

@ -142,14 +142,8 @@
</main>
<div class="modal fade" id="useEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content" id="useEditModalContent">
<div class="modal-header bg-dark">
</div>
<div class="modal-body">
<div class="tab-content bg-white border border-top-0" id="configCellPhone">
</div>
</div>
</div>
</div>
</div>

View File

@ -142,14 +142,8 @@
</main>
<div class="modal fade" id="useEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="userEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-dialog modal-dialog-scrollable">
<div class="modal-content" id="useEditModalContent">
<div class="modal-header bg-dark">
</div>
<div class="modal-body">
<div class="tab-content bg-white border border-top-0" id="configCellPhone">
</div>
</div>
</div>
</div>
</div>

View File

@ -5,14 +5,14 @@
<h5 class="modal-title text-white" id="menuEditModalLabel" th:text="${useType eq 'PVRE'?'휴대용 녹화장비 사용대장 등록':'방역조사실 사용대장 등록'}"></h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body pl-23">
<div class="modal-body">
<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="row mb-1">
<label for="ogCd" class="col-sm-3 col-form-label text-center">사용관서</label>
<div class="col-sm-5">
<label for="mgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">사용관서</label>
<div class="col-sm-6">
<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}">
@ -22,14 +22,14 @@
</div>
</div>
<div class="row mb-1">
<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>
<label for="useDt" class="col-sm-4 col-form-label col-form-label-sm text-center">사용일시</label>
<div class="col-sm-6">
<input type="text" class="form-control form-control-sm" id="useDt" name="useDt" readonly>
</div>
</div>
<div class="row mb-1">
<label for="ogCd" class="col-sm-3 col-form-label text-center">사용사유</label>
<div class="col-sm-5">
<label for="detailType" class="col-sm-4 col-form-label col-form-label-sm text-center">사용사유</label>
<div class="col-sm-6">
<select class="form-select form-select-sm" id="detailType" name="detailType">
<option value="">선택</option>
<th:block th:if="${useType eq 'PVRE'}">
@ -43,19 +43,19 @@
</th:block>
</th:block>
</select>
<input type="text" class="form-control" id="detailSelf" name="detailSelf">
<input type="text" class="form-control form-control-sm" id="detailSelf" name="detailSelf">
</div>
</div>
<div class="row mb-1">
<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">
<label for="peopleCnt" class="col-sm-4 col-form-label col-form-label-sm text-center">사용인원</label>
<div class="col-sm-6">
<input type="number" class="form-control form-control-sm" id="peopleCnt" name="peopleCnt">
</div>
</div>
<div class="row mb-1">
<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">
<label for="description" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
<div class="col-sm-6">
<input type="text" class="form-control form-control-sm" id="description" name="description">
</div>
</div>
</form>

View File

@ -7,7 +7,7 @@
</h5>
<button type="button" class="btn-close f-invert" id="closeModal" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body pl-23">
<div class="modal-body">
<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}"/>
@ -15,8 +15,8 @@
<input type="hidden" name="useType" th:value="${info.useType}">
<input type="hidden" name="versionNo" th:value="${info.versionNo}">
<div class="row mb-1">
<label for="ogCd" class="col-sm-3 col-form-label text-center">사용관서</label>
<div class="col-sm-5">
<label for="mMgtOrgan" class="col-sm-4 col-form-label col-form-label-sm text-center">사용관서</label>
<div class="col-sm-6 ">
<select class="form-select form-select-sm" id="mMgtOrgan" name="mgtOrgan" disabled>
<option value="">선택</option>
<th:block th:each="organList:${organList}">
@ -26,14 +26,14 @@
</div>
</div>
<div class="row mb-1">
<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>
<label for="mUseDt" class="col-sm-4 col-form-label col-form-label-sm text-center">사용일시</label>
<div class="col-sm-6 ">
<input type="text" class="form-control form-control-sm" id="mUseDt" name="useDt" th:value="${info.useDt}" readonly>
</div>
</div>
<div class="row mb-1">
<label for="ogCd" class="col-sm-3 col-form-label text-center">사용사유</label>
<div class="col-sm-5">
<label for="mDetailType" class="col-sm-4 col-form-label col-form-label-sm text-center">사용사유</label>
<div class="col-sm-6 ">
<select class="form-select form-select-sm" id="mDetailType" name="detailType">
<option value="">선택</option>
<th:block th:if="${info.useType eq 'PVRE'}">
@ -47,19 +47,19 @@
</th:block>
</th:block>
</select>
<input type="text" class="form-control" id="mDetailSelf" name="detailSelf" th:value="${info.detailSelf}">
<input type="text" class="form-control form-control-sm" id="mDetailSelf" name="detailSelf" th:value="${info.detailSelf}">
</div>
</div>
<div class="row mb-1">
<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}">
<label for="mPeopleCnt" class="col-sm-4 col-form-label col-form-label-sm text-center">사용인원</label>
<div class="col-sm-6 ">
<input type="number" class="form-control form-control-sm" id="mPeopleCnt" name="peopleCnt" th:value="${info.peopleCnt}">
</div>
</div>
<div class="row mb-1">
<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}">
<label for="mDescription" class="col-sm-4 col-form-label col-form-label-sm text-center">비고</label>
<div class="col-sm-6 ">
<input type="text" class="form-control form-control-sm" id="mDescription" name="description" th:value="${info.description}">
</div>
</div>
</form>