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 c6b1952..3eb7179 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
@@ -193,7 +193,7 @@
style="width: 250px;" class="cmn">단속장소
| 사진건수 |
- 처리상태 |
제외사유 |
@@ -279,10 +279,7 @@ var FIM026 = new CommonCodes(${FIM026});
var FIM034 = new CommonCodes(${FIM034});
pageObject["${pageName}"] = newDoctxFinder("${pageName}");
-
-
$(document).ready(function(){
-
var $P = pageObject["${pageName}"];
/**************************************************************************
@@ -300,7 +297,7 @@ $(document).ready(function(){
$P.pagingSupport.setPagingInfo(obj);
- let crdns = ctrl.dataset.getDataset();
+ let crdns = ctrl.dataset.getDataset(),
byStatus = crdns.reduce((acc, crdn) => {
let status = crdn.CRDN_STTS_CD;
if (["01", "81"].includes(status))
@@ -313,6 +310,12 @@ $(document).ready(function(){
$('button[name^="btnVehicle"]').prop("disabled", initial < 1);
$('span[name="crdnSummary"]').html(crdns.length > 0 ? "초기상태: " + initial + ", 부과제외: " + excluded : "");
};
+
+ ctrl.dataset.onSort = sorter => {
+ var t = $P.getGridTemplate();
+ var trs = Apply.fromDataset.getTbody(ctrl.dataset, t.found, t.notFound, t.replacer);
+ $P.renderCrdnList(obj["Paging"]?.totalSize, ctrl.dataset.length, trs, option);
+ };
ctrl.dataset.onCurrentChange = (dataItem) => {
Apply.fromDataset.currentRow(ctrl.dataset, dataItem, $P.findn("crdnTbody"));
@@ -415,9 +418,14 @@ $(document).ready(function(){
ctrl.query.includePhoto = null;
};
$P.fnVehicleReqs = () => {
- let crdnIds = ctrl.dataset.getDataset()
+ let dataset = ctrl.dataset.getDataset("selected");
+ if (dataset.length < 1)
+ dataset = ctrl.dataset.getDataset();
+ let crdnIds = dataset
.filter(info => "01" == info.CRDN_STTS_CD)
.map(info => info.CRDN_ID);
+ if (crdnIds.length < 1)
+ return dialog.alert("차적조회파일 생성의 대상 단속정보가 없습니다.");
download.get({
url: wctx.url("/crdn/crdn06/010/vehicleReqs.do"),
@@ -427,10 +435,16 @@ $(document).ready(function(){
$P.fnVehicleUpdate = () => {
fileInput().select(item => {
if (!item) return;
+
+ let dataset = ctrl.dataset.getDataset("selected");
+ if (dataset.length < 1)
+ dataset = ctrl.dataset.getDataset();
- let crdnIds = ctrl.dataset.getDataset()
- .filter(info => "01" == info.CRDN_STTS_CD)
- .map(info => info.CRDN_ID);
+ let crdnIds = dataset
+ .filter(info => "01" == info.CRDN_STTS_CD)
+ .map(info => info.CRDN_ID);
+ if (crdnIds.length < 1)
+ return dialog.alert("차적조회파일 등록의 대상 단속정보가 없습니다.");
upload({
url : wctx.url("/crdn/crdn06/010/uploadVehicles.do"),
@@ -483,7 +497,6 @@ $(document).ready(function(){
}
$P.renderCrdnList = (total, listLength, trs, option) => {
-
let noMore = (listLength >= total);
var initScroll = (ctrl.query.pageNum < 2);
if(option != null && option.reloaded){
diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp
index 7e672c7..24e99b8 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/user/user02010-main.jsp
@@ -67,18 +67,17 @@