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

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

@@ -39,7 +39,7 @@
 						  <div class="fnUseAmtTotal">0원</div>
 					  </div>
 				  </div>
-				<div class="line top6">
+				<div class="line">
 				  <label>거래일자</label>
 				  <div class="date_to">
 					  <input type="text" id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH_FROM_DT" name="fromDt" class="itp_input date" readonly>
@@ -60,7 +60,7 @@
 			<div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_AREA" class="scroll_area row-11">
 			 <ul id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWCOPY" style="display: none;">
-				<li class="history_list6 item-row">
+				<li class="history_list15 item-row">
 				  <div>
 					<div class="detail_line">
 					  <div class="detail_left">

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

@@ -150,14 +150,14 @@
 					  <div>
 						<div class="left">
 						  <div class="nomal">
-							<label class="col_4">품목명</label>
+							<label class="col_7">품목명</label>
 							<span>:</span>
 						    <div class="full fnItemNm"></div>
 						  </div>
 						</div>
 						<div class="left">
 						  <div class="nomal">
-							<label class="col_4">단가금액</label>
+							<label class="col_7">단가금액</label>
 							<span>:</span>
 						    <div class="col_82 lit fnUnitAmt"></div>
 							<label class="col_7">정산구분</label>
@@ -167,7 +167,7 @@
 						</div>
 						<div class="left">
 						  <div class="nomal">
-							<label class="col_4">발주수량</label>
+							<label class="col_7">발주수량</label>
 							<span>:</span>
 						    <div class="col_82 lit fnPodrQyt"></div>
 							<label class="col_7">입고(수거)일자</label>
@@ -206,7 +206,7 @@
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_PAY_MOBILE_URL" name="kicc_action_mobile_url" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_PAY_JS_URL" name="kicc_javascript_url" value="">
 			<div class="content">
-				<div class="line" style="height:140px;">
+				<div class="line" style="height:110px;">
 					<label class="pay_label">수발주 선불(충전)을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여<br> PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.</label>
 				</div>
 				<div class="list_line">
@@ -237,7 +237,7 @@
 					<div class="list_label">
 						<label>결제금액 *</label>
 					</div>
-					<div class="list_info" style="padding-top:8px;">
+					<div class="list_info" style="padding-top:5px;">
 						<div class="pay_info fnItemNm"></div>
 						<input id="ITP_FORM_MLOANMNG03010_PAY_GOODS_AMT" name="goodsAmt" type="text" readonly>
 					</div>
@@ -246,7 +246,7 @@
 					<div class="list_label">
 						<label>결제방법 *</label>
 					</div>
-					<div class="list_info mail" style="padding-top:10px;">
+					<div class="list_info mail" style="padding-top:5px;">
 						<select id="ITP_FORM_MLOANMNG02010_PAY_PAY_METHOD" name="payMethod" style="width:90%;">
 							<option value="11">신용카드</option>
 							<option value="21">계좌이체</option>
@@ -257,7 +257,7 @@
 					<div class="list_label">
 						<label>휴대전화번호 *</label>
 					</div>
-					<div class="list_info" style="padding-top:8px;">
+					<div class="list_info" style="padding-top:5px;">
 						<input id="ITP_FORM_MLOANMNG03010_PAY_ORD_TEL" name="ordTel" type="text" data-check-required="empty">
 					</div>
 				</div>
@@ -265,7 +265,7 @@
 					<div class="list_label border">
 						<label>E-mail</label>
 					</div>
-					<div class="list_info mail" style="padding-top:8px;">
+					<div class="list_info mail" style="padding-top:5px;">
 						<input id="ITP_FORM_MLOANMNG03010_PAY_ORD_EMAIL" name="ordEmail" class="" type="hidden">
 						<input id="ITP_FORM_MLOANMNG03010_PAY_EMAIL_ID" name="emailId" class="" type="text" data-check-required="empty">
 						<span>@</span>

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

