diff --git a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp
index ad28250..03e3996 100644
--- a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp
+++ b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp
@@ -38,12 +38,22 @@
var loginUser = '<%= loginVo.getUserId() %>';
var url = '';
var url_view = '';
+
+ function dateFormat(cellvalue) {
+ if ( cellvalue == null || cellvalue.length < 8 )
+ return '';
+ return cellvalue.substr(0 ,4) + '-' +
+ cellvalue.substr(4, 2) + '-' +
+ cellvalue.substr(6, 2) ;
+ }
$(document).ready(function () {
var key = "${param.id}";
if (key) {
detail(key);
}
+
+ $("#expectEndDate").datepicker().inputmask("yyyy-mm-dd", {'autoUnmask': true});
$("#btn_app_approve").click(function () {
if (confirm("승인하시겠습니까?")) {
@@ -112,6 +122,28 @@
});
}
});
+
+ $("#btn_modify").click(function () {
+ if (confirm("수정하시겠습니까?")) {
+ $.ajax({
+ type: "POST",
+ url: url,
+ data: {cmd: "UPDATE", id: key, expectEndDate: $("#expectEndDate").val().replaceAll('-','')},
+ success: function (args) {
+ alert("수정되었습니다.");
+ if (window.dialogArguments && window.dialogArguments.self) {
+ window.dialogArguments.self.location.reload();
+ } else if (window.opener) {
+ window.opener.location.reload();
+ }
+ window.close();
+ },
+ error: function (e) {
+ alert(e.responseText);
+ }
+ });
+ }
+ });
$("#btn_close").click(function () {
window.close();
@@ -126,12 +158,25 @@
data: {cmd: 'DETAIL', id: key},
success: function (json) {
var data = json;
+
+ if (data.approvalStatus.code == 'END') {
+ $('#btn_modify').hide();
+ $('#expectEndDate').hide();
+ $('#spExpectEndDate').show();
+ $('#spExpectEndDate').text(dateFormat(data.expectEndDate));
+ } else {
+ $('#btn_modify').show();
+ $('#expectEndDate').show();
+ $('#spExpectEndDate').hide();
+ }
+
$("#approvalType").text(data.approvalType === 'USER' ? "법인사용자" : "API 사용");
$("#approvalStatus").text(data.approvalStatus.description);
$("#requesterName").text(data.requester.userName);
$("#approvalSubject").text(data.approvalSubject);
$("#approvalDetail").html(data.approvalDetail);
$("#createdDate").text(data.createdDate).inputmask("9999-99-99 99:99:99.999", {'autoUnmask': true});
+ $("#expectEndDate").val(data.expectEndDate);
if (data.approvers.some(approver =>
approver.approverStatus === 'CURRENT' &&
@@ -144,7 +189,7 @@
document.getElementById("btn_app_reject").style.display = "none";
}
- if (data.approvalStatus.description === '배포실패') {
+ if (data.approvalStatus.code === 'FAILED') {
document.getElementById("btn_app_redeploy").style.display = "";
}
@@ -242,9 +287,14 @@
| 상세 내용 |
-
+ |
|
+ 예상완료일 |
+
+
+
+ |
@@ -282,6 +332,9 @@