+ 비부과 등록
@@ -360,7 +361,7 @@ $(document).ready(function(){
//단속사진검사 datasetControl 인스턴스
$P.photoInspectionControl = new DatasetControl({
prefix:"photoInspection", prefixName:"종합", infoSize:"xl", urls : { load : "", getInfo : "" },
- keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true,
+ keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:false,
formats: {
CRDN_YMD_TM : datetimeFormat,
CRDN_INPT_SE_CD : FIM003,
@@ -391,7 +392,7 @@ $(document).ready(function(){
/**************************************************************************
* DatasetControl.on
**************************************************************************/
- $P.photoInspectionControl.onDatasetChange = obj => {
+ $P.photoInspectionControl.onDatasetChange = (obj) => {
$P.renderInspectionDataList("photoInspection");
var prefix = obj.infoPrefix;
@@ -404,7 +405,7 @@ $(document).ready(function(){
};
- $P.sameVehicleControl.main.onDatasetChange = obj => {
+ $P.sameVehicleControl.main.onDatasetChange = (obj) => {
$P.renderInspectionDataList("sameVehicleInspectionMain");
var prefix = obj.infoPrefix;
@@ -418,7 +419,7 @@ $(document).ready(function(){
};
- $P.sameVehicleControl.sub.onDatasetChange = obj => {
+ $P.sameVehicleControl.sub.onDatasetChange = (obj) => {
$P.renderInspectionDataList("sameVehicleInspectionSub");
};
@@ -426,7 +427,7 @@ $(document).ready(function(){
* pageObject.function
**************************************************************************/
$P.fnReset = () => {
- $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
+ $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-7).date);
$('#schCrdnYmdTo--${pageName}').datepicker('setDate', new Date());
$P.photoInspectionControl.setData([]);
$P.sameVehicleControl.main.setData([]);
@@ -455,7 +456,7 @@ $(document).ready(function(){
switch ($P.currentDisplay) {
case "photoInspection":
$P.photoInspectionControl.query = $P.getParams();
- $P.photoInspectionControl.load(1);
+ $P.photoInspectionControl.load(0);
break;
case "sameVehicleInspection":
$P.sameVehicleControl.main.query = $P.getParams();
@@ -520,6 +521,10 @@ $(document).ready(function(){
}
}
+ $P.openLevyExclPop = () => {
+
+ };
+
$P.renderInspectionDataList = (renderDataType) => {
switch (renderDataType) {
@@ -566,7 +571,13 @@ $(document).ready(function(){
$P.getParams = () => {
var formFields = new FimsFormFields("#frmSearch--${pageName}");
var data = formFields.get();
- data.fetchSize = 30;
+
+ if($P.currentDisplay == "sameVehicleInspection"){
+ data.fetchSize = 30;
+ } else {
+ data.fetchSize = 0;
+ }
+
return data;
}
@@ -594,9 +605,8 @@ $(document).ready(function(){
});
$('#btnSearch--${pageName}').on('click', () => $P.searchInspectionList()); //검색버튼
+ $("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop());
- //스크롤 이벤트 추가(사진검사)
- $("#photoInspection-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
//스크롤 이벤트 추가(동일차량검사)
$("#sameVehicleInspectionMain-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
index 868af3c3..fda9b82f 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp
@@ -9,9 +9,9 @@
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
index 7bac519e..f73b467d 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp
@@ -9,9 +9,9 @@