diff --git a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
index 0e3f8d2d..7e3dbe0d 100644
--- a/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/levy/levy-mapper.xml
@@ -148,6 +148,7 @@
LEFT OUTER JOIN TB_LEVY L ON (C.CRDN_ID = L.CRDN_ID AND L.DEL_YN = 'N')
WHERE C.SGG_CD = #{sggCd}
AND C.CRDN_STTS_CD BETWEEN '21' AND '31'
+ AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD ]]> '00')
AND C.TASK_SE_CD = #{taskSeCd}
diff --git a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
index 3629ee0e..aebd4a93 100644
--- a/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/sndb/sndng-mapper.xml
@@ -412,7 +412,8 @@
WHERE C.SGG_CD = #{sggCd}
AND C.TASK_SE_CD = #{taskSeCd}
AND C.CRDN_STTS_CD = #{crdnSttsCd}
- AND (CC.CVLCPT_PRCS_CD ]]> '00' OR CC.CVLCPT_PRCS_CD IS NULL)
+ AND C.CRDN_STTS_CD BETWEEN '21' AND '31'
+ AND (CC.CVLCPT_PRCS_CD IS NULL OR CC.CVLCPT_PRCS_CD ]]> '00')
AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom}
diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp
index 20ba8927..21b5f20a 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy01010-main.jsp
@@ -351,6 +351,32 @@
fn_securityModeToggle($("#securityMode--top").is(":checked"));
}
+ createRductLevy${pageName} = (obj) => {
+ let btnTitle = $("#btnCreateSndngLink--${pageName}").attr("title");
+
+ // 선택된 자료의 발송 상세 ID 추가
+ let selected = ${pageName}Control.dataset.getKeys("selected");
+
+ if (selected.length < 1) return;
+
+ let info = {
+ crdnIDs = selected.join(","); // 단속 IDs
+ , sggCd : $("#sggCd--${pageName}").val() // 시군구 코드
+ , taskSeCd : $("#taskSeCd--${pageName}").val() // 업무 구분 코드
+ , sndngYmd : obj.sndngYmd // 부과 일자
+ , dudtYmd : obj.dudtYmd // 납기 일자
+ };
+
+// ajax.post({
+// url : wctx.url("/" + info.taskSeCd + ${pageName}PrefixUrl + "/080/createSndngLink.do")
+// , data : info || {}
+// , success : resp => {
+// let showMessage = resp.retMessage.replace(/[S]|[F]/g, btnTitle);
+// dialog.alert(showMessage);
+// }
+// });
+ }
+
/**************************************************************************
* 초기 설정
**************************************************************************/
@@ -404,15 +430,9 @@
$("#frmSearch--${pageName} input[name='taskSeCd'][value='" + taskSeCd + "']").prop("checked", true);
// 최고 관리자 경우 업무구분을 선택할 수 있도록 하자.
-// if () {
-// $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) {
-// $(this).prop("disabled", "false");
-// });
-// } else {
- $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) {
- $(this).prop("disabled", "true");
- });
-// }
+ $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) {
+ $(this).prop("disabled", "true");
+ });
// 달력 초기화
initDatepicker("frmSearch--${pageName}");
@@ -472,7 +492,29 @@
// 감경부과등록 버튼 이벤트
fnCreateRductLevy${pageName} = () => {
-
+ // validate 확인
+ if (!customValidate($("#frmEdit--${pageName}").find("input, select, textarea"))) return;
+
+ let callbackFuncName = "createRductLevy${pageName}";
+ let sndngYmd = DateUtil.getDateDay().date;
+ let dudtYmd = DateUtil.getDateDay(20).date;
+
+ let popupWidth = 480;
+ let popupHeight = 480;
+
+ let popupX = (window.screen.width / 2) - (popupWidth / 2);
+ let popupY= (window.screen.height / 2) - (popupHeight / 2);
+
+ window.open(
+ wctx.url("/resources/html/inputDateDialog.html"
+ + "?callbackFuncName=" + callbackFuncName
+ + "&CALL_PURPOSE=" + "levy"
+ + "&SNDNG_YMD=" + sndngYmd
+ + "&DUDT_YMD=" + dudtYmd
+ )
+ , "inputEPostDateDialog"
+ , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY
+ );
}
/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp
index 86dcc82b..70be11ef 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/sndb/sndb01080-info.jsp
@@ -247,7 +247,7 @@
ajax.post({
url : wctx.url("/" + params.taskSeCd + ${pageName}PrefixUrl + "/updateNxrpMtchg.do")
, data : params || {}
- , success : resp => { }
+ , success : resp => {}
});
}
@@ -275,7 +275,6 @@
, data : info || {}
, success : resp => {
let showMessage = resp.retMessage.replace(/[S]|[F]/g, btnTitle);
-
dialog.alert(showMessage);
}
});
@@ -405,10 +404,12 @@
window.open(
wctx.url("/resources/html/inputDateDialog.html"
+ "?callbackFuncName=" + callbackFuncName
+ + "&CALL_PURPOSE=" + "post"
+ "&SNDNG_YMD=" + ${pageName}Control.dataset.getValue("SNDNG_YMD")
- + "&DUDT_YMD=" + ${pageName}Control.dataset.getValue("DUDT_YMD"))
- ,"inputEPostDateDialog"
- ,'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY
+ + "&DUDT_YMD=" + ${pageName}Control.dataset.getValue("DUDT_YMD")
+ )
+ , "inputEPostDateDialog"
+ , 'status=no, height=' + popupHeight + ', width=' + popupWidth + ', left='+ popupX + ', top='+ popupY
);
}
diff --git a/src/main/webapp/resources/html/inputDateDialog.html b/src/main/webapp/resources/html/inputDateDialog.html
index a8169d51..c16272b3 100644
--- a/src/main/webapp/resources/html/inputDateDialog.html
+++ b/src/main/webapp/resources/html/inputDateDialog.html
@@ -47,8 +47,8 @@
-