Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/mobile/app/mpomng/MPOMNG06010.html

@@ -130,7 +130,7 @@
 					<label>공급업체</label>
 				</div>
 				<div class="header_right">
-					<button type="button" id="ITP_BTN_MPOMNG06010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
+					<button type="button" id="ITP_BTN_MPOMNG06010_POP_SPPLY_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 				</div>
 			</div>
 			<div class="search_bar">
@@ -164,10 +164,10 @@
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
-					<label>납품장소</label>
+					<label>수거창고</label>
 				</div>
 				<div class="header_right">
-					<button type="button" id="ITP_BTN_MPOMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+					<button type="button" id="ITP_BTN_MPOMNG06010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 				</div>
 			</div>
 			<div class="search_bar">
@@ -179,7 +179,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
+				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_red">수거창고 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -104,13 +104,13 @@
 					<div class="line">
 						<label>반려일자</label>
 						<div class="line_right">
-							<div class="fnRjctDt"></div>
+							<div class="fnRtnRjctDt"></div>
 						</div>
 					</div>
 					<div class="line">
 						<label>반려담당자</label>
 						<div class="line_right">
-							<div class="fnRjctMgrNm"></div>
+							<div class="fnRjctNm"></div>
 						</div>
 					</div>
 					<div class="line">
@@ -139,10 +139,10 @@
 			            <div class="nomal">
 			              	<label class="col_3">요청수량</label>
 			                <span>:</span>
-			                <div class="fnPchReqQty"></div>
+			                <div class="fnRtnQty"></div>
 			                <label class="col_3">요청금액</label>
 			                <span>:</span>
-			                <div class="col_10 fnPchReqAmt"></div>
+			                <div class="col_10 fnRtnAmt"></div>
 			              </div>
 			           </div>   
 			        </li>

src/main/webapp/mobile/app/mrtnmng/MRTNMNG05010.html

@@ -131,7 +131,7 @@
 					<label>공급업체</label>
 				</div>
 				<div class="header_right">
-					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
+					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_SPPLY_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 				</div>
 			</div>
 			<div class="search_bar">
@@ -168,7 +168,7 @@
 					<label>납품장소</label>
 				</div>
 				<div class="header_right">
-					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 				</div>
 			</div>
 			<div class="search_bar">

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

