모바일 디자인 적용

src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -51,8 +51,8 @@
 		  </div>
 			<div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA" class="scroll_area row-12">
 			  <ul id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
-				<li class="history_list_1">
+			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
+				<li class="history_list_1 item-row">
 				  <div class="button_right btn-dpst" style="display: grid;"><!-- display:gird 로 해야 정상으로 보임 -->
 					<button id="ITP_BTN_MLOANMNG02010_LIST_AGREE" class="btn-primary AGR">승인</button>
 					<button id="ITP_BTN_MLOANMNG02010_LIST_REJECT" class="btn-danger RJT">반려</button>
@@ -68,7 +68,7 @@
 					<div class="nomal btn">
 					  <label class="sub_info">정산타입</label>
 					  <span>:</span>
-					  <div class="fnDpstDt"></div>
+					  <div class="fnLoanDvsnNm"></div>
 					  <label class="col_3">입금금액</label>
 					  <span>:</span>
 					  <div class="fnDpstAmt"></div>
@@ -88,10 +88,10 @@
 					<div class="nomal btn">
 					  <label class="col_3">승인일자</label>
 					  <span>:</span>
-					  <div class="fnAuthDt"></div>
+					  <div class="fnDpstAuthDt"></div>
 					  <label class="col_3">반려일자</label>
 					  <span>:</span>
-					  <div class="fnRjctDt"></div>
+					  <div class="fnDpstRjctDt"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">

src/main/webapp/mobile/app/mloanmng/MLOANMNG03010.html

@@ -41,7 +41,7 @@
 			<div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA" class="scroll_area row-13">
 			  <ul id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list7">
+				<li class="history_list7 item-row">
 				  <!-- <div class="left">hidden 처리
 					<div class="nomal">
 				      <label class="history_label">정산번호 </label>
@@ -80,7 +80,7 @@
 						<div class="nomal">
 							<label class="history_label">정산확정일 </label>
 							<span>:</span>
-							<div class="fnSttlReqDt"></div>
+							<div class="fnSttlDt"></div>
 							<label class="sub_info">미납금액</label>
 							<span>:</span>
 							<div class="fnUnpaidAmt"></div>

src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -174,11 +174,14 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA .panel-group > .history_list1:last');
+					var $li = $('#ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnStoreNm').text(item.storeNm);
+					$li.find('.fnLoanDvsnNm').text(item.loanDvsnNm);
 					$li.find('.fnDpstDt').text(item.dpstDt);
 					$li.find('.fnDpstAmt').text(CommonObj.currency.add(item.dpstAmt));
 					$li.find('.fnDpstNm').text(item.dpstNm);
+					$li.find('.fnDpstAuthDt').text(CommonObj.nullToString(item.dpstAuthDt));
+					$li.find('.fnDpstRjctDt').text(CommonObj.nullToString(item.dsptRjctDt));
 					$li.find('.fnRcvAcctNo').text(item.rcvAcctNo);
 					$li.find('.fnDpstBnkNm').text(item.dpstBnkNm);
 					$li.find('.fnDpstStNm').text(item.dpstStNm);

src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG03010.js

@@ -174,14 +174,14 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA .panel-group > .history_list4:last');
+					var $li = $('#ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA .panel-group > .item-row:last');
 					$li.find('.fnStoreNm').text(item.storeNm);
 					$li.find('.fnLoanDvsnNm').text(item.loanDvsnNm);
 					$li.find('.fnSttlMgntUnqNo').text(item.sttlMgntUnqNo);
 					$li.find('.fnSttlStNm').text(item.sttlStNm);
 					$li.find('.fnSttlReqDt').text(item.sttlReqDt);
 					$li.find('.fnSttlReqAmt').text(CommonObj.currency.add(item.sttlReqAmt));
-					$li.find('.fnSttlReqDt').text(CommonObj.nullToString(item.sttlReqDt));
+					$li.find('.fnSttlDt').text(CommonObj.nullToString(item.sttlDt));
 					$li.find('.fnUnpaidAmt').text(CommonObj.currency.add(item.unpaidAmt));
 					$li.find('.fnUseAmtTotal').text(CommonObj.currency.add(item.useAmtTotal));
 					_this.rows.push(item);
