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

청산보고서 인쇄 작업중. 

외사정보보고, sri 탭별 등록버튼 활성화.
master
강석 최 2023-03-17 18:02:30 +09:00
parent 9a7fe92321
commit 562ddd1507
10 changed files with 58 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,4 +1,4 @@
#해양경찰청 외사종합포털
#해양경찰청 외사포털
java 11
postgreSql 14.2

8
src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultInfo.java
View File

@ -6,6 +6,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.time.LocalDate;
@Getter
@Setter
@ -27,6 +28,13 @@ public class ResultInfo {
@Column(name = "contact_info")
private String contactInfo;
@Transient
private LocalDate wrtDt;
@Transient
private String title;
@Transient
private String affairRate;
@Embeddable
@Data
@NoArgsConstructor

32
src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js
View File

@ -132,7 +132,7 @@ $(document).on('click', '#resultInfoAddBtn', function (){
dataType:"html",
success: function(html){
infoRow.append(html);
$("#contactInfo"+infoSeq).summernote({
/*$("#contactInfo"+infoSeq).summernote({
lang:'ko-KR',
height: 60,
disableDragAndDrop: true,
@ -143,7 +143,7 @@ $(document).on('click', '#resultInfoAddBtn', function (){
['para', ['ul', 'ol', 'paragraph']],
['table', ['table']]
]
});
});*/
},
error:function(e){
ajaxErrorAction(e);
@ -195,6 +195,30 @@ $(document).on('click', '.apprvBtn', function (){
}
})
$(document).on('click', '#printBtn', function (){
$.ajax({
url: '/affairResult/resultBoardJson',
type: 'GET',
data: {resultKey: $(this).attr('data-resultkey')},
dataType:"json",
success: function(data){
var url = $("#printUrl").attr("data-printurl")+"/resultBoard.jsp";
var title = "청산 보고서 인쇄";
var status = "width=900px,height=800px,scrollbars=yes";
window.open("", title, status);
const form = $("#printForm")[0];
form.target = title;
form.action = url;
form.result.value = JSON.stringify(data);
form.method = "post";
form.submit();
},
error:function(e){
ajaxErrorAction(e);
}
});
})
function getResultViewModal(resultKey){
$.ajax({
url: '/affairResult/resultViewModal',
@ -225,7 +249,7 @@ function getResultEditModal(resultKey){
language: "ko",
autoclose: true
});
$(".contactInfo").summernote({
/*$(".contactInfo").summernote({
lang:'ko-KR',
height: 60,
disableDragAndDrop: true,
@ -236,7 +260,7 @@ function getResultEditModal(resultKey){
['para', ['ul', 'ol', 'paragraph']],
['table', ['table']]
]
});
});*/
setUploadDiv();
},
error:function(e){

4
src/main/resources/templates/faRpt/faRptBoard.html
View File

@ -164,7 +164,9 @@
</nav>
</div>
<div class="col-auto">
<input type="button" class="btn btn-success" value="등록" id="addFaRptBtn" th:unless="${accessAuth eq 'ACC001'}">
<th:block th:if="${accessAuth eq 'ACC001' and searchParams.activeTab eq 'send'}">
<input type="button" class="btn btn-success" value="등록" id="addFaRptBtn">
</th:block>
</div>
</div>
</div>

8
src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html
View File

@ -198,12 +198,10 @@
<input type="hidden" class="infoSeq resultInfoSeq" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].infoSeq')}" th:value="${info.infoSeq}">
<div class="col-1 infoSeq" th:text="${info.infoSeq+1}"></div>
<div class="col-3">
<input type="text" class="form-control form-control-sm" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactTarget')}"
th:value="${info.contactTarget}">
<input type="text" class="form-control form-control-sm" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactTarget')}" th:value="${info.contactTarget}">
</div>
<div class="col-7">
<textarea class="contactInfo" th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}"
th:utext="${info.contactInfo}"></textarea>
<textarea class="form-control contactInfo" th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}" th:utext="${info.contactInfo}"></textarea>
</div>
<div class="col-1">
<button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>
@ -301,7 +299,7 @@
</form>
</div>
<div class="modal-footer bg-light">
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
<!-- <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
<button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
<button type="button" class="btn btn-primary" id="saveResultBtn">저장</button>
</div>

2
src/main/resources/templates/igActivities/fpiMgt/affairResult/resultInfoRow.html
View File

@ -7,7 +7,7 @@
<input type="text" class="form-control form-control-sm" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactTarget')}">
</div>
<div class="col-7">
<textarea th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}"></textarea>
<textarea class="form-control" th:id="|contactInfo${info.infoSeq}|" th:name="${#strings.concat('resultInfoList[', info.infoSeq,'].contactInfo')}"></textarea>
</div>
<div class="col-1">
<button type="button" class="btn btn-sm btn-outline-danger rowDeleteBtn"><i class="bi bi-x"></i></button>

7
src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
View File

@ -198,5 +198,12 @@
</div>
</div>
</div>
<div class="d-none">
<form id="printForm">
<input type="hidden" name="planList">
<input type="hidden" name="affairList">
<input type="hidden" name="result">
</form>
</div>
</div>
</html>

3
src/main/resources/templates/igActivities/fpiMgt/affairResult/resultViewModal.html
View File

@ -259,6 +259,9 @@
</div>
</div>
<div class="modal-footer bg-light">
<th:block th:if="${result.resultState eq 'DST006'}">
<button type="button" class="btn btn-secondary" id="printBtn" th:data-affairkey="${result.resultKey}">인쇄</button>
</th:block>
<th:block th:unless="${result.resultState eq 'DST004' or result.resultState eq 'DST006'}"><!--승인 상태일때는 수정 불가-->
<th:block th:if="${userSeq eq result.wrtUserSeq or accessAuth eq 'ACC003'}"><!--작성자일 경우 수정 허용--><!--관리자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" id="editResultBtn">수정</button>

2
src/main/resources/templates/layout/layout.html
View File

@ -6,7 +6,7 @@
<head>
<meta charset="UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<title>해양경찰청 외사종합포털</title>
<title>해양경찰청 외사포털</title>
<!--bootstrap-->
<link rel="stylesheet" th:href="@{/vendor/bootstrap-5.2.0-dist/css/bootstrap.min.css}">

4
src/main/resources/templates/sri/sriBoard.html
View File

@ -162,7 +162,9 @@
</nav>
</div>
<div class="col-auto">
<input type="button" class="btn btn-success" value="등록" id="addSriBtn" th:unless="${accessAuth eq 'ACC001' and searchParams.activeTab eq 'send'}">
<th:block th:if="${accessAuth eq 'ACC001' and searchParams.activeTab eq 'send'}">
<input type="button" class="btn btn-success" value="등록" id="addSriBtn">
</th:block>
</div>
</div>
</div>