@@ -194,7 +194,7 @@ let mobContObj = {
 				// 결제 팝업 결과
 				var popFn = function(rowDataPop) {
 					console.log(JSON.stringify(rowDataPop));
-					// mobContObj.list.search();
+					mobContObj.list.search();
 				};
 				// 결제 팝업
 				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제)), 30(후불(선결제))

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -327,7 +327,7 @@ let mobPopObj = {
 	},
 	popWhsNm: {
 		init: function () {
-			$('#ITP_POP_MPOMNG01010_WHS_AREA #ITP_FORM_MPOMNG01010_POP_WHS_KEYWORD').val('');
+			$('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .mb_0').children().remove();
 			this.rows.length = 0;
 			this.search();
 			this.action();
@@ -335,62 +335,43 @@ let mobPopObj = {
 		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .mb_0').empty();
 			var callbackFn = function(result) {
 				console.log(result);
-				_this.view(result.gridRows);
+				$.each(result.gridRows, function (i, item) {
+					$('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .mb_0 > .row_2:last');
+					$li.find('.fnWhsNm').text(item.whsNm);
+					$li.find('.fnLocationNm').text(item.locationNm);
+					$li.find('.fnWhsId').data('whs-id', item.whsId);
+					$li.find('.fnWhsId').data('location', item.location);
+					$('#ITP_LIST_MRTNMNG01010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MRTNMNG01010_POP_WHS').serializeObject();
 			(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
-		view: function(gridRows) {
-			this.rows = gridRows;
-			$.each(gridRows, function (i, item) {
-				$('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .panel-group > .row_2:last');
-				$li.find('.fnWhsNm').text(item.whsNm);
-				$li.find('.fnLocationNm').text(item.locationNm);
-				$li.find('.fnWhsId').data('whs-id', item.whsId);
-			});
-		},
 		action: function() {
 			var _this = this;
-			$('button[id^="ITP_BTN_MRTNMNG01010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MRTNMNG01010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MRTNMNG01010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MRTNMNG01010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
+			$('#ITP_FORM_MRTNMNG01010_POP_WHS button[id="ITP_BTN_MRTNMNG01010_POP_WHS_SEARCH"]').off('click').on('click', function() {
+				_this.search();
 			});
 		},
 		choice: function(elem) {
-			var _this = this;
 			var whsId = $(elem).data('whs-id');
-			$.each(this.rows, function (i, item) {
-				if(whsId === item.whsId) {
-					console.log(item);
-					$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM').val(item.whsNm);
-					$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_LOCATION').val(item.location);
-					mobPopObj.hide(ID_ITP_POP_MRTNMNG01010_WHS_AREA);
-					itp_fn_form_clear_validate(null, '#ITP_FORM_MRTNMNG01010_DETAIL');
-					return false;
-				}
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID').val(whsId);
+			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM').val(whsNm);
+			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_LOCATION').val(location);
+			mobPopObj.hide(ID_ITP_POP_MRTNMNG01010_WHS_AREA);
+			itp_fn_form_clear_validate(null, '#ITP_FORM_MRTNMNG01010_DETAIL');
 		},
 		delete: function() {
 			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID').val('');
 			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM').val('');
 			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_LOCATION').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_LIST_MRTNMNG01010_POP_WHS_AREA .panel-group').empty();
-			$('#ITP_POP_MRTNMNG01010_WHS_AREA #ITP_FORM_MRTNMNG01010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	popReqConfirm: {
@@ -442,6 +423,7 @@ let mobPopObj = {
 		var _this = this;
 		$('button[id$="CLOSE"]').off('click').on('click', function() {
 			var id = $(this).attr('id');
+			console.log('id ===> ' + id);
 			if($(this).hasClass('btn-pop-close')) {
 				_this.hide(id);
 			}

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -201,7 +201,9 @@ let mobContObj = {
 			$(id).find('.fnRtnReqDt').text(result.rtnReqDt);
 			$(id).find('.fnRtnReqAmt').text(CommonObj.currency.add(result.rtnReqAmt));
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
-			$(id).find('.fnRtnApprNm').text('(' + result.pchApprNm + ')' + CommonObj.currency.add(result.pchApprAmt));
+			$(id).find('.fnRtnRjctDt').text(result.rtnRjctDt);
+			$(id).find('.fnRjctNm').text(result.rtnRjctNm);
+			$(id).find('.fnRjctRsn').text(result.rtnRjctRsn);
 			$.each(result.rtnReqDtlList, function (i, item) {
 				$('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group').append($('#ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY').html());
 				var $li = $('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group > .item-row:last');

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG04010.js

@@ -72,14 +72,12 @@ let mobPageObj = {
 				return false;
 			});
 
+			$(document).off('click', '#ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS li');
 			$(document).on('click', '#ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS li', function() {
 				var item = mobContObj.list.rows[$(this).index()];
 				mobContObj.view.init(item);
 			});
 
-			$(document).on('click', '#ITP_LIST_MRTNMNG04010_POP_WHS_ROWS li button', function() {
-				mobPopObj.popWhsNm.choice($(this));
-			});
 		}
 	},
 	switchScreen: function(mode) {
@@ -166,7 +164,7 @@ let mobContObj = {
 		view: function(result) {
 			var _this = this;
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
-			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', (result.rtnReqDvsn !== 'RR00'));
+			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', result.rtnReqDvsn !== 'RR02');
 			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
@@ -191,7 +189,7 @@ let mobContObj = {
 					var searhFn = function () {
 						mobContObj.list.init();
 					};
-					fn_ajax_call(API_RTNMNG_RTN_CANCEL_RTNPO, JSON.stringify(param), searhFn, 'POST');
+					fn_ajax_call(API_MOBILE_CANCEL, JSON.stringify(param), searhFn, 'POST');
 				}
 			};
 			itp_fn_modal_confirm('반품발주를 취소 하시겠습니까?', modalFn);

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

@@ -64,7 +64,12 @@ require([
 
 	// 로그아웃 버튼
 	$('#ITP_MOBILE_BTN_LOGOUT').click(function() {
-		CommonObj.isApp ? location.replace('app:logout') : fnLogout();
+		var logoutFn = {
+			callBack: function(args) {
+				CommonObj.isApp ? location.replace('app:logout') : fnLogout();
+			}
+		};
+		itp_fn_modal_confirm('로그아웃하시겠습니까?', logoutFn, null);
 	});
 
 	if(VIEW_PAGE !== 'LOGIN' && VIEW_PAGE !== 'PAY') {