diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml index 74accd3e..1a54bdbd 100644 --- a/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml +++ b/src/main/resources/sql/mapper/fims/crdn/crdn-list-mapper.xml @@ -127,22 +127,30 @@ WHERE C.DEL_YN = 'N' AND C.CRDN_YMD = ]]> #{schCrdnYmdFrom} AND C.CRDN_YMD #{schCrdnYmdTo} - - - AND SUBSTR(C.REG_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.REG_DT,1,8) #{schDateTo} - - - AND SUBSTR(C.MDFCN_DT,1,8) = ]]> #{schDateFrom} - AND SUBSTR(C.MDFCN_DT,1,8) #{schDateTo} - - AND C.CRDN_STTS_CD = #{crdnSttsCd} AND CA.TOWNG_YN = #{towngYn} + + + AND C.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') + AND C.REG_DT CONCAT(#{schRegDateTo},'235959') + + + AND C.MDFCN_DT = ]]> CONCAT(#{schRegDateFrom},'000000') + AND C.MDFCN_DT CONCAT(#{schRegDateTo},'235959') + + + + + AND C.RGTR = #{schRgtrCd} + + + AND C.MDFR = #{schRgtrCd} + + @@ -241,6 +249,24 @@ SELECT C.CRDN_ID AND IFNULL(CA.OVTIME_PRTTN_YN,'N') = 'N' + + + AND C.REG_DT =]]> CONCAT(#{schRegDateFrom},'000000') + AND C.REG_DT CONCAT(#{schRegDateTo},'235959') + + + AND C.MDFCN_DT = ]]> CONCAT(#{schRegDateFrom},'000000') + AND C.MDFCN_DT CONCAT(#{schRegDateTo},'235959') + + + + + AND C.RGTR = #{schRgtrCd} + + + AND C.MDFR = #{schRgtrCd} + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp index 50754a79..5b70011f 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp @@ -28,8 +28,8 @@ - - 업무구분 + + 업무구분 @@ -42,7 +42,7 @@ - 단속일자 + 단속일자 - - 단속구분 + + 단속구분 전체 @@ -64,18 +64,18 @@ - - 차량번호 + + 차량번호 - + - 단속건수 + 단속건수 ~ - + 서손자료제외 @@ -98,27 +98,28 @@ - - - - 상세검색 - - + + + + + + + + + + + + 상세검색 + + + - - - - - - - - - 자료상태 + + 자료상태 전체 @@ -126,23 +127,32 @@ - - - 등록일자 - 수정일자 - - - - + + + + 등록일자 + 수정일자 + + + + ~ - - - - + + + + + + + 등록자 + 수정자 + + + + 검색 + @@ -261,7 +271,7 @@ - @@ -297,10 +307,10 @@ - + - @@ -360,12 +370,9 @@ - - - @@ -392,8 +399,8 @@ $(document).ready(function(){ $P.photoInspectionControl = new DatasetControl({ dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.CRDN_ID : "", - urls : { - load : "" + urls : { + load : "" }, formats: { CRDN_YMD_TM : datetimeFormat, @@ -412,22 +419,22 @@ $(document).ready(function(){ $P.sameVehicleMainControl = new DatasetControl({ dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.CRDN_ID_LIST : "", - urls : { - load : "" + urls : { + load : "" }, - formats: { - CRDN_CNT : numberFormat, - FFNLG_CRDN_AMT : numberFormat + formats: { + CRDN_CNT : numberFormat, + FFNLG_CRDN_AMT : numberFormat } }); $P.sameVehicleMainControl.defaultFetchSize = FETCH_XS; $P.sameVehicleMainControl.untilPageNum = 0; $P.sameVehicleMainControl.beforeCurrent = null; - + $P.sameVehicleSubControl = new DatasetControl({ dataGetter : obj => obj["List"], keymapper : info => info ? info.CRDN_ID : "", - urls : { + urls : { load : "" }, formats: { @@ -437,7 +444,7 @@ $(document).ready(function(){ FFNLG_CRDN_AMT : numberFormat } }); - + $P.photoInspectionControl.getNext = (key) => { var ds = $P.photoInspectionControl.dataset.getDataset(); @@ -457,7 +464,7 @@ $(document).ready(function(){ var t = $P.getGridTemplate("photoInspection"); var trs = Apply.fromDataset.getTbody($P.photoInspectionControl.dataset, t.found, t.notFound, t.replacer); $P.renderInspectionDataList(obj["Total"], $P.photoInspectionControl.dataset.length, trs, "photoInspection"); - + Apply.fromDataset.paging($P.photoInspectionControl.dataset, obj, "photoInspectionPaging--${pageName}"); }; @@ -475,7 +482,7 @@ $(document).ready(function(){ nextDataKey = nextData != null ? nextData.CRDN_ID : ""; nextDataVhrno = nextData != null ? nextData.VHRNO : ""; } - + $P.showPhoto(dataKey,nextDataKey,curDataVhrno,nextDataVhrno); } @@ -484,14 +491,14 @@ $(document).ready(function(){ var t = $P.getGridTemplate("sameVehicleInspectionMain"); var trs = Apply.fromDataset.getTbody($P.sameVehicleMainControl.dataset, t.found, t.notFound, t.replacer); $P.renderInspectionDataList(obj["Total"], $P.sameVehicleMainControl.dataset.length, trs, "sameVehicleInspectionMain"); - + Apply.fromDataset.paging($P.sameVehicleMainControl.dataset, obj, "sameVehicleInspectionMainPaging--${pageName}"); }; $P.sameVehicleMainControl.dataset.onCurrentChange = (dataItem) => { Apply.fromDataset.currentRow($P.sameVehicleMainControl.dataset, dataItem, $("#sameVehicleInspectionMainTbody--${pageName}")[0]); if(dataItem){ - $P.searchDetailInspectionDataList(dataItem.data["CRDN_ID_LIST"]); + $P.searchDetailInspectionDataList(dataItem.data["CRDN_ID_LIST"]); } else { $("#sameVehicleInspectionSubTbody--${pageName}").html(""); } @@ -519,12 +526,13 @@ $(document).ready(function(){ searchForm.find("select").each(function(){ $(this).find("option:eq(0)").prop("selected", true); }); $("#byOutput--${pageName}").val("동적 검색"); + $("#schRgtrNm--${pageName}").prop("readonly", true); // 사용자 이름 $('#schCrdnYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-7).date); $('#schCrdnYmdTo--${pageName}').datepicker('setDate', TODAY()); $P.photoInspectionControl.dataset.setData([]); $P.sameVehicleMainControl.dataset.setData([]); }; - + $P.fnResetAndChangeBiz = (taskSeCd) => { $P.fnReset(); $P.photoInspectionControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn02/020/list.do"); @@ -555,7 +563,7 @@ $(document).ready(function(){ return data; } - + $P.searchInspectionList = () => { switch ($P.currentDisplay) { case "photoInspection": @@ -571,7 +579,7 @@ $(document).ready(function(){ default: break; } } - + $P.searchDetailInspectionDataList = (dataKey) => { $P.sameVehicleSubControl.query = {}; $P.sameVehicleSubControl.query.inspectionDataType = "sameVehicleSub"; @@ -591,7 +599,7 @@ $(document).ready(function(){ default: break; } } - + $P.refreshInspectionList = () => { switch ($P.currentDisplay) { case "photoInspection": @@ -601,22 +609,22 @@ $(document).ready(function(){ key : $P.photoInspectionControl.dataset.getCurrent()["CRDN_ID"], index : $P.photoInspectionControl.dataset.getCurrent()["ROW_NUM"] - 1 }; - + Apply.fromDatasetControl.load($P.photoInspectionControl, 1).then((resp)=>{ Apply.toDataset.set($P.photoInspectionControl.dataset, resp); $P.photoInspectionControl.dataset.onDatasetChange(resp); - + if($P.photoInspectionControl.untilPageNum != 0){ $P.photoInspectionControl.query.fetchSize = $P.photoInspectionControl.defaultFetchSize; $P.photoInspectionControl.query.pageNum = $P.photoInspectionControl.untilPageNum; $P.photoInspectionControl.untilPageNum = 0; } - + if($P.photoInspectionControl.beforeCurrent != null){ var beforeCurrentKey = $P.photoInspectionControl.beforeCurrent.key; var beforeCurrentIndex = $P.photoInspectionControl.beforeCurrent.index; $P.photoInspectionControl.beforeCurrent = null; - + if(!$P.photoInspectionControl.dataset.empty){ var info = $P.photoInspectionControl.dataset.getData(beforeCurrentKey); @@ -630,9 +638,9 @@ $(document).ready(function(){ } else { info = $P.photoInspectionControl.dataset.getDataset()[beforeCurrentIndex]; } - + $P.photoInspectionControl.dataset.setCurrent(info["CRDN_ID"], true); - + } } } @@ -645,17 +653,17 @@ $(document).ready(function(){ key : $P.sameVehicleMainControl.dataset.getCurrent()["CRDN_ID_LIST"], index : $P.sameVehicleMainControl.dataset.getCurrent()["ROW_NUM"] - 1 }; - + Apply.fromDatasetControl.load($P.sameVehicleMainControl, 1).then((resp)=>{ Apply.toDataset.set($P.sameVehicleMainControl.dataset, resp); $P.sameVehicleMainControl.dataset.onDatasetChange(resp); - + if($P.sameVehicleMainControl.untilPageNum != 0){ $P.sameVehicleMainControl.query.fetchSize = $P.sameVehicleMainControl.defaultFetchSize; $P.sameVehicleMainControl.query.pageNum = $P.sameVehicleMainControl.untilPageNum; $P.sameVehicleMainControl.untilPageNum = 0; } - + if($P.sameVehicleMainControl.beforeCurrent != null){ var beforeCurrentKey = $P.sameVehicleMainControl.beforeCurrent.key; var beforeCurrentIndex = $P.sameVehicleMainControl.beforeCurrent.index; @@ -679,14 +687,14 @@ $(document).ready(function(){ } } - + }); - + break; default: break; } } - + $P.fnExcelDown = async() => { if($P.currentDisplay == "photoInspection"){ if($P.photoInspectionControl.dataset.empty){ @@ -708,10 +716,10 @@ $(document).ready(function(){ alert("조회된 자료가 없습니다."); return; } - + var excelTarget = await dialog2("저장할 자료를 선택하세요.","", [{key:"main",value:"단속건수 엑셀저장"},{key:"sub",value:"상세내역 엑셀저장"},{key:"cancel",value:"취소"}]); - + if(excelTarget == "main"){ var cellDefs = getCellDefs( @@ -735,14 +743,14 @@ $(document).ready(function(){ } } - + $P.getGridTemplate = (gridType) => { var notFound; var found; var replacer; - + switch (gridType) { - case "photoInspection": + case "photoInspection": notFound = [document.getElementById("photoInspectionNotFound--${pageName}").innerHTML] found = document.getElementById("photoInspectionRow--${pageName}").innerHTML; replacer = (str, dataItem) => str @@ -750,30 +758,30 @@ $(document).ready(function(){ .replace(/{ondblclick}/gi, "pageObject['${pageName}'].dblclickInspectionDataList('" + dataItem.getValue("CRDN_ID") + "','photoInspection');"); break; - case "sameVehicleInspectionMain": + case "sameVehicleInspectionMain": notFound = [document.getElementById("sameVehicleInspectionMainNotFound--${pageName}").innerHTML]; found = document.getElementById("sameVehicleInspectionMainRow--${pageName}").innerHTML; replacer = (str, dataItem) => str .replace(/{onclick}/gi, "pageObject['${pageName}'].clickInspectionDataList('" + dataItem.getValue("CRDN_ID_LIST") + "','sameVehicleInspectionMain');"); break; - case "sameVehicleInspectionSub": + case "sameVehicleInspectionSub": notFound = [document.getElementById("sameVehicleInspectionSubNotFound--${pageName}").innerHTML] found = document.getElementById("sameVehicleInspectionSubRow--${pageName}").innerHTML; replacer = (str, dataItem) => str .replace(/{onclick}/gi, "pageObject['${pageName}'].clickInspectionDataList('" + dataItem.getValue("CRDN_ID") + "','sameVehicleInspectionSub');") .replace(/{ondblclick}/gi, "pageObject['${pageName}'].dblclickInspectionDataList('" + dataItem.getValue("CRDN_ID") + "','sameVehicleInspectionSub');"); - + break; } - + return { found : found, notFound : notFound, replacer : replacer }; } - + $P.renderInspectionDataList = (total, listLength, trs, renderDataType) => { switch (renderDataType) { @@ -802,9 +810,9 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); } - + $P.clickInspectionDataList = (dataKey, gridType) => { - + switch (gridType) { case "photoInspection": @@ -812,7 +820,7 @@ $(document).ready(function(){ $("#photoInspectionTbody--${pageName}").setCurrentRow(dataKey); Apply.toDataset.current($P.photoInspectionControl.dataset, dataKey); } - + var curDataVhrno = $P.photoInspectionControl.dataset.getData(dataKey)["VHRNO"]; var nextData = $P.photoInspectionControl.getNext(dataKey); var nextDataKey = nextData != null ? nextData.CRDN_ID : ""; @@ -824,9 +832,9 @@ $(document).ready(function(){ return; } $("#sameVehicleInspectionMainTbody--${pageName}").setCurrentRow(dataKey); - + Apply.toDataset.current($P.sameVehicleMainControl.dataset, dataKey); - + $P.searchDetailInspectionDataList(dataKey); break; @@ -835,7 +843,7 @@ $(document).ready(function(){ return; } $("#sameVehicleInspectionSubTbody--${pageName}").setCurrentRow(dataKey); - + Apply.toDataset.current($P.sameVehicleSubControl.dataset, dataKey); break; } @@ -868,7 +876,7 @@ $(document).ready(function(){ } $P.showPhoto = (dataKey, nextDataKey, curDataVhrno, nextDataVhrno) => { - + if(dataKey == ""){ $("#curDataVhrno--${pageName}").html(""); $("#nextDataVhrno--${pageName}").html(""); @@ -876,10 +884,10 @@ $(document).ready(function(){ $("#nextDataFiles--${pageName}").html(""); return; } - + $("#curDataVhrno--${pageName}").html(curDataVhrno); $("#nextDataVhrno--${pageName}").html(nextDataVhrno); - + ajax.get({ url:"file/list.do", data: { @@ -909,7 +917,7 @@ $(document).ready(function(){ } }); } - + $P.openLevyExclPop = (levyExclSeCd) => { var info = ""; @@ -942,8 +950,8 @@ $(document).ready(function(){ if((typeof resp) != "string"){ dialog.alert({ content : resp.message, - init : function(){ - focusClose(); + init : function(){ + focusClose(); } }); return; @@ -988,8 +996,8 @@ $(document).ready(function(){ if((typeof resp) != "string"){ dialog.alert({ content : resp.message, - init : function(){ - focusClose(); + init : function(){ + focusClose(); } }); return; @@ -1011,12 +1019,39 @@ $(document).ready(function(){ if($("#levyExclDialog--${pageName}").length > 0){ dialog.close("levyExclDialog--${pageName}"); } - + if(saved){ $P.refreshInspectionList(); } } + // 사용자검색 callback + $P.callbackFindUser = (userId, userNm) => { + $("#schRgtrCd--${pageName}").val(userId); // 사용자 ID + $("#schRgtrNm--${pageName}").val(userNm); // 사용자 명 + } + + // 사용자검색 버튼 클릭 이벤트 + $P.fnGetFindUser = () => { + let params = { + openerPageName: "${pageName}" + , callbackFuncName: "pageObject['${pageName}']['callbackFindUser']" + } + + ajax.get({ + url: wctx.url("/user/user02/010/main.do") + , data: params || {} + , success: resp => { + dialog.open({ + id: "userDialog" + , title: "사용자 검색" + , content: resp + , size: "lg" + , init: () => { setDialogZindex(); } + }); + } + }); + } /************************************************************************** * element.on @@ -1043,12 +1078,11 @@ $(document).ready(function(){ $('#btnSearch--${pageName}').on('click', () => $P.searchInspectionList()); //검색버튼 // 동적검색에서 엔터(Enter) 키를 누르면 검색한다. $("#term--${pageName}").onEnterPress($P.searchInspectionList); - - $('#btnExcel--${pageName}').on('click', () => $P.fnExcelDown()); + $('#btnExcel--${pageName}').on('click', () => $P.fnExcelDown()); + $("#btnFindUser--${pageName}").on("click", () => $P.fnGetFindUser()); // 사용자 검색 $("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop("1")); - fnMakeResizableTable($("#photoInspection-responsive--${pageName}")[0]); fnMakeResizableTable($("#sameVehicleInspectionMain-responsive--${pageName}")[0]); fnMakeResizableTable($("#sameVehicleInspectionSub-responsive--${pageName}")[0]); diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp index b281c793..b7d885f4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp @@ -4,15 +4,15 @@ - + 초기화 - 검색 - 엑셀 @@ -20,39 +20,39 @@ - 단속일자 + 단속일자 - ~ - - + - + - - + + - - 개별 확인 자료로 수정 @@ -76,7 +76,7 @@ style="width: 200px;">차량번호 법정동 - 잔액 - - + + @@ -162,11 +162,11 @@ $(document).ready(function(){ * Dataset.on **************************************************************************/ $P.crdnControl.dataset.onDatasetChange = (obj) => { - + var t = $P.getGridTemplate(); var trs = Apply.fromDataset.getTbody($P.crdnControl.dataset, t.found, t.notFound, t.replacer); $P.renderCrdnList(obj["Total"], $P.crdnControl.dataset.length, trs); - + Apply.fromDataset.paging($P.crdnControl.dataset, obj, "crdnPaging--${pageName}"); }; @@ -190,7 +190,7 @@ $(document).ready(function(){ $('#schCrdnYmdTo--${pageName}').datepicker('setDate', TODAY()); $P.crdnControl.dataset.setData([]); } - + $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); @@ -199,7 +199,7 @@ $(document).ready(function(){ return data; } - + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); @@ -208,81 +208,81 @@ $(document).ready(function(){ $P.scrollCrdnList = () => { $P.crdnControl.load($P.crdnControl.query.pageNum + 1); } - + $P.refreshCrdnList = () => { $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; - + Apply.fromDatasetControl.load($P.crdnControl, 1).then((resp)=>{ Apply.toDataset.set($P.crdnControl.dataset, resp); $P.crdnControl.dataset.onDatasetChange(resp); - + if($P.crdnControl.untilPageNum != 0){ $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; $P.crdnControl.untilPageNum = 0; } - + if($P.crdnControl.beforeCurrent != null){ var beforeCurrentKey = $P.crdnControl.beforeCurrent.key; var beforeCurrentIndex = $P.crdnControl.beforeCurrent.index; $P.crdnControl.beforeCurrent = null; - + if(!$P.crdnControl.dataset.empty){ var info = $P.crdnControl.dataset.getData(beforeCurrentKey); - + if(info != null){ $P.crdnControl.dataset.setCurrent(beforeCurrentKey,true); } else { - + if(beforeCurrentIndex > ($P.crdnControl.dataset.length - 1)){ info = $P.crdnControl.dataset.getDataset()[$P.crdnControl.dataset.length - 1]; } else { info = $P.crdnControl.dataset.getDataset()[beforeCurrentIndex]; } - + $P.crdnControl.dataset.setCurrent(info["CRDN_ID"],true); } } } - + }); } - + $P.fnExcelDown = () => { if($P.crdnControl.dataset.empty){ alert("조회된 자료가 없습니다."); return; } - - var cellDefs = getCellDefs($("#crdnTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + + var cellDefs = getCellDefs($("#crdnTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#crdnRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.crdnControl.query.cellDefs = cellDefs; - + $P.crdnControl.download(); } - + $P.getGridTemplate = () => { - + var notFound = [document.getElementById("crdnNotFound--${pageName}").innerHTML]; var found = document.getElementById("crdnRow--${pageName}").innerHTML; var replacer = (str, dataItem) => str .replace(/{onclick}/gi, "pageObject['${pageName}'].clickCrdnList('" + dataItem.getValue("CRDN_ID") + "');") .replace(/{ondblclick}/gi, "pageObject['${pageName}'].dblclickCrdnList('" + dataItem.getValue("CRDN_ID") + "');"); - + return { found : found, notFound : notFound, replacer : replacer }; } - + $P.renderCrdnList = (total, listLength, trs) => { var noMore = (total == listLength); var initScroll = ($P.crdnControl.query.pageNum < 2) && ($P.crdnControl.untilPageNum == 0); - + $("#table-responsive--${pageName}")[0].changeContent(trs, initScroll, noMore); //보안모드 @@ -295,7 +295,7 @@ $(document).ready(function(){ $P.crdnControl.untilPageNum = 0; } } - + $P.clickCrdnList = (dataKey) => { if(dataKey == ""){ return; @@ -330,18 +330,18 @@ $(document).ready(function(){ $P.save = () => { if(!$P.crdnControl.dataset.getCurrent()) { - dialog.alert({ + dialog.alert({ content : "선택된 자료가 없습니다.", - init : function(){ - focusClose(); + init : function(){ + focusClose(); } }); return; }; - dialog.alert({ + dialog.alert({ content : "현 자료를 장애차량 확인된 자료로 변경하시겠습니까?", - init : function(){ + init : function(){ focusOK(); }, onOK : () => { @@ -350,13 +350,13 @@ $(document).ready(function(){ url : $P.crdnControl.urls.update, data : info, success : (resp) => { - $P.saveCallback(resp); + $P.saveCallback(resp); } }); } }); } - + $P.saveCallback = (resp) => { if (resp.saved) { dialog.alert({ @@ -367,7 +367,7 @@ $(document).ready(function(){ }); } } - + /************************************************************************** * element.on **************************************************************************/ @@ -376,10 +376,10 @@ $(document).ready(function(){ // 동적검색에서 엔터(Enter) 키를 누르면 검색한다. $("#term--${pageName}").onEnterPress($P.searchCrdnList); $('#btnExcel--${pageName}').on('click', () => $P.fnExcelDown()); - + fnMakeResizableTable($("#table-responsive--${pageName}")[0]); fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollCrdnList); - + $('#btnUpdateToConfirmData--${pageName}').on('click', () => $P.save()); /************************************************************************** @@ -392,7 +392,7 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - + }); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp index d187681d..f4b5061d 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp @@ -4,12 +4,12 @@ - + - 초기화 - 검색 @@ -18,7 +18,7 @@ - 업무구분 + 업무구분 @@ -31,8 +31,8 @@ - 등록일자 - 등록일자 + @@ -42,22 +42,22 @@ - - 단속 파일 등록 - 단속 수기 등록 - @@ -101,7 +101,7 @@ - + @@ -111,22 +111,22 @@ **************************************************************************/ var FIM003 = new CommonCodes(${FIM003}); var FIM026 = new CommonCodes(${FIM026}); - + pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + /************************************************************************** * DatasetControl **************************************************************************/ $P.crdnControl = new DatasetControl({ dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.CRDN_ID : "", - urls : { - load : "" + urls : { + load : "" }, formats: { CRDN_INPT_SE_CD : FIM003, @@ -137,7 +137,7 @@ $(document).ready(function(){ $P.crdnControl.defaultFetchSize = FETCH_XS; $P.crdnControl.untilPageNum = 0; $P.crdnControl.beforeCurrent = null; - + $P.crdnControl.urls.newInfoByFile = ""; $P.crdnControl.urls.newInfoByHand = ""; @@ -150,7 +150,7 @@ $(document).ready(function(){ $P.renderCrdnList(obj["Total"], $P.crdnControl.dataset.length, trs); Apply.fromDataset.paging($P.crdnControl.dataset, obj, "crdnPaging--${pageName}"); - + }; $P.crdnControl.dataset.onCurrentChange = (dataItem) => { @@ -164,35 +164,35 @@ $(document).ready(function(){ $("#regDt--${pageName}").datepicker('setDate', TODAY()); $P.crdnControl.dataset.setData([]); } - + $P.fnResetAndChangeBiz = (taskSeCd) => { $P.fnReset(); $P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn05/010/list.do"); $P.crdnControl.urls.newInfoByFile = wctx.url("/"+taskSeCd+"/crdn/crdn05/020/info.do"); $P.crdnControl.urls.newInfoByHand = wctx.url("/"+taskSeCd+"/crdn/crdn05/030/info.do"); - + switch(taskSeCd){ - case "PVS" : + case "PVS" : case "BPV" : - case "DPV" : + case "DPV" : case "ECA" : case "DVS" : $("#btnInsertByFile--${pageName}").show(); break; case "PES" : - default : + default : $("#btnInsertByFile--${pageName}").hide(); break; } } - + $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); data.fetchSize = $P.crdnControl.defaultFetchSize; return data; } - + $P.searchCrdnList = () => { $P.crdnControl.query = $P.getParams(); $P.crdnControl.load(1); @@ -201,13 +201,13 @@ $(document).ready(function(){ $P.scrollCrdnList = () => { $P.crdnControl.load($P.crdnControl.query.pageNum + 1); } - + $P.refreshCrdnList = () => { $P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum; $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum; $P.crdnControl.load(1); } - + $P.getGridTemplate = () => { var notFound = [document.getElementById("crdnNotFound--${pageName}").innerHTML]; @@ -222,17 +222,17 @@ $(document).ready(function(){ replacer : replacer }; } - + $P.renderCrdnList = (total, listLength, trs) => { - + var noMore = (total == listLength); var initScroll = ($P.crdnControl.query.pageNum < 2) && ($P.crdnControl.untilPageNum == 0); - + $("#table-responsive--${pageName}")[0].changeContent(trs, initScroll, noMore); //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - + if($P.crdnControl.untilPageNum != 0){ $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize; $P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum; @@ -249,7 +249,7 @@ $(document).ready(function(){ $P.crdnControl.dataset.setCurrent(dataKey); Apply.toDataset.current($P.crdnControl.dataset, dataKey); } - + $P.newInfo = (type) => { var url = ""; if(type == "file") url = $P.crdnControl.urls.newInfoByFile; @@ -278,7 +278,7 @@ $(document).ready(function(){ } }); }; - + /************************************************************************** * element.on **************************************************************************/ @@ -286,10 +286,10 @@ $(document).ready(function(){ $("#btnSearch--${pageName}").on("click", () => $P.searchCrdnList()); $("#btnInsertByFile--${pageName}").on('click', () => { $P.newInfo("file"); }); $("#btnInsertByHand--${pageName}").on('click', () => { $P.newInfo("hand"); }); - + fnMakeResizableTable($("#table-responsive--${pageName}")[0]); fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollCrdnList); - + /************************************************************************** * 초기화 **************************************************************************/ @@ -300,9 +300,10 @@ $(document).ready(function(){ $P.fnResetAndChangeBiz(defaultBizValue); //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - + $("#frmSearch--${pageName} input[name='taskSeCd']").each(function(i) { $(this).prop("disabled", "true"); }); }); + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp index 0195c04e..8f96bcab 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp @@ -25,8 +25,8 @@ - - 업무구분 + + 업무구분 @@ -39,21 +39,21 @@ - 단속일자 + 단속일자 - ~ - - 자료출처 + 자료출처 전체 @@ -62,62 +62,31 @@ - 차량번호 + 차량번호 - - - 등록일자 - 수정일자 - - - - - ~ - - - - - - - + + + - - - - - 상세검색 - - - + + + + + + 상세검색 + + + - - 자료상태 - - 전체 - - ${item.value} - - - - - - - - - + - 견인 + 견인여부 전체 @@ -130,6 +99,41 @@ + + 자료상태 + + 전체 + + ${item.value} + + + + + + + 등록일자 + 수정일자 + + + + + ~ + + + + + + + + 등록자 + 수정자 + + + + 검색 + @@ -141,12 +145,12 @@ - + - ☑ 세외수입 전송 @@ -205,7 +209,7 @@ {ROW_NUM} - {CRDN_INPT_SE_CD} @@ -258,17 +262,12 @@ - - - - - + diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp index ac22238c..ee7b9916 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp @@ -22,13 +22,13 @@ - + 차량번호 - + 삭제여부 @@ -43,17 +43,17 @@ - - 면제차량 등록 - 면제차량 삭제 - 면제차량 수정이력 @@ -113,12 +113,9 @@ - - - @@ -148,20 +145,20 @@ /************************************************************************** * Global Variable **************************************************************************/ - + pageObject["${pageName}"] = {}; $(document).ready(function(){ var $P = pageObject["${pageName}"]; - + /************************************************************************** * DatasetControl **************************************************************************/ $P.exmptnVhclControl = new DatasetControl({ dataGetter : obj => obj["List"], appendData:true, keymapper : info => info ? info.EXMPTN_VHCL_ID : "", - urls : { + urls : { load : wctx.url("/BPV/crdn/crdn08/010/list.do"), remove : wctx.url("/BPV/crdn/crdn08/010/remove.do"), newInfo : wctx.url("/BPV/crdn/crdn08/020/info.do"), @@ -178,7 +175,7 @@ $(document).ready(function(){ $P.exmptnVhclControl.defaultFetchSize = FETCH_XS; $P.exmptnVhclControl.untilPageNum = 0; $P.exmptnVhclControl.beforeCurrent = null; - + /************************************************************************** * Dataset.on **************************************************************************/ @@ -193,7 +190,7 @@ $(document).ready(function(){ $P.exmptnVhclControl.dataset.onCurrentChange = (dataItem) => { Apply.fromDataset.currentRow($P.exmptnVhclControl.dataset, dataItem, $("#exmptnVhclTbody--${pageName}")[0]); } - + /************************************************************************** * pageObject.function **************************************************************************/ @@ -201,10 +198,10 @@ $(document).ready(function(){ var searchForm = $("#frmSearch--${pageName}"); searchForm.find("input[type='text']").val(""); searchForm.find("input[type='hidden']").val(""); - + $P.exmptnVhclControl.dataset.setData([]); } - + $P.getParams = () => { var formFields = new FimsFormFields("#frmSearch--${pageName}"); var data = formFields.get(); @@ -212,7 +209,7 @@ $(document).ready(function(){ data.fetchSize = $P.exmptnVhclControl.defaultFetchSize; return data; } - + $P.searchExmptnVhclList = () => { $P.exmptnVhclControl.query = $P.getParams(); $P.exmptnVhclControl.load(1); @@ -221,7 +218,7 @@ $(document).ready(function(){ $P.scrollExmptnVhclList = () => { $P.exmptnVhclControl.load($P.exmptnVhclControl.query.pageNum + 1); } - + $P.refreshExmptnVhclList = () => { if($P.exmptnVhclControl.query.pageNum == null){ $P.exmptnVhclControl.query.pageNum = 1; @@ -230,20 +227,20 @@ $(document).ready(function(){ $P.exmptnVhclControl.query.fetchSize = $P.exmptnVhclControl.defaultFetchSize * $P.exmptnVhclControl.query.pageNum; $P.exmptnVhclControl.load(1); } - + $P.fnExcelDown = () => { if($P.exmptnVhclControl.dataset.empty){ alert("조회된 자료가 없습니다."); return; } - - var cellDefs = getCellDefs($("#exmptnVhclTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), + + var cellDefs = getCellDefs($("#exmptnVhclTheadTr--${pageName} th").not(".dummy-th").not(":eq(0)"), $($("#exmptnVhclRow--${pageName}")[0].content).find("td").not(".dummy-td").not(":eq(0)")); $P.exmptnVhclControl.query.cellDefs = cellDefs; - + $P.exmptnVhclControl.download(); } - + $P.getGridTemplate = () => { var notFound = [document.getElementById("exmptnVhclNotFound--${pageName}").innerHTML]; var found = document.getElementById("exmptnVhclRow--${pageName}").innerHTML; @@ -257,17 +254,17 @@ $(document).ready(function(){ replacer : replacer }; } - + $P.renderExmptnVhclList = (total, listLength, trs) => { var noMore = (total == listLength); var initScroll = ($P.exmptnVhclControl.query.pageNum < 2) && ($P.exmptnVhclControl.untilPageNum == 0); - + $("#table-responsive--${pageName}")[0].changeContent(trs, initScroll, noMore); //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); - + if($P.exmptnVhclControl.untilPageNum != 0){ $P.exmptnVhclControl.query.fetchSize = $P.exmptnVhclControl.defaultFetchSize; $P.exmptnVhclControl.query.pageNum = $P.exmptnVhclControl.untilPageNum; @@ -281,19 +278,19 @@ $(document).ready(function(){ $("#btnHistory--${pageName}").prop("disabled", true); return; } - + if($P.exmptnVhclControl.dataset.getData(dataKey)["DEL_YN"] == "N"){ $("#btnOpenDelRsn--${pageName}").prop("disabled", false); } else { $("#btnOpenDelRsn--${pageName}").prop("disabled", true); } $("#btnHistory--${pageName}").prop("disabled", false); - + $("#exmptnVhclTbody--${pageName}").setCurrentRow(dataKey); - + Apply.toDataset.current($P.exmptnVhclControl.dataset, dataKey); } - + $P.dblclickExmptnVhclList = (dataKey) => { if(dataKey == ""){ return; @@ -302,8 +299,8 @@ $(document).ready(function(){ if(data.DEL_YN == "Y"){ dialog.alert({ content : "삭제된 자료입니다.", - init : function() { - focusClose(); + init : function() { + focusClose(); } }); return; @@ -339,7 +336,7 @@ $(document).ready(function(){ } }); }; - + $P.newInfo = () => { ajax.get({ url : $P.exmptnVhclControl.urls.newInfo, @@ -368,7 +365,7 @@ $(document).ready(function(){ } }); }; - + $P.fnOpenDelRsnDialog = () => { dialog.open({ id : "delRsnDialog--${pageName}", @@ -381,14 +378,14 @@ $(document).ready(function(){ }, onClose : () => {} }); - + } - + $P.fnRemove = () => { var dataKey = $P.exmptnVhclControl.dataset.getCurrent()["EXMPTN_VHCL_ID"]; ajax.get({ url : $P.exmptnVhclControl.urls.remove, - data : { + data : { "exmptnVhclId" : dataKey, "delRsn" : $("#delRsn--${pageName}").val() }, @@ -400,10 +397,10 @@ $(document).ready(function(){ } }); }; - + $P.fnOpenHistory = () => { var dataKey = $P.exmptnVhclControl.dataset.getCurrent()["EXMPTN_VHCL_ID"]; - + ajax.get({ url : wctx.url("/BPV/crdn/crdn08/030/list.do"), data: { "exmptnVhclId" : dataKey }, @@ -414,34 +411,34 @@ $(document).ready(function(){ content : resp, size: "xxl", init:() => { - + } }); } }); - + } - + $P.provide = { "refreshList" : function(){ $P.refreshExmptnVhclList(); } } - + /************************************************************************** * element.on **************************************************************************/ $('#btnReset--${pageName}').on('click', () => $P.fnReset()); $("#btnSearch--${pageName}").on("click", () => $P.searchExmptnVhclList()); $('#btnExcel--${pageName}').on('click', () => $P.fnExcelDown()); - + $("#btnCreate--${pageName}").on('click', () => { $P.newInfo(); }); $("#btnOpenDelRsn--${pageName}").on('click', () => { $P.fnOpenDelRsnDialog(); }); $("#btnHistory--${pageName}").on('click', () => { $P.fnOpenHistory(); }); - + fnMakeScrollableTable($("#table-responsive--${pageName}")[0], $P.scrollExmptnVhclList); fnMakeResizableTable($("#table-responsive--${pageName}")[0]); - + /************************************************************************** * 초기화 **************************************************************************/ @@ -451,4 +448,5 @@ $(document).ready(function(){ //보안모드 fn_securityModeToggle($("#securityMode--top").is(":checked")); }); + \ No newline at end of file