모바일 반품관리 html 수정

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

@@ -95,6 +95,9 @@
 	</div>
 	<div id="ITP_AJAX_MRTNMNG02010_DETAIL_CONTAINER" style="display: none;">
 		<div class="content">
+			<div class="line header">
+				<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청현황</div>
+	      	</div>
 			<div class="line">
 				<label>반품요청일</label>
 				<div class="line_right">
@@ -259,7 +262,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_MRTNMNG02010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
@@ -297,7 +300,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_MRTNMNG02010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>

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

@@ -3,7 +3,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_MRTNMNG04010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -17,16 +17,17 @@
 					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:none;">
-					<li class="list-row">
+				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display: none;">
+					<li class="list-row row_2">
 						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
+							<div class="fnWhsNm"></div>
+							<div class="sub fnLocationNm"></div>
+							<div class="sub fnLocationNm"></div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -36,12 +37,15 @@
 			</div>
 		</div>
 	</div>
-	<div id="ITP_AJAX_MRTNMNG04010_LIST_CONTAINER" style="display: block;">
+	<div id="ITP_AJAX_MRTNMNG04010_LIST_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MRTNMNG04010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_IDX" name="sidx" value="0">
 			<div class="content">
+				<div class="line header">
+				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
+			    </div>
 				<div class="line">
 					<label>반품요청일</label>
 					<div class="date_to">
@@ -52,39 +56,37 @@
 				</div>
 				<div class="line">
 					<label>반품발주상태</label>
-					<div class="search_wrap">
-						<div class="line_right">
-							<select id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="stcd" name="srtnOdrStCd">
-								<option value=""></option>
-							</select>
-						</div>
+					<div class="float_left">
+						<select id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_ODR_ST_CD" data-select-code="RTN_ODR_ST_CD" class="stcd" name="srtnOdrStCd">
+							<option value=""></option>
+						</select>
 					</div>
 				</div>
 				<div class="line">
 					<label>수거장소</label>
-					<div class="search_nm">
-						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM" class="" name="srtnWhsNm" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM" class="" name="srtnWhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
 				<div class="line">
 					<label>반품입고장소</label>
-					<div class="search_nm">
-						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG04010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
 				<div class="line" style="height:50px;">
 					<div class="search">
@@ -92,13 +94,13 @@
 					</div>
 				</div>
 				<div class="table_header">
-					<h1>> 반품 발주 내역</h1>
+					<h1><반품 발주 내역></h1>
 				</div>
 			</div>
 			<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA" class="scroll_area row-3">
-				<ul id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS" class="panel-group"></ul>
+				<ul id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list list-row">
+					<li class="history_list">
 						<div class="left">
 							<div class="nomal">
 								<label>반품발주일자 &nbsp;:</label>
@@ -147,6 +149,9 @@
 		<form id="ITP_FORM_MRTNMNG04010_VIEW" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
 			<div class="content">
+				<div class="line header">
+				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
+			    </div>
 				<div class="line">
 					<label>반품발주일자</label>
 					<div class="line_right">
@@ -175,45 +180,45 @@
 					<h1>> 반품 발주 품목</h1>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3">
-				<ul id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display:none;">
-					<li class="list-row">
-						<div>
-							<div class="left_info col-4">
-								<div class="thick">
-									<div class="fnItemNm">품목명</div>
-									<i>-</i>
-									<div class="fnRtnOdrQty"></div>
-								</div>
-							</div>
-							<div class="left_info col-6">
-								<div class="thick">
-									<label>수량/금액</label>
-									<div class="fnRtnReqQty"></div>
-									<i>/</i>
-									<div class="fnUnitAmt"></div>
-								</div>
-							</div>
-							<div class="left_info col-4">
-								<div class="thick">
-									<label style="margin:0;">구매가 :</label>
-									<div class="fnRtnOdrAmt"></div>
-								</div>
-							</div>
-							<div class="left_info col-6">
-								<div class="thick">
-									<label>납기요청일&nbsp;:&nbsp;</label>
-									<div class="fnColReqDt"></div>
-								</div>
-							</div>
+			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3-1">
+				<ul id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: block;">
+					<li class="list-row2">
+					  <div class="left">
+						<div class="nomal">
+						  <label>품목명</label>
+						  <span>:</span>
+						  <div class="fnItemNm"></div>
+						</div>
+					  </div>
+					  <div class="left">
+						<div class="nomal">
+						  <label>수량</label>
+						  <span>:</span>
+						  <div class="history">
+							<div class="fnPodrQty"></div>
+						  </div>
+						  <label class="sub_info">금액&nbsp;:</label>
+						  <div class="history">
+							<div class="fnUnitAmt"></div>
+						  </div>
+						</div>
+					  </div>
+					  <div class="left">
+						<div class="nomal">
+						  <label>구매가 </label>
+						  <div class="history">
+						  <span>:</span>
+						  <div class="fnPodrAmt"></div>
+						  </div>
 						</div>
+					  </div>
 					</li>
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL" class="col_6 btn-gray CLB">반품취소</button>
-				<button id="ITP_BTN_MRTNMNG04010_VIEW_CANCEL_LIST" class="col_6 btn-gray CLB">목록</button>
+				<button id="ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL" class="btn_col_6 btn-yellow CLB">반품취소</button>
+				<button id="ITP_BTN_MRTNMNG04010_VIEW_CANCEL_LIST" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>

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

@@ -368,7 +368,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.btn_col_3 {width: 35%;}
 .button_bar button.btn_col_6 {width: 65%;}
 .button_bar button.btn_col_3,
-.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 60px; font-size: 1.4rem; font-weight: 700; border-radius: 0px;}
+.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 60px; font-size: 16px; font-weight: 100; border-radius: 0px;}
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 60px; font-size: 18px;}
 
 /* scroll_area 조정 */
@@ -378,14 +378,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-2{top: 345px;}
 .row-2-1{top:317px;}
 .row-3{top: 395px;}
-
+.row-3-1{top: 355px;}
 .row-4{top: 439px;}
 .row-5{top: 418px;}
 .row-6{top: 468px;}
 .row-7{top: 533px;}
 .row-9{top: 383px;}
 .row-10{top: 349px;}
-.row-11{top: 254px;}
+.row-11{top: 309px;}
 .col-4{width:35% !important;}
 .col-6{width:60% !important;}
 .col-4 .thick{width:100% !important;}