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

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

@@ -257,7 +257,7 @@
 		<form id="ITP_POP_FORM_MLOANMNG02010_DPST_REQ" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_POP_FORM_MLOANMNG02010_DPST_REQ_BRAND_ID" name="brandId" value="">
 			<input type="hidden" id="ITP_POP_FORM_MLOANMNG02010_DPST_REQ_STORE_ID" name="storeId" value="">
-			<div class="pop" style="height:290px;">
+			<div class="pop" style="height:355px;">
 				<div class="header">
 					<div class="header_left">
 						<label>입금등록</label>
@@ -300,7 +300,7 @@
 					<div class="line mt_5">
 						<label>입금은행</label>
 						<div class="search_wrap itp_ip">
-							<select name="dpstBnkCd" id="ITP_FORM_MLOANMNG02010_POP_DPST_BNK" data-select-code="BNK_CD" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금은행">
+							<select style="height:35px; border:1px solid #ccc; font-size:14px;" name="dpstBnkCd" id="ITP_FORM_MLOANMNG02010_POP_DPST_BNK" data-select-code="BNK_CD" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금은행">
 								<option value="">은행코드 선택</option>
 							</select>
 						</div>
@@ -323,7 +323,7 @@
 		<form id="ITP_POP_FORM_MLOANMNG02010_DPST_RJCT" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_POP_FORM_MLOANMNG02010_DPST_RJCT_BRAND_ID" name="brandId" value="">
 			<input type="hidden" id="ITP_POP_FORM_MLOANMNG02010_DPST_RJCT_STORE_ID" name="storeId" value="">
-		<div class="pop" style="height:440px;">
+		<div class="pop" style="height:490px;">
 			<div class="header">
 				<div class="header_left">
 					<label>입금요청반려</label>

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

@@ -107,7 +107,7 @@
 		<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_MRTNMNG04011_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -117,7 +117,7 @@
 				<form id="ITP_FORM_MRTNMNG04011_POP_WHS" class="form-horizontal" onsubmit="return false;">
 					<input type="hidden" id="ITP_FORM_MRTNMNG04011_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
 					<input type="hidden" id="ITP_FORM_MRTNMNG04011_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG04011_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<input id="ITP_FORM_MRTNMNG04011_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="수거장소명">
 					<button id="ITP_BTN_MRTNMNG04011_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>

src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html

@@ -225,7 +225,7 @@
 						<label>이동 수량</label>
 					</div>
 					<div class="line_right">
-						<input type="number" name="moveQty" id="ITP_FORM_MSTOCKMNG01010_POP_QTY" placeholder="0" pattern="[0-9]*">
+						<input style="height:26px;" type="number" name="moveQty" id="ITP_FORM_MSTOCKMNG01010_POP_QTY" placeholder="0" pattern="[0-9]*">
 					</div>
 				</div>
 			    <div class="search">

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

@@ -648,10 +648,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 @media screen and (min-width: 383px) {
 	section .popup2 .content .line.ml_10 {left:20px;}
 }
-@media screen and (max-width: 362px) {
+@media screen and (max-width: 352px) {
 	section .popup2 .content .line.mt_5 {top:-40px;}
 }
-@media screen and (min-width: 363px) {
+@media screen and (min-width: 353px) {
 	
 	section .popup2 .content .line.ml_10 {left:20px;}
 }