@@ -386,16 +386,16 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:6px;}
 .content .line .search button {width: 40%; height: 26px; font-size: 12pt; font-weight:100; padding: 0;}
 .content .line .search button.col_3 {width: 25%; height:26px; margin:0 10px;}
-.content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
+.content .list_line {width:98%; float:left; height:36px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}
-.content .list_line .list_label {width:30%;border:1px solid #000; height:50px; padding-top:14px; border-bottom:none; background:#eee;}
+.content .list_line .list_label {width:30%;border:1px solid #000; height:36px; padding-top:7px; border-bottom:none; background:#eee;}
 .content .list_line .list_label label {font-size:12pt;}
 .content .list_line .list_info {width:70%;height:50px; border:1px solid #000; padding-top:15px; border-left:none; border-bottom:none;}
 
 .content .list_line .list_info input{width:90%; margin:0;}
 
 .content .list_line .mail input {width:30%;}
-.content .list_line .mail select {width:30%; height:34px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
+.content .list_line .mail select {width:30%; height:26px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:12pt;}
 .content .table_header {margin-top: 6px; width: 100%; height: 20px;}
 .content .table_btn {margin-top: 6px; width: 100%; height: 40px;}
@@ -507,6 +507,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list12 {height: 170px; padding-top:4px;}
 .scroll_area li.history_list13 {height: 200px; padding-top:4px;}
 .scroll_area li.history_list14 {height: 175px; padding-top:4px;}
+.scroll_area li.history_list15 {height: 75px; padding-top:0px;}
 
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:28px; margin-top:0px;}
@@ -517,7 +518,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left .history input{width: 150px;}
 
-.scroll_area li .detail_line {width: 100%; height:25px; display: inline-block;}
+.scroll_area li .detail_line {width: 100%; height:16px; display: inline-block;}
 .scroll_area li .detail_left {float: left;}
 .scroll_area li .detail_left .detail_info {margin: 5px 10px;}
 .scroll_area li .detail_left .detail_info div {width: auto; font-size: 14px; font-weight: 700;}

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

@@ -115,7 +115,6 @@ let mobContObj = {
 			this.listPage += 1;
 		},
 		load: function() {
-			var _this = this;
 			var callbackFn = function(result) {
 				console.log(result);
 				mobContObj.list.pager(result.gridTotal);
@@ -131,7 +130,7 @@ let mobContObj = {
 					$li.find('.fnWhsAmt').text(CommonObj.currency.add(item.whsAmt));
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
 					$li.find('.fnWhsQty').val(item.whsQty);
-					$('button[id="ITP_BTN_MPOMNG06010_WHS_QTY"]')[$li.index()].addEventListener('click', function() { _this.popupQty(item); });
+					$('button[id="ITP_BTN_MPOMNG06010_WHS_QTY"]')[$li.index()].addEventListener('click', function() { mobContObj.list.popupQty(item); });
 					mobContObj.list.rows.push(item);
 				});
 			};

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

@@ -108,7 +108,6 @@ let mobContObj = {
 			this.listPage += 1;
 		},
 		load: function() {
-			var _this = this;
 			var callbackFn = function(result) {
 				console.log(result);
 				mobContObj.list.pager(result.gridTotal);
@@ -124,7 +123,7 @@ let mobContObj = {
 					$li.find('.fncolReqAmt').text(CommonObj.currency.add(item.colReqAmt));
 					$li.find('.fnRodrQty').text(CommonObj.currency.add(item.rodrQty, ''));
 					$li.find('#ITP_FORM_MRTNMNG05010_LIST_COL_QTY').val(item.colQty);
-					$('button[id="ITP_BTN_MRTNMNG05010_COL_QTY"]')[$li.index()].addEventListener('click', function() { _this.popupQty(item); });
+					$('button[id="ITP_BTN_MRTNMNG05010_COL_QTY"]')[$li.index()].addEventListener('click', function() { mobContObj.list.popupQty(item); });
 					mobContObj.list.rows.push(item);
 				});
 			};