diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
index 834877d0..f16dce34 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01010-main.jsp
@@ -288,7 +288,7 @@
var ${pageName}Control = new DatasetControl({
prefix : "levyExcl"
, prefixName : "부과제외"
- , infoSize : "lg"
+ , infoSize : "md"
, keymapper : info => info ? info.LEVY_EXCL_ID : ""
, dataGetter : obj => obj.levyExclList
, appendData : true
diff --git a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
index 1bb18e27..5a1d974f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/excl/excl01020-info.jsp
@@ -49,7 +49,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp
index 6f460339..bef2666f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02020-info.jsp
@@ -31,13 +31,13 @@
- *
- %
+ *
+ %
-
+
@@ -95,13 +95,8 @@
, prefixName : "감경"
, keymapper : info => info ? info.RDUCT_ID : ""
, dataGetter : obj => obj.rductInfo
- , urls : {
- create : wctx.url(${pageName}PrefixUrl + "/020/create.do") // 등록
- , update : wctx.url(${pageName}PrefixUrl + "/020/update.do") // 수정
- }
, formats : {
- RDUCT_YMD : dateFormat // 감경 일자
- , FFNLG_CRDN_AMT : numberFormat // 과태료 단속 금액
+ FFNLG_CRDN_AMT : numberFormat // 과태료 단속 금액
, WKSN_RDUCT_RT : numberFormat // 감경 율
, RDUCT_AMT : numberFormat // 감경 금액
}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
index dda8af9e..16ef9546 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02050-info.jsp
@@ -363,27 +363,6 @@
});
}
- // 삭제 callback
- ${pageName}${pageDataName1}Control.onRemove = (resp) => {
- let btnTitle = $("#btnRemove--${pageName}${pageDataName1}").attr("title");
- let showMessage = resp.retMessage.replace(/[S]|[F]/g, btnTitle);
-
- dialog.alert(showMessage);
-
- if (resp.saved) {
- refreshDataInfo${pageName}(); // 자료 재조회
- }
- }
-
- // 삭제
- ${pageName}${pageDataName1}Control.remove = (params) => {
- ajax.post({
- url : wctx.url(params.taskSeCd + ${pageName}${pageDataName1}PrefixUrl + "/010/remove.do")
- , data : params || {}
- , success : resp => ${pageName}${pageDataName1}Control.onRemove(resp) // 삭제 callback
- });
- }
-
// 부과제외 선택 자료 변경 이벤트
${pageName}${pageDataName2}Control.onCurrentChange = item => {
${pageName}${pageDataName2}Fields.set(item);
@@ -416,34 +395,13 @@
id : ${pageName}${pageDataName2}Control.prefixed("Dialog")
, title : dialogTitle
, content : resp
- , size : "lg"
+ , size : "md"
, onClose : () => { refreshDataInfo${pageName}(); } // callback 자료 재조회
});
}
});
}
- // 삭제 callback
- ${pageName}${pageDataName2}Control.onRemove = (resp) => {
- let btnTitle = $("#btnRemove--${pageName}${pageDataName2}").attr("title");
- let showMessage = resp.retMessage.replace(/[S]|[F]/g, btnTitle);
-
- dialog.alert(showMessage);
-
- if (resp.saved) {
- refreshDataInfo${pageName}(); // 자료 재조회
- }
- }
-
- // 삭제
- ${pageName}${pageDataName2}Control.remove = (params) => {
- ajax.post({
- url : wctx.url(params.taskSeCd + ${pageName}${pageDataName2}PrefixUrl + "/010/remove.do")
- , data : params || {}
- , success : resp => ${pageName}${pageDataName2}Control.onRemove(resp) // 삭제 callback
- });
- }
-
/**************************************************************************
* function
**************************************************************************/
@@ -534,6 +492,64 @@
});
}
+ // 감경 삭제
+ callbackRemoveRduct${pageName} = (obj) => {
+ // 서버에 전송할 data(파라미터) 생성
+ let params = {
+ callPurpose : "remove"
+ , rductId : ${pageName}${pageDataName1}Control.dataset.getValue("RDUCT_ID") // 감경 ID
+ , delYn : "Y" // 삭제 여부
+ , delRsn : obj.reason // 삭제 사유
+ };
+
+ // 삭제 url
+ ${pageName}${pageDataName1}Control.urls.remove = wctx.url(${pageName}${pageDataName1}Control.dataset.getValue("TASK_SE_CD") + ${pageName}${pageDataName1}PrefixUrl + "/010/remove.do")
+
+ ajax.post({
+ url : ${pageName}${pageDataName1}Control.urls.remove
+ , data : params
+ , success : resp => {
+ let btnTitle = $("#btnRemoveRduct--${pageName}").attr("title");
+ let showMessage = resp.retMessage.replace(/[S]|[F]/g, btnTitle);
+
+ dialog.alert(showMessage); // 메시지 출력
+
+ if (resp.saved) {
+ refreshDataInfo${pageName}(); // 자료 재조회
+ }
+ }
+ });
+ }
+
+ // 부과제외 삭제 callback
+ callbackRemoveLevyExcl${pageName} = (obj) => {
+ // 서버에 전송할 data(파라미터) 생성
+ let params = {
+ callPurpose : "remove"
+ , levyExclId : ${pageName}${pageDataName2}Control.dataset.getValue("LEVY_EXCL_ID") // 부과제외 ID
+ , delYn : "Y" // 삭제 여부
+ , delRsn : obj.reason // 삭제 사유
+ };
+
+ // 삭제 url
+ ${pageName}${pageDataName2}Control.urls.remove = wctx.url(${pageName}${pageDataName2}Control.dataset.getValue("TASK_SE_CD") + ${pageName}${pageDataName2}PrefixUrl + "/010/remove.do");
+
+ ajax.post({
+ url : ${pageName}${pageDataName2}Control.urls.remove
+ , data : params
+ , success : resp => {
+ let btnTitle = $("#btnRemoveLevyExcl--${pageName}").attr("title");
+ let showMessage = resp.retMessage.replace(/[S]|[F]/g, btnTitle);
+
+ dialog.alert(showMessage); // 메시지 출력
+
+ if (resp.saved) {
+ refreshDataInfo${pageName}(); // 자료 재조회
+ }
+ }
+ });
+ }
+
/**************************************************************************
* 초기 셋팅
**************************************************************************/
@@ -612,25 +628,26 @@
// 감경 삭제
fnRemoveRduct${pageName} = () => {
+ // 감경 ID
let rductId = ${pageName}${pageDataName1}Control.dataset.getValue("RDUCT_ID");
// 감경 ID 가 없다면.. return
if (typeof rductId == "undefined" || rductId == null || rductId == "") return;
- let params = {
- callPurpose : "remove"
- , crdnId : ${pageName}${pageDataName1}Control.dataset.getValue("CRDN_ID")
- , sggCd : ${pageName}${pageDataName1}Control.dataset.getValue("SGG_CD")
- , taskSeCd : ${pageName}${pageDataName1}Control.dataset.getValue("TASK_SE_CD")
- , rductId : rductId
- };
-
- dialog.alert({
- content : "선택한 " + ${pageName}${pageDataName1}Control.prefixName + " 내용을 삭제하시겠습니까?"
- , onOK : () => {
- ${pageName}${pageDataName1}Control.remove(params);
- }
- });
+ let callbackFuncName = "callbackRemoveRduct${pageName}";
+ let popupWidth = 640;
+ let popupHeight = 360;
+ let popupX = (window.screen.width / 2) - (popupWidth / 2);
+ let popupY= (window.screen.height / 2) - (popupHeight / 2);
+
+ window.open(
+ wctx.url("/resources/html/inputRsnDialog.html"
+ + "?callbackFuncName=" + callbackFuncName
+ + "&CALL_PURPOSE=" + "remove"
+ )
+ , "inputDelRsnDialog"
+ , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY
+ );
}
// 계고 등록
@@ -641,11 +658,11 @@
if (typeof crdnId == "undefined" || crdnId == null || crdnId == "") return;
let params = {
- callPurpose : "create"
- , crdnId : crdnId
- , sggCd : $("#sggCd--${pageNameMain}").val()
- , taskSeCd : $("#taskSeCd--${pageNameMain}").val()
- , levyExclSeCd : "2"
+ callPurpose : "create"
+ , crdnId : crdnId
+ , sggCd : $("#sggCd--${pageNameMain}").val()
+ , taskSeCd : $("#taskSeCd--${pageNameMain}").val()
+ , levyExclSeCd : "2"
};
${pageName}${pageDataName2}Control.getInfo(params);
@@ -659,11 +676,11 @@
if (typeof crdnId == "undefined" || crdnId == null || crdnId == "") return;
let params = {
- callPurpose : "create"
- , crdnId : crdnId
- , sggCd : $("#sggCd--${pageNameMain}").val()
- , taskSeCd : $("#taskSeCd--${pageNameMain}").val()
- , levyExclSeCd : "1"
+ callPurpose : "create"
+ , crdnId : crdnId
+ , sggCd : $("#sggCd--${pageNameMain}").val()
+ , taskSeCd : $("#taskSeCd--${pageNameMain}").val()
+ , levyExclSeCd : "1"
};
${pageName}${pageDataName2}Control.getInfo(params);
@@ -677,11 +694,11 @@
if (typeof levyExclId == "undefined" || levyExclId == null || levyExclId == "") return;
let params = {
- callPurpose : "update"
- , crdnId : ${pageName}${pageDataName2}Control.dataset.getValue("CRDN_ID")
- , sggCd : ${pageName}${pageDataName2}Control.dataset.getValue("SGG_CD")
- , taskSeCd : ${pageName}${pageDataName2}Control.dataset.getValue("TASK_SE_CD")
- , levyExclId : levyExclId
+ callPurpose : "update"
+ , crdnId : ${pageName}${pageDataName2}Control.dataset.getValue("CRDN_ID")
+ , sggCd : ${pageName}${pageDataName2}Control.dataset.getValue("SGG_CD")
+ , taskSeCd : ${pageName}${pageDataName2}Control.dataset.getValue("TASK_SE_CD")
+ , levyExclId : levyExclId
};
${pageName}${pageDataName2}Control.getInfo(params);
@@ -689,25 +706,26 @@
// 부과제외 삭제
fnRemoveLevyExcl${pageName} = () => {
+ // 부과제외 ID
let levyExclId = ${pageName}${pageDataName2}Control.dataset.getValue("LEVY_EXCL_ID");
// 부과제외 ID 가 없다면.. return
if (typeof levyExclId == "undefined" || levyExclId == null || levyExclId == "") return;
- let params = {
- callPurpose : "remove"
- , crdnId : ${pageName}${pageDataName2}Control.dataset.getValue("CRDN_ID")
- , sggCd : ${pageName}${pageDataName2}Control.dataset.getValue("SGG_CD")
- , taskSeCd : ${pageName}${pageDataName2}Control.dataset.getValue("TASK_SE_CD")
- , levyExclId : levyExclId
- };
-
- dialog.alert({
- content : "선택한 " + ${pageName}${pageDataName2}Control.prefixName + " 내용을 삭제하시겠습니까?"
- , onOK : () => {
- ${pageName}${pageDataName2}Control.remove(params);
- }
- });
+ let callbackFuncName = "callbackRemoveLevyExcl${pageName}";
+ let popupWidth = 640;
+ let popupHeight = 360;
+ let popupX = (window.screen.width / 2) - (popupWidth / 2);
+ let popupY= (window.screen.height / 2) - (popupHeight / 2);
+
+ window.open(
+ wctx.url("/resources/html/inputRsnDialog.html"
+ + "?callbackFuncName=" + callbackFuncName
+ + "&CALL_PURPOSE=" + "remove"
+ )
+ , "inputDelRsnDialog"
+ , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY
+ );
}
/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
index f617f53d..0bf6c8f6 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sprt/sprt02070-info.jsp
@@ -407,7 +407,7 @@
}
// 수기 수납 삭제
- fnRemoveRcvmt${pageName} = () => {
+ fnRemoveRcvmt${pageName} = (obj) => {
// 수납 ID
let rcvmtId = ${pageName}Control.dataset.getValue("RCVMT_ID");
diff --git a/src/main/webapp/resources/html/inputRsnDialog.html b/src/main/webapp/resources/html/inputRsnDialog.html
index 8e643e22..2c88c07a 100644
--- a/src/main/webapp/resources/html/inputRsnDialog.html
+++ b/src/main/webapp/resources/html/inputRsnDialog.html
@@ -67,15 +67,14 @@
var callPurpose = location.search.split("&")[1].split("=")[1]; // remove 삭제
function fnOK() {
- let obj = {};
-
- obj.reason = $("#reason").val(); // 사유
+ let obj = {
+ reason : $("#reason").val() // 사유
+ };
window.opener[callbackFuncName](obj);
window.close();
}
- // 초기 설정
$(document).ready(function() {
});