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

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

@@ -167,9 +167,6 @@
                     <button id="ITP_BTN_MPOMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
                 </form>
             </div>
-            <div class="select_btn">
-                <button id="ITP_BTN_MPOMNG01010_POP_WHS_NM" class="btn_red">납품장소 <img src="../img/arrow_down.png"></button>
-            </div>    
             <div id="ITP_LIST_MPOMNG01010_POP_WHS_AREA" class="popup_scroll">
                 <ul id="ITP_LIST_MPOMNG01010_POP_WHS_ROWS" class="mb_0 itp_nav"></ul>
                 <div id="ITP_LIST_MPOMNG01010_POP_WHS_ROWCOPY" style="display: none;">
@@ -205,7 +202,6 @@
                 </div>
                 <div class="select_btn">
    					<button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="btn_blue">추가</button>
-                    <button id="ITP_BTN_MPOMNG01010_POP_ITEM_NM" class="btn_red">품목명  <img src="../img/arrow_down.png"></button>
                 </div>
             </form>
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">

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

@@ -11,7 +11,7 @@
 					<div class="line header">
 						<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청</div>
 			      	</div>
-					<div class="line mt5">
+					<div class="line">
 						<label>반품요청일</label>
 						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
 					</div>
@@ -37,7 +37,7 @@
 							<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
-					<div class="table_btn">
+					<div class="table_btn line">
 						<h1><반품 품목></h1>
 						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-danger btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>

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

@@ -193,7 +193,7 @@
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
-					<div class="table_btn">
+					<div class="table_btn line">
 						<h1><반품 품목></h1>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-danger btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>

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

@@ -49,15 +49,15 @@ section .popup2 .pop .header .header_left label {font-size: 16px; font-weight:10
 section .popup2 .pop .header .header_right {float: right; padding-right: 10px; position:relative; top:-44px;}
 section .popup2 .pop .header .header_right button {border: none; background: transparent; margin:3px -5px;}
 section .popup2 .pop .header .header_right button img {width:22px;}
-section .popup2 .pop .select_btn {position:relative; width:100%; height: 63px;}
+section .popup2 .pop .select_btn {position:relative; width:100%; height: 45px;}
 section .popup2 .pop .select_btn button.btn_red {float: right; width: 90px; height: 25px; margin:0 7px; background:#d9baaf; color: #fff; font-size: 12px; padding-top:4px; border: 1px solid #cca597;}
-section .popup2 .pop .select_btn button.btn_blue {float: right; width: 90px; height: 25px; margin:0 7px; background:#8f9fc6; color: #fff; font-size: 12px; padding-top:4px; border: 1px solid #cacfe3;}
+section .popup2 .pop .select_btn button.btn_blue {float: right; width: 90px; height: 34px; margin:0 7px; background:#8f9fc6; color: #fff; font-size: 12pt; padding-top:4px; border: 1px solid #cacfe3;}
 section .popup2 .pop .select_btn button.btn_blue:active{background-color: #708cd1;}
 section .popup2 .pop .select_btn img {width:12px;}
 section .popup2 .pop .search_bar {width: 90%; height: 60px; margin:0 auto; padding:10px;}
-section .popup2 .pop .search_bar input {width: 80%; height: 27px; position:relative; font-size:14px;}
-section .popup2 .pop .search_bar button {position:relative; width:27px; height:27px; background:transparent; margin-right:0%; margin-top:3px; border: 1px solid #aaa; border-radius:4px; padding:0px;}
-section .popup2 .pop .search_bar button img {width: 17px; position:relative; top:-1px;}
+section .popup2 .pop .search_bar input {width: 80%; height: 34px; position:relative; font-size:14px;}
+section .popup2 .pop .search_bar button {position:relative; width:34px; height:34px; background:transparent; margin-right:0%; margin-top:3px; border: 1px solid #aaa; border-radius:4px; padding:0px;}
+section .popup2 .pop .search_bar button img {width: 18px; position:relative; top:-1px;}
 section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
 section .popup2 .pop .search_item_bar {width:98%;margin:5px auto; position: relative; top:-40px; display:flex;}
 section .popup2 .pop .search_item_bar input {width:40%; height:27px; border-radius:5px; margin:0; font-size:12px;}
@@ -83,7 +83,7 @@ section .popup2 .pop .table_tr .table_td div {text-overflow:ellipsis; overflow:h
 section .popup2 .pop .table_tr .table_td .chkItem {margin-top:-5px; width:15px; left:50%; position:relative; transform:translateX(-50%);}
 
 section .popup2 .pop .popup_scroll ul.mb_0 {margin-bottom:0 !important;}
-section .popup2 .pop .popup_scroll {position: relative; top:-25px; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 70%; overflow: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 100%; height: 50px; border-bottom: 1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li.row_2 {height: 70px; display:flex;}