@@ -255,7 +255,7 @@ let mobContentObj = {
 					_this.totPage = result.gridTotal;
 					$.each(result.gridRows, function (i, item) {
 						$('#ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY').html());
-						var $li = $('#ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA .panel-group > .list-row:last');
+						var $li = $('#ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA .panel-group > .item-row:last');
 						$li.find('.fnItemId').text(item.itemId);
 						$li.find('.fnItemNm').text(item.itemNm);
 						$li.find('.fnUnitAmt').text(item.unitAmt);

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -110,29 +110,31 @@ let mobPageObj = {
 				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM').attr('readonly', true);
 				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID').attr('disabled', true);
 			}
-			this.moreView(true);
+			// this.moreView(true);
 		} else if(mode === VIEW_MODE_DETAIL) {
 			$('#ITP_AJAX_MPOMNG02010_VIEW_CONTAINER').show();
-			this.moreView(false);
+			// this.moreView(false);
 		} else if(mode === VIEW_MODE_MODIFY) {
 			$('#ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER').show();
-			this.moreView(false);
+			// this.moreView(false);
 		}
+		CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', mode === VIEW_MODE_LIST, mobContentObj.list.load);
 		this.viewMode = mode;
 	},
 	moreView: function(isScroll) {
 		if(isScroll) {
-			$('#ITP_LIST_MPOMNG02010_ITEM_AREA').on('scroll', function () {
+			$('#ITP_LIST_MPOMNG02010_ITEM_AREA').off('scroll').on('scroll', function () {
 				if($(this).scrollTop() + $(this).innerHeight() + 1 >= $(this)[0].scrollHeight) {
-					if(mobContentObj.list.totPage > mobContentObj.list.listPage) {
-						if(!mobContentObj.list.isSearch) {
-							mobContentObj.list.load();
-						}
-					}
+					mobContentObj.list.load();
+					// if(mobContentObj.list.totPage > mobContentObj.list.listPage) {
+					// 	if(!mobContentObj.list.isSearch) {
+					// 		mobContentObj.list.load();
+					// 	}
+					// }
 				}
 			});
 		} else {
-			$('#ITP_LIST_MPOMNG02010__ITEM_AREA').off('scroll');
+			$('#ITP_LIST_MPOMNG02010_ITEM_AREA').off('scroll');
 		}
 	},
 	ready: function() {
@@ -142,10 +144,7 @@ let mobPageObj = {
 
 let mobContentObj = {
 	list: {
-		listSize: 10,
 		listPage: 0,
-		totPage: 0,
-		isSearch: false,
 		rows: [],
 		init: function() {
 			mobPageObj.switchScreen(VIEW_MODE_LIST);
@@ -153,18 +152,16 @@ let mobContentObj = {
 		},
 		search: function() {
 			this.listPage = 0;
-			this.totPage = 0;
 			this.rows.length = 0;
 			$('#ITP_LIST_MPOMNG02010_ITEM_ROWS').children().remove();
 			this.load();
 		},
 		load: function() {
-			var _this = this;
-			this.isSearch = true;
 			var callbackFn = function(result) {
 				console.log(result);
-				_this.isSearch = false;
-				_this.totPage = result.gridTotal;
+				if(result.gridPage >= result.gridTotal) {
+					CommonObj.moreView('#ITP_LIST_MPOMNG02010_ITEM_AREA', false);
+				}
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_ITEM_ROWCOPY').html());
 					var $li = $('#ITP_LIST_MPOMNG02010_ITEM_AREA .panel-group > .item-row:last');
@@ -178,15 +175,14 @@ let mobContentObj = {
 					$li.find('.fnPchReqTotalAmt').text(CommonObj.comma.set(item.pchReqTotalAmt));
 					$li.find('.fnPchReqRjctDt').text(item.pchReqRjctDt);
 					$li.find('.fnPchReqRjctNm').text(item.pchReqRjctNm);
-					_this.rows.push(item);
+					mobContentObj.list.rows.push(item);
 				});
-				_this.action();
+				mobContentObj.list.action();
 			};
-			var errFn = function() { _this.isSearch = false;};
 			const param = $('#ITP_FORM_MPOMNG02010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
 			param.gridSize = mobile_list_size;
-			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
+			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		action: function () {
 			var _this = this;

src/main/webapp/mobile/js/config.js

@@ -786,6 +786,17 @@ let CommonObj = {
 		});
 
 	},
+	moreView: function(id, isScroll, fn) {
+		if(isScroll) {
+			$(id).off('scroll').on('scroll', function () {
+				if($(this).scrollTop() + $(this).innerHeight() + 1 >= $(this)[0].scrollHeight) {
+					fn();
+				}
+			});
+		} else {
+			$(id).off('scroll');
+		}
+	},
 	getParameter: function(name) {
 		var rtnval = '';
 		var nowAddress = unescape(location.href);