@@ -218,6 +224,15 @@
return XitReverseRowNumberRenderer.format(LevyRelevyList.grid.instance.getData().length, e);
}
},
+ {
+ header: '재부과대상',
+ name: 'relevyTrgtYn',
+ align: 'center',
+ width: 90,
+ formatter: function(e) {
+ return e.value === 'Y' ? '대상' : '비대상';
+ }
+ },
{ header: '단속년도', name: 'crdnYr', align: 'center', width: 80, sortingType: 'desc' },
{ header: '단속번호', name: 'crdnNo', align: 'center', width: 90 },
{ header: '법정동', name: 'stdgEmdCdNm', align: 'center', width: 90 },
@@ -242,15 +257,6 @@
return e.value === 'Y' ? '재부과' : '일반';
}
},
- {
- header: '재부과대상',
- name: 'relevyTrgtYn',
- align: 'center',
- width: 90,
- formatter: function(e) {
- return e.value === 'Y' ? '대상' : '비대상';
- }
- },
{
header: '가중부과대상',
name: 'agrvtnLevyTrgtYn',
@@ -394,6 +400,18 @@
LevyRelevyList.selectedRow = null;
});
+ // 그리드 렌더링 및 데이터 업데이트 완료 이벤트
+ this.instance.on('onGridUpdated', function() {
+ var allRows = self.instance.getData();
+ var rowKey = null;
+ allRows.forEach(function(row) {
+ // 재부과 대상이 아닐 경우 체크박스 비활성화
+ if( row.relevyTrgtYn !== 'Y' ){
+ self.instance.disableRowCheck(row.rowKey);
+ }
+ });
+ });
+
this.instance.on('focusChange', function(ev) {
LevyRelevyList.selectedRow = self.instance.getRow(ev.rowKey);
@@ -402,8 +420,8 @@
// 파라미터 저장
LevyRelevyList.gridDetail.currentCrdnYr = LevyRelevyList.selectedRow.crdnYr;
LevyRelevyList.gridDetail.currentCrdnNo = LevyRelevyList.selectedRow.crdnNo;
- LevyRelevyList.gridDetail.currentFrstCrdnYr = LevyRelevyList.selectedRow.frstCrdnYr;
- LevyRelevyList.gridDetail.currentFrstCrdnNo = LevyRelevyList.selectedRow.frstCrdnNo;
+ LevyRelevyList.gridDetail.currentFrstCrdnYr = LevyRelevyList.selectedRow.frstCrdnYr || LevyRelevyList.selectedRow.crdnYr; //자기 자신이 최초일경우 대비 해당row년도를 최초년도로
+ LevyRelevyList.gridDetail.currentFrstCrdnNo = LevyRelevyList.selectedRow.frstCrdnNo || LevyRelevyList.selectedRow.crdnNo; //자기 자신이 최초일경우 대비 해당row단속번호를 최초단속번호로
// 그리드 데이터 요청
LevyRelevyList.gridDetail.instance.readData(1);
diff --git a/src/main/webapp/resources/css/style_new.css b/src/main/webapp/resources/css/style_new.css
index 5276388..8c655b6 100644
--- a/src/main/webapp/resources/css/style_new.css
+++ b/src/main/webapp/resources/css/style_new.css
@@ -2081,6 +2081,11 @@ label {
float: right;
}
+.gs_b_top>ul.lef2 {
+ float: left;
+ clear: both;
+}
+
.gs_b_top>ul.rig>li {
height: 35px;
}
diff --git a/src/main/webapp/resources/xit/xit-tui-grid.css b/src/main/webapp/resources/xit/xit-tui-grid.css
index 07609e0..2d7c576 100644
--- a/src/main/webapp/resources/xit/xit-tui-grid.css
+++ b/src/main/webapp/resources/xit/xit-tui-grid.css
@@ -50,10 +50,10 @@ table.tui-grid-table td.tui-grid-cell-editable > div.tui-grid-cell-content{
/* custom background color */
.tui-grid-custom-color-red{
- background-color: rgba(235, 244, 253, 0.7) !important;
+ background-color: rgba(250, 239, 239, 0.7) !important;
}
.tui-grid-custom-color-blue{
- background-color: rgba(250, 239, 239, 0.7) !important;
+ background-color: rgba(235, 244, 253, 0.7) !important;
}
.tui-grid-custom-color-gray{