From 6cb55ab585582ac79de533459208ca00db03b414 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Wed, 6 Dec 2023 09:12:23 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EC=9D=B4?=
 =?UTF-8?q?=EB=B2=A4=ED=8A=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/fims/crdn/crdn02010-main.jsp | 13 ++++++-------
 .../webapp/WEB-INF/jsp/fims/crdn/crdn03010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/crdn/crdn05010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/crdn/crdn06010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/crdn/crdn08010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp |  9 ++++-----
 .../webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp |  9 ++++-----
 10 files changed, 42 insertions(+), 52 deletions(-)

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 81689c45..01c679a9 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
@@ -659,11 +659,10 @@ $(document).ready(function(){
     	if(el.scrollTop() == 0){
     		return;
     	}
-
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-			$P.scrollInspectionDataList();
-    	}
+    	
+    	obj.dataset.scrollStatus = "waiting";
+		$P.scrollInspectionDataList();
+		
 	}
 
 	$P.scrollInspectionDataList = () => {
@@ -979,8 +978,8 @@ $(document).ready(function(){
 	$("#btnInstLevyExcl--${pageName}").on("click", () => $P.openLevyExclPop("1"));
 
 	//스크롤 이벤트 추가(동일차량검사)
-	$("#photoInspection-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
-	$("#sameVehicleInspectionMain-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+	$("#photoInspection-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
+	$("#sameVehicleInspectionMain-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
 	$("#photoInspection_Table_0--${pageName}").find("th").resizable({handles : "e"});
 	$("#sameVehicleInspectionMain_Table_0--${pageName}").find("th").resizable({handles : "e"});
 	$("#sameVehicleInspectionSub_Table_0--${pageName}").find("th").resizable({handles : "e"});
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 683aa8b9..abf394a5 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
@@ -215,10 +215,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollCrdnList();
+    	
 	}
 
 	$P.scrollCrdnList = () => {
@@ -316,7 +315,7 @@ $(document).ready(function(){
 	 **************************************************************************/
     $('#btnReset--${pageName}').on('click', () => $P.fnReset());
     $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList());
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $('#btnUpdateToConfirmData--${pageName}').on('click', () => {
 
     	if(!$P.crdnControl.getCurrent()) {
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 af0cdf34..a677e0e9 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
@@ -253,10 +253,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollCrdnList();
+    	
 	}
 
 	$P.scrollCrdnList = () => {
@@ -319,7 +318,7 @@ $(document).ready(function(){
 	$("#btnInsertByFile--${pageName}").on('click', () => { $P.crdnControl.newInfo("file"); });
 	$("#btnInsertByHand--${pageName}").on('click', () => { $P.crdnControl.newInfo("hand"); });
 	
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $("#DataTables_Table_0--${pageName}").find("th").resizable({handles : "e"});
     
     /**************************************************************************
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 49c732e9..4b4fce72 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
@@ -393,10 +393,8 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
-    	}
+   		obj.dataset.scrollStatus = "waiting";
+   		$P.scrollCrdnList();
 	}
 
 	$P.scrollCrdnList = () => {
@@ -487,7 +485,8 @@ $(document).ready(function(){
 	 **************************************************************************/
 	$('#btnReset--${pageName}').on('click', () => $P.fnReset());
     $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList());
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
 
 	/**************************************************************************
 	 * 초기화
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 c4340e1f..090c85c1 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
@@ -310,10 +310,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollExmptnVhclList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollExmptnVhclList();
+    	
 	}
 
 	$P.scrollExmptnVhclList = () => {
@@ -460,7 +459,7 @@ $(document).ready(function(){
 	$("#btnOpenDelRsn--${pageName}").on('click', () => { $P.fnOpenDelRsnDialog(); });
 	$("#btnHistory--${pageName}").on('click', () => { $P.fnOpenHistory(); });
 	
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $("#DataTables_Table_0--${pageName}").find("th").resizable({handles : "e"});
     
     /**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
index 74c4e95a..07a45839 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp
@@ -371,10 +371,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollCrdnList();
+    	
 	}
 
 	$P.scrollCrdnList = () => {
@@ -643,7 +642,7 @@ $(document).ready(function(){
     $("#btnDeleteSameRcptYmd--${pageName}").on("click", () => $P.fnRemoveSameRcptYmd());
     $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl());
     
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $("#DataTables_Table_0--${pageName}").find("th").resizable({handles : "e"});
     
 	/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
index 5456142e..4c21c57e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc02010-main.jsp
@@ -397,10 +397,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollCrdnList();
+    	
 	}
 
 	$P.scrollCrdnList = () => {
@@ -672,7 +671,7 @@ $(document).ready(function(){
     $("#btnExecuteAnswer--${pageName}").on("click", () => $P.fnExecuteAnswer());
 	$("#btnAnswerComplete--${pageName}").on("click", () => $P.fnAnswerComplete());
 
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $("#DataTables_Table_0--${pageName}").find("th").resizable({handles : "e"});
     
 	/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp
index b8f80999..03bee62e 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc03010-main.jsp
@@ -358,10 +358,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollCrdnList();
+    	
 	}
 
 	$P.scrollCrdnList = () => {
@@ -546,7 +545,7 @@ $(document).ready(function(){
     $("#btnDelete--${pageName}").on("click", () => $P.fnRemove());
     $("#btnOpenCvlcptOrgnl--${pageName}").on("click", () => $P.fnOpenCvlcptOrgnl());
     
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $("#DataTables_Table_0--${pageName}").find("th").resizable({handles : "e"});
     
 	/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp
index b800b632..356527c7 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc04010-main.jsp
@@ -307,10 +307,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollDmndList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollDmndList();
+    	
 	}
 
 	$P.scrollDmndList = () => {
@@ -461,7 +460,7 @@ $(document).ready(function(){
     $("#btnDelete--${pageName}").on("click", () => $P.fnRemove(null));
     $("#btnDeleteAllCompleteData--${pageName}").on("click", () => $P.fnRemoveAllCompleteData());
     
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
     $("#DataTables_Table_0--${pageName}").find("th").resizable({handles : "e"});
     
 	/**************************************************************************
diff --git a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp
index b63e1bc4..93106213 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp
@@ -254,10 +254,9 @@ $(document).ready(function(){
     		return;
     	}
 
-    	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
-    		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollRductList();
-    	}
+    	obj.dataset.scrollStatus = "waiting";
+    	$P.scrollRductList();
+    	
 	}
 
 	$P.scrollRductList = () => {
@@ -339,7 +338,7 @@ $(document).ready(function(){
 	 **************************************************************************/
     $('#btnReset--${pageName}').on('click', () => $P.fnReset());
     $('#btnSearch--${pageName}').on('click', () => $P.searchRductList());
-    $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
+    $("#table-responsive--${pageName}").on("scrollend", function(){ $P.scrollEnd(this); });
 
     /**************************************************************************
 	 * 초기화