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

외사수사관리 모달 수정 완료.

강석 최 2022-12-08 11:07:56 +09:00
parent 228c38fdaf
commit 44a2834ccc
3 changed files with 260 additions and 279 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/resources/static/js/ivsgt/ivsgt.js
View File

@ -7,11 +7,6 @@ $(document).on('click', '#ivsgtEditBtn', function () {
getIvsgtEditModal(Number($("#ivsgtViewBody").find("[name='ivsgtKey']").val())); getIvsgtEditModal(Number($("#ivsgtViewBody").find("[name='ivsgtKey']").val()));
}); });
$(document).on('click', '#contentInfoAddBtn', function (){
$("#contentInfoDiv").append("<input type='text' class='form-control' name='contentInfos'>")
});
$(document).on('click', '#saveIvsgtBtn', function (){ $(document).on('click', '#saveIvsgtBtn', function (){
saveBoardInvestigation('N') saveBoardInvestigation('N')
}); });
@ -40,10 +35,15 @@ $(document).on('click', '#completeBtn', function (){
Array.from(checkbox).forEach(function(element) { Array.from(checkbox).forEach(function(element) {
if (element.checked) { if (element.checked) {
$('#relatedReportSearchDiv').append( $('#relatedReportSearchDiv').append(
'<input type="hidden" name="relatedReportsKeyList" value="0">' '<div class="col-auto">' +
+ '<input type="hidden" name="childIvsgtKeyList" value="' + element.value + '">' ' <input type="hidden" name="relatedReportsKeyList" value="0">'+
+ '<div class="col-auto"><input class="border-0" type="text" name="relatedReportsText" value="' + element.name + '" readonly>' ' <input type="hidden" name="childIvsgtKeyList" value="' + element.value + '">'+
+ '<button class="btn btn-sm btn-primary col-auto cancel-btn" >X</button></div>' ' <input type="hidden" name="relatedReportsText" value="' + element.name + '" readonly>'+
' <div class="row">' +
' <label class="col-sm-auto col-form-label col-form-label-sm">' + element.name + '</label>'+
' <button class="btn btn-sm btn-primary col-auto cancel-btn" ><i class="bi-x"></i></button>' +
' </div>' +
'</div>'
) )
} }
}); });
@ -101,30 +101,7 @@ function getIvsgtEditModal(ivsgtKey, ivsgtType){
$("#ivsgtViewBody").empty(); $("#ivsgtViewBody").empty();
$("#ivsgtEditModalContent").empty().append(html) $("#ivsgtEditModalContent").empty().append(html)
$("#ivsgtEditModal").modal('show'); $("#ivsgtEditModal").modal('show');
$("[name='contentInfo']").summernote({ setEditor('editor', '400')
lang:'ko-KR',
height: 120,
disableDragAndDrop: true,
toolbar: [
['style', ['style']],
['font', ['bold', 'underline', 'clear']],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['table', ['table']]
]
});
$("[name='contentMain']").summernote({
lang:'ko-KR',
height: 120,
disableDragAndDrop: true,
toolbar: [
['style', ['style']],
['font', ['bold', 'underline', 'clear']],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['table', ['table']]
]
});
setUploadDiv(); setUploadDiv();
}, },
error:function(){ error:function(){
@ -165,6 +142,7 @@ function saveBoardInvestigation(contentState){
$(".text-decoration-line-through").each(function (idx, el){ $(".text-decoration-line-through").each(function (idx, el){
formData.append('fileSeq', $(el).attr("data-fileseq")); formData.append('fileSeq', $(el).attr("data-fileseq"));
}) })
formData.append('contentMain', CrossEditor.GetBodyValue());
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
data : formData, data : formData,

58
src/main/resources/templates/ivsgt/ivsgtEditModal.html
View File

@ -37,23 +37,23 @@
<input type="hidden" name="ivsgtType" th:value="${boardInvestigation.ivsgtType}"> <input type="hidden" name="ivsgtType" th:value="${boardInvestigation.ivsgtType}">
<input type="hidden" name="arrestTypeKey" th:value="${boardInvestigation.arrestType != null ? boardInvestigation.arrestType.arrestTypeKey: ''}"> <input type="hidden" name="arrestTypeKey" th:value="${boardInvestigation.arrestType != null ? boardInvestigation.arrestType.arrestTypeKey: ''}">
<div class="row mb-1"> <div class="row mb-1">
<label for="wrtNm" class="col-sm-2 col-form-label text-center">작성자</label> <label for="wrtNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control" id="wrtNm" name="wrtNm" th:value="${boardInvestigation.wrtNm}" readonly> <input type="text" class="form-control form-control-sm" id="wrtNm" name="wrtNm" th:value="${boardInvestigation.wrtNm}" readonly>
</div> </div>
<label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label> <label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control" id="wrtDt" name="wrtDt" th:value="${#temporals.format(boardInvestigation.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly> <input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(boardInvestigation.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentTitle" class="col-sm-2 col-form-label text-center">제목</label> <label for="contentTitle" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<div class="col-sm-10"> <div class="col-sm-11">
<input type="text" class="form-control" id="contentTitle" name="contentTitle" th:value="${boardInvestigation.contentTitle}"> <input type="text" class="form-control form-control-sm" id="contentTitle" name="contentTitle" th:value="${boardInvestigation.contentTitle}">
</div> </div>
</div> </div>
<div class="row mb-1" id="arrestTypeDiv"> <div class="row mb-1" id="arrestTypeDiv">
<label class="col-sm-2 col-form-label col-form-label-sm text-center">검거유형1</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">검거유형1</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm" name="arrestCd" id="arrestCd"> <select class="form-select form-select-sm" name="arrestCd" id="arrestCd">
<option value="">검거유형1 선택-</option> <option value="">검거유형1 선택-</option>
@ -63,7 +63,7 @@
</th:block> </th:block>
</select> </select>
</div> </div>
<label class="col-sm-2 col-form-label col-form-label-sm text-center">검거유형2</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">검거유형2</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm" name="arrestCd2" id="arrestCd2"> <select class="form-select form-select-sm" name="arrestCd2" id="arrestCd2">
<option value="">검거유형2 선택-</option> <option value="">검거유형2 선택-</option>
@ -76,27 +76,28 @@
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentInfoDiv" class="col-sm-2 col-form-label text-center">사건개요</label> <label for="contentInfoDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">사건개요</label>
<div class="col-sm-10" id="contentInfoDiv"> <div class="col-sm-11" id="contentInfoDiv">
<textarea type='text' name='contentInfo' th:utext="${boardInvestigation.contentInfo}"></textarea> <textarea class="form-control form-control-sm" name='contentInfo' th:text="${boardInvestigation.contentInfo}"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="contentMainDiv" class="col-sm-2 col-form-label text-center">주요내용</label> <label for="contentMainDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">주요내용</label>
<div class="col-sm-10" id="contentMainDiv"> <div class="col-sm-11" id="contentMainDiv">
<textarea type='text' name='contentMain' th:utext="${boardInvestigation.contentMain}"></textarea> <div id="editor"></div>
<textarea id='content' class="d-none" th:utext="${boardInvestigation.contentMain}"></textarea>
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="hashTags" class="col-sm-2 col-form-label col-form-label-sm text-center">해시태그</label> <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">해시태그</label>
<div class="col-sm-10"> <div class="col-sm-11">
<input type="text" class="form-control form-control-sm" id="hashTags" name="hashTags" th:value="${boardInvestigation.hashTags}" <input type="text" class="form-control form-control-sm" id="hashTags" name="hashTags" th:value="${boardInvestigation.hashTags}"
placeholder="띄어쓰기로 각 태그를 구분합니다. 한 태그 내에서는 띄어쓰기 없이 입력해주세요. ex)태그1 태그2"> placeholder="띄어쓰기로 각 태그를 구분합니다. 한 태그 내에서는 띄어쓰기 없이 입력해주세요. ex)태그1 태그2">
</div> </div>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label> <label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">업로드 자료</label>
<div class="col-sm-10" style="min-height: 70px;"> <div class="col-sm-11" style="min-height: 70px;">
<div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv"> <div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
<th:block th:if="${#arrays.isEmpty(boardInvestigation.fileList)}"> <th:block th:if="${#arrays.isEmpty(boardInvestigation.fileList)}">
<br>파일을 업로드 해주세요. <br>파일을 업로드 해주세요.
@ -112,9 +113,9 @@
</div> </div>
</div> </div>
<th:block th:if="${boardInvestigation.ivsgtType eq 'proceeding' or boardInvestigation.ivsgtType eq 'result'}"> <th:block th:if="${boardInvestigation.ivsgtType eq 'proceeding' or boardInvestigation.ivsgtType eq 'result'}">
<div class="row mb-3"> <div class="row mb-1">
<label for="relatedReportDiv" class="col-sm-2 col-form-label text-center">연관보고서</label> <label for="relatedReportDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">연관보고서</label>
<div class="col-sm-10" id="relatedReportDiv"> <div class="col-sm-11" id="relatedReportDiv">
<div class="row justify-content-start"> <div class="row justify-content-start">
<div class="col-4"> <div class="col-4">
<input type="text" class="form-control form-control-sm" placeholder="" name="searchTitle"> <input type="text" class="form-control form-control-sm" placeholder="" name="searchTitle">
@ -127,15 +128,18 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row">
<label for="relatedReportDiv" class="col-sm-2 col-form-label text-center"></label> <label for="relatedReportDiv" class="col-sm-1 col-form-label col-form-label-sm text-center"></label>
<div class="col-sm-10 row mb-1" id="relatedReportSearchDiv"> <div class="col-sm-11 row mb-1" id="relatedReportSearchDiv">
<th:block th:each="relatedReports:${boardInvestigation.relatedReportsList}"> <th:block th:each="relatedReports:${boardInvestigation.relatedReportsList}">
<div class="col-auto"> <div class="col-auto">
<input type="hidden" name="relatedReportsKeyList" th:value="${relatedReports.relatedReportsKey}"> <input type="hidden" name="relatedReportsKeyList" th:value="${relatedReports.relatedReportsKey}">
<input type="hidden" name="childIvsgtKeyList" th:value="${relatedReports.childIvsgtKey}"> <input type="hidden" name="childIvsgtKeyList" th:value="${relatedReports.childIvsgtKey}">
<input class="border-0" type="text" name="relatedReportsText" th:value="${relatedReports.contentTitle}" readonly> <input type="hidden" name="relatedReportsText" th:value="${relatedReports.contentTitle}">
<button class="btn btn-sm btn-primary col-auto cancel-btn">X</button> <div class="row">
<label class="col-sm-auto col-form-label col-form-label-sm" th:text="${relatedReports.contentTitle}"></label>
<button class="btn btn-sm btn-primary col-auto cancel-btn"><i class="bi-x"></i></button>
</div>
</div> </div>
</th:block> </th:block>
</div> </div>

7
src/main/resources/templates/ivsgt/ivsgtViewModal.html
View File

@ -51,9 +51,10 @@
<div class="row mb-1"> <div class="row mb-1">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">사건개요</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">사건개요</label>
<div class="col-sm-11"> <div class="col-sm-11">
<div class="form-control-sm" th:utext="${boardInvestigation.contentInfo}"></div> <div class="form-control-sm" th:text="${boardInvestigation.contentInfo}"></div>
</div> </div>
</div> </div>
<hr class="my-1">
<div class="row mb-1"> <div class="row mb-1">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">주요내용</label> <label class="col-sm-1 col-form-label col-form-label-sm text-center">주요내용</label>
<div class="col-sm-11"> <div class="col-sm-11">
@ -99,9 +100,7 @@
<div class="col-sm-11" id="relatedReportDiv"> <div class="col-sm-11" id="relatedReportDiv">
<div class="row justify-content-start"> <div class="row justify-content-start">
<th:block th:each="relatedReports:${boardInvestigation.relatedReportsList}"> <th:block th:each="relatedReports:${boardInvestigation.relatedReportsList}">
<div class="col-auto"> <label class="col-sm-auto col-form-label col-form-label-sm" th:text="${relatedReports.contentTitle}"></label>
<input class="border-0" type="text" name="relatedReportsText" th:value="${relatedReports.contentTitle}" readonly>
</div>
</th:block> </th:block>
</div> </div>
</div> </div>