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

src/main/webapp/app/popup/biz/BIZPOP_DLV_STTMT_PRN.html

@@ -43,7 +43,7 @@
 									<div>
 										<label style="width:100px;">납품일</label>
 										<label>:</label>
-										<span class="fnDlvRegDt"></span>
+										<span class="fnDlvSchDt"></span>
 									</div>
 									<div>
 										<label style="width:100px;">납품담당</label>
@@ -71,7 +71,7 @@
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										<span style="margin:0px; " class="fnDlvAddr"></span>
+										<span style="margin:0px; " class="fnWhsAddr"></span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>

src/main/webapp/js/app/config.js

@@ -2564,7 +2564,15 @@ function itp_fn_form_validate(form, element, arry, msg, type) {
 			return false;
 		}
 	}
-
+	if ($.inArray('num', arry) > -1) {
+		$(element).val($(element).val().replace(/[^0-9]/g, ''));
+		const regExp = /^[0-9]+$/;
+		if (!regExp.test($(element).val())) {
+			error(ITP_MSG_LOCALE.message.form.onlynumber);
+			return false;
+		}
+	}
+	
 	if ($.inArray('number', arry) > -1) {
 		const regExp = /^[0-9]+$/;
 		if (!regExp.test($(element).val())) {

src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -641,7 +641,7 @@ let createObj = {
 			const formId = '#ITP_FORM_LOANMNG02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
 			
-			var vali_dpstAmt = itp_fn_form_validate(formId, formId + '_DPST_AMT', ['empty','number'], undefined); // 입금금액
+			var vali_dpstAmt = itp_fn_form_validate(formId, formId + '_DPST_AMT', ['empty','num'], undefined); // 입금금액
 			var vali_dpstDt = itp_fn_form_validate(formId, formId + '_DPST_DT', ['empty'], undefined); // 입금일자
 			var vali_dpstNm = itp_fn_form_validate(formId, formId + '_DPST_NM', ['empty'], undefined); // 입금자명
 			var vali_dpstBnkCd = itp_fn_form_validate(formId, formId + '_DPST_BNK_CD', ['empty'], undefined); // 입금은행

src/main/webapp/js/app/locales/locale-ko.js

@@ -190,6 +190,7 @@ const ITP_MSG_LOCALE = (function() {
             "dlvQty": "납품수량",
             "whsQty": "입고수량",
             "dlvSchDt": "납품예정일",
+			"dlvDt": "납품일",
             "dlvCmpltDt": "납품완료일",
             "whsCnfmNm": "입고확인자",
             "dlvMgrNm": "납품자명",

src/main/webapp/js/app/pomng/ITP_POMNG05010.js

@@ -101,7 +101,7 @@ const gridColModel = {
 		},
 		{
 			index: 'DLV_SCH_DT', name: 'dlvSchDt',		
-			label: ITP_MSG_LOCALE.label.dlvSchDt, 		//납품예정일
+			label: ITP_MSG_LOCALE.label.dlvDt, 		//납품일
 			width: '14', fixed: false, align: 'center',	
 			minwidth:90,
 			sortable: false, hidden: false				

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_STTMT_PRN.js

@@ -143,9 +143,10 @@ let pageObj = {
 		console.log(result);
 		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
 		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSchDt').text(result.dlvSchDt);
 		
 		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
-		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsAddr').text(result.whsAddr);
 		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
 		
 		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);

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

@@ -76,7 +76,7 @@
 			<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_AREA" class="scroll_area row-5">
 				<ul id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list4 item-row">
+					<li class="history_list13 item-row">
 						<div class="left">
 							<div class="nomal">
 								<label>납품번호 </label>
@@ -86,22 +86,29 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="">납품예정일</label>
+								<label class="">발주생성일</label>
 								<span>:</span>
-								<div class="fnDlvReqDt history_info"></div>
-								<label class="fn sub_info">납품일자</label>
+								<div class="fnPodrReqDt"></div>
+								<label class="">납품요청일</label>
 								<span>:</span>
-								<div class="fnDlvSchDt"></div>
+								<div class="fnDlvReqDt"></div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>공급업체</label>
+								<label>납품일자</label>
+								<span>:</span>
+								<div class="fnDlvSchDt"></div>
+								<label class="">완료일자</label>
 								<span>:</span>
-								<div class="fnSpplyNm history_info"></div>
-								<label class="sub_info">납품장소</label>
+								<div class="fnCmltDt"></div>
+							</div>
+						</div>
+						<div class="left">
+							<div class="nomal">
+								<label>납품장소 </label>
 								<span>:</span>
-								<div class="fnWhsNm"></div>
+								<div class="full fnWhsNm"></div>
 							</div>
 						</div>
 						<div class="left">
@@ -115,12 +122,22 @@
 							<div class="nomal">
 								<label>발주수량</label>
 								<span>:</span>
-								<div class="fnPodrQty history_info"></div>
-								<label class="sub_info">납품수량</label>
+								<div class="fnPodrQty"></div>
+								<label class="">납품수량</label>
 								<span>:</span>
 								<div class="fnDlvQty"></div>
 							</div>
 						</div>
+						<div class="left">
+							<div class="nomal">
+								<label>납품상태</label>
+								<span>:</span>
+								<div class="fnDlvStNm"></div>
+								<label class="">창고구분</label>
+								<span>:</span>
+								<div class="fnWhsDvsnNm"></div>
+							</div>
+						</div>
 					</li>
 				</div>
 			</div>

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

@@ -19,7 +19,7 @@
 					<div class="line">
 						<label>반품발주번호</label>
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
+							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="srtnPodrUnqNo" type="text">
 						</div>
 					</div>
 					<div class="line">

src/main/webapp/mobile/css/style.css

@@ -501,6 +501,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list9 {height: 170px;}
 .scroll_area li.history_list11 {height: 230px; padding-top:5px;}
 .scroll_area li.history_list12 {height: 170px; padding-top:4px;}
+.scroll_area li.history_list13 {height: 200px; padding-top:4px;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -200,67 +200,50 @@ let mobContObj = {
 let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MCOLLMNG01010_WHS_AREA',
-		rows: [],
 		init: function () {
+			$('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .mb_0').children().remove();
+			$('#ITP_POP_MCOLLMNG01010_WHS_AREA #ITP_FORM_MCOLLMNG01010_POP_WHS_KEYWORD').val('');
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
 			this.action();
 		},
+		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MCOLLMNG01010_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_MCOLLMNG01010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MCOLLMNG01010_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_MCOLLMNG01010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MCOLLMNG01010_POP_WHS').serializeObject();
-			param.swhsDvsn = 'W01';
+			(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_MCOLLMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG01010_POP_WHS_AREA .panel-group > .item-row: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;
+			$('#ITP_FORM_MCOLLMNG01010_POP_WHS button[id="ITP_BTN_MCOLLMNG01010_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) {
-					$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM').val(item.whsNm);
-					_this.close();
-					return false;
-				}
-			});
-		},
-		action: function() {
-			var _this = this;
-			$('button[id^="ITP_BTN_MCOLLMNG01010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MCOLLMNG01010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MCOLLMNG01010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MCOLLMNG01010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID').val(whsId);
+			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM').val(whsNm);
+			mobPopObj.hide(this.popId);
 		},
 		delete: function() {
 			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MCOLLMNG01010_LIST_SEARCH #ITP_FORM_MCOLLMNG01010_LIST_SEARCH_WHS_NM').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MCOLLMNG01010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MCOLLMNG01010_POP_WHS #ITP_FORM_MCOLLMNG01010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG02010.js

@@ -287,67 +287,50 @@ let mobContObj = {
 let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MCOLLMNG02010_WHS_AREA',
-		rows: [],
 		init: function () {
+			$('#ITP_LIST_MCOLLMNG02010_POP_WHS_AREA .mb_0').children().remove();
+			$('#ITP_POP_MCOLLMNG02010_WHS_AREA #ITP_FORM_MCOLLMNG02010_POP_WHS_KEYWORD').val('');
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
 			this.action();
 		},
+		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MCOLLMNG02010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MCOLLMNG02010_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_MCOLLMNG02010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MCOLLMNG02010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MCOLLMNG02010_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_MCOLLMNG02010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MCOLLMNG02010_POP_WHS').serializeObject();
-			param.swhsDvsn = 'W01';
+			(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_MCOLLMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG02010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG02010_POP_WHS_AREA .panel-group > .item-row: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;
+			$('#ITP_FORM_MCOLLMNG02010_POP_WHS button[id="ITP_BTN_MCOLLMNG02010_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) {
-					$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH #ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH #ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM').val(item.whsNm);
-					_this.close();
-					return false;
-				}
-			});
-		},
-		action: function() {
-			var _this = this;
-			$('button[id^="ITP_BTN_MCOLLMNG02010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MCOLLMNG02010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MCOLLMNG02010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MCOLLMNG02010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH #ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_ID').val(whsId);
+			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH #ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM').val(whsNm);
+			mobPopObj.hide(this.popId);
 		},
 		delete: function() {
 			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH #ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MCOLLMNG02010_LIST_SEARCH #ITP_FORM_MCOLLMNG02010_LIST_SEARCH_WHS_NM').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MCOLLMNG02010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MCOLLMNG02010_POP_WHS #ITP_FORM_MCOLLMNG02010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG03010.js

@@ -243,67 +243,50 @@ let mobContObj = {
 let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MCOLLMNG03010_WHS_AREA',
-		rows: [],
 		init: function () {
+			$('#ITP_LIST_MCOLLMNG03010_POP_WHS_AREA .mb_0').children().remove();
+			$('#ITP_POP_MCOLLMNG03010_WHS_AREA #ITP_FORM_MCOLLMNG03010_POP_WHS_KEYWORD').val('');
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
 			this.action();
 		},
+		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MCOLLMNG03010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MCOLLMNG03010_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_MCOLLMNG03010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MCOLLMNG03010_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_MCOLLMNG03010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MCOLLMNG03010_POP_WHS').serializeObject();
-			param.swhsDvsn = 'W01';
+			(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_MCOLLMNG03010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG03010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MCOLLMNG03010_POP_WHS_AREA .panel-group > .item-row: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;
+			$('#ITP_FORM_MCOLLMNG03010_POP_WHS button[id="ITP_BTN_MCOLLMNG03010_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) {
-					$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH #ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH #ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM').val(item.whsNm);
-					_this.close();
-					return false;
-				}
-			});
-		},
-		action: function() {
-			var _this = this;
-			$('button[id^="ITP_BTN_MCOLLMNG03010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MCOLLMNG03010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MCOLLMNG03010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MCOLLMNG03010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH #ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_ID').val(whsId);
+			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH #ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM').val(whsNm);
+			mobPopObj.hide(this.popId);
 		},
 		delete: function() {
 			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH #ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MCOLLMNG03010_LIST_SEARCH #ITP_FORM_MCOLLMNG03010_LIST_SEARCH_WHS_NM').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MCOLLMNG03010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MCOLLMNG03010_POP_WHS #ITP_FORM_MCOLLMNG03010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG01010.js

@@ -200,68 +200,50 @@ let mobContObj = {
 let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MORDMNG01010_WHS_AREA',
-		rows: [],
 		init: function () {
+			$('#ITP_LIST_MORDMNG01010_POP_WHS_AREA .mb_0').children().remove();
+			$('#ITP_POP_MORDMNG01010_WHS_AREA #ITP_FORM_MORDMNG01010_POP_WHS_KEYWORD').val('');
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
 			this.action();
 		},
+		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MORDMNG01010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MORDMNG01010_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_MORDMNG01010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MORDMNG01010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MORDMNG01010_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_MORDMNG01010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MORDMNG01010_POP_WHS').serializeObject();
-			param.swhsDvsn = 'W01';
+			(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_MORDMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MORDMNG01010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG01010_POP_WHS_AREA .panel-group > .item-row: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;
+			$('#ITP_FORM_MORDMNG01010_POP_WHS button[id="ITP_BTN_MORDMNG01010_POP_WHS_SEARCH"]').off('click').on('click', function() {
+				_this.search();
 			});
 		},
 		choice: function(elem) {
-			var _this = this;
 			var whsId = $(elem).data('whs-id');
-			console.log("choice =====================", whsId, this.rows)
-			$.each(this.rows, function (i, item) {
-				if(whsId === item.whsId) {
-					$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM').val(item.whsNm);
-					_this.close();
-					return false;
-				}
-			});
-		},
-		action: function() {
-			var _this = this;
-			$('button[id^="ITP_BTN_MORDMNG01010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MORDMNG01010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MORDMNG01010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MORDMNG01010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID').val(whsId);
+			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM').val(whsNm);
+			mobPopObj.hide(this.popId);
 		},
 		delete: function() {
 			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MORDMNG01010_LIST_SEARCH #ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MORDMNG01010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MORDMNG01010_POP_WHS #ITP_FORM_MORDMNG01010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG02010.js

@@ -299,67 +299,50 @@ let mobContObj = {
 let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MORDMNG02010_WHS_AREA',
-		rows: [],
 		init: function () {
+			$('#ITP_LIST_MORDMNG02010_POP_WHS_AREA .mb_0').children().remove();
+			$('#ITP_POP_MORDMNG02010_WHS_AREA #ITP_FORM_MORDMNG02010_POP_WHS_KEYWORD').val('');
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
 			this.action();
 		},
+		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MORDMNG02010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MORDMNG02010_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_MORDMNG02010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MORDMNG02010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MORDMNG02010_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_MORDMNG02010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MORDMNG02010_POP_WHS').serializeObject();
-			param.swhsDvsn = 'W01';
+			(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_MORDMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MORDMNG02010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG02010_POP_WHS_AREA .panel-group > .item-row: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;
+			$('#ITP_FORM_MORDMNG02010_POP_WHS button[id="ITP_BTN_MORDMNG02010_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) {
-					$('#ITP_FORM_MORDMNG02010_LIST_SEARCH #ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MORDMNG02010_LIST_SEARCH #ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM').val(item.whsNm);
-					_this.close();
-					return false;
-				}
-			});
-		},
-		action: function() {
-			var _this = this;
-			$('button[id^="ITP_BTN_MORDMNG02010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MORDMNG02010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MORDMNG02010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MORDMNG02010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH #ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID').val(whsId);
+			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH #ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM').val(whsNm);
+			mobPopObj.hide(this.popId);
 		},
 		delete: function() {
 			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH #ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MORDMNG02010_LIST_SEARCH #ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MORDMNG02010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MORDMNG02010_POP_WHS #ITP_FORM_MORDMNG02010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/mordmng/ITP_MORDMNG03010.js

@@ -249,67 +249,50 @@ let mobContObj = {
 let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MORDMNG03010_WHS_AREA',
-		rows: [],
 		init: function () {
+			$('#ITP_LIST_MORDMNG03010_POP_WHS_AREA .mb_0').children().remove();
+			$('#ITP_POP_MORDMNG03010_WHS_AREA #ITP_FORM_MORDMNG03010_POP_WHS_KEYWORD').val('');
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
 			this.action();
 		},
+		rows: [],
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MORDMNG03010_POP_WHS_AREA .panel-group').empty();
+			$('#ITP_LIST_MORDMNG03010_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_MORDMNG03010_POP_WHS_AREA .mb_0').append($('#ITP_LIST_MORDMNG03010_POP_WHS_ROWCOPY').html());
+					var $li = $('#ITP_LIST_MORDMNG03010_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_MORDMNG03010_POP_WHS_ROWS li button')[$li.index()].addEventListener('click', function() { _this.choice(this); });
+				});
 			};
 			const param = $('#ITP_FORM_MORDMNG03010_POP_WHS').serializeObject();
-			param.swhsDvsn = 'W01';
+			(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_MORDMNG03010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MORDMNG03010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MORDMNG03010_POP_WHS_AREA .panel-group > .item-row: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;
+			$('#ITP_FORM_MORDMNG03010_POP_WHS button[id="ITP_BTN_MORDMNG03010_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) {
-					$('#ITP_FORM_MORDMNG03010_LIST_SEARCH #ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MORDMNG03010_LIST_SEARCH #ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM').val(item.whsNm);
-					_this.close();
-					return false;
-				}
-			});
-		},
-		action: function() {
-			var _this = this;
-			$('button[id^="ITP_BTN_MORDMNG03010_POP_WHS"]').off('click').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MORDMNG03010_POP_WHS_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MORDMNG03010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MORDMNG03010_POP_WHS_CLOSE'	: _this.close(); 			break;
-				}
-				return false;
-			});
+			var whsNm = $(elem).parent().prev().find('.fnWhsNm').text();
+			var location = $(elem).data('location');
+			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH #ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID').val(whsId);
+			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH #ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM').val(whsNm);
+			mobPopObj.hide(this.popId);
 		},
 		delete: function() {
 			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH #ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MORDMNG03010_LIST_SEARCH #ITP_FORM_MORDMNG03010_LIST_SEARCH_WHS_NM').val('');
-		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MORDMNG03010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MORDMNG03010_POP_WHS #ITP_FORM_MORDMNG03010_POP_WHS_KEYWORD').val('');
-			mobPopObj.hide(this.popId);
 		}
 	},
 	show: function(popId) {

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -321,12 +321,12 @@ function f_moblie_submit() {
 	let param = $('#frm_pay').serializeObject();
 	param.reqDataList = reqDataList;
 	
-	console.log("REQ : " + JSON.stringify(param));
+	// console.log("REQ : " + JSON.stringify(param));
 		
 	fn_ajax_call(EASYPAY_PAYMENT_REQUEST, JSON.stringify(param), function(result) {
 		
-		console.log("RES : " + JSON.stringify(result));
-		console.log("RES_CD : " + result.res_cd);
+		// console.log("RES : " + JSON.stringify(result));
+		// console.log("RES_CD : " + result.res_cd);
 		
 		if(result.res_cd === '0000') {
 			popPageObj.parentPopFn(result);