모바일 html 수정

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

@@ -49,7 +49,7 @@
 					<li class="list-row">
 						<div class="left_info">
 			              <div class="check_box">
-			                <div style="display:none;"><input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
+			                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
 			              </div>
 			              <div class="thick">
 			              	<label>품목명</label>
@@ -59,7 +59,7 @@
 			              <div class="thick">
 			              	<label>구매가</label>
 			                <span>:</span>
-			                <div class="itp_amt fnUnitAmt">asdfasdf</div>
+			                <div class="itp_amt fnUnitAmt"></div>
 			              </div>
 			            </div>
 						<div class="right">
@@ -79,18 +79,30 @@
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
 	<div id="ITP_POP_MRTNMNG01010_RTN_AREA" class="popup mobile-pop-close" style="display: none;">
-		<div class="pop">
+		<div class="pop short">
 			<div class="pop_line">
-				<label>반품요청일 &nbsp;&nbsp;:</label>
-				<div class="fnRtnReqDt"></div>
+            	<div class="itp_label_area">
+					<label>반품요청일</label>
+				</div>
+	            <div class="itp_info_area">
+					<div class="fnRtnReqDt"></div>
+				</div>
 			</div>
 			<div class="pop_line">
-				<label>품목수&nbsp;&nbsp; :</label>
-				<div class="fnItemQty">개</div>
+				<div class="itp_label_area">
+					<label>품목수</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnItemQty"></div>
+				</div>
 			</div>
-			<div class="pop_line">
-				<label>반품금액 &nbsp;&nbsp;:</label>
-				<div class="fnRtnAmt">원</div>
+			<div class="pop_line border">
+				<div class="itp_label_area">
+					<label>반품금액</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnRtnAmt"></div>
+				</div>
 			</div>
 			<label class="pop_label msg_save">요청 하시겠습니까?</label>
 			<div class="popup_btn">
@@ -118,7 +130,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소▼</button>
+				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -155,12 +167,12 @@
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
 				<div class="select_btn">
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
+					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						 <div class="scroll_left">
                             <div class="fnItemNm"></div>

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

@@ -1,9 +1,12 @@
 <section id="ITP_MOBILE_MRTNMNG02010">
-	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: none;">
+	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: block;">
 		<div class="content">
 			<form id="ITP_FORM_MRTNMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
+			  	<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="input-group date_to date">
@@ -14,7 +17,7 @@
 				</div>
 				<div class="line">
 					<label>반품요청상태</label>
-					<div class="line_right">
+					<div class="float_left">
 						<select id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_RTN_REQ_ST_CD" data-select-code="RTN_REQ_ST_CD" class="stcd" name="srtnReqStCd">
 							<option value="">상태</option>
 						</select>
@@ -22,16 +25,16 @@
 				</div>
 				<div class="line">
 					<label>납품장소</label>
-					<div class="search_wrap">
-						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
 				<div class="line" style="height:50px;">
 					<div class="search">
@@ -39,21 +42,21 @@
 					</div>
 				</div>
 				<div class="table_header">
-					<h1>>구매 요청 내역</h1>
+					<h1><반품 요청 내역></h1>
 				</div>
 			</form>
 		</div>
-		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-1-1">
-			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="panel-group"></ul>
-			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display:none;">
-				<li class="history_list list-row">
+		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-10">
+			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
+			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: block;">
+				<li class="history_list5">
 					<div class="left">
 						<div class="nomal">
 							<label>반품요청일 </label>
 							<span>:</span>
 							<div class="history">
-								<div class="fnRtnReqDt"></div>
-								(<div class="fnRtnReqMgrNm"></div>)
+								<div class="fnRtnReqDt">asdf</div>
+								(<div class="fnRtnReqMgrNm">asdf</div>)
 							</div>
 						</div>
 					</div>
@@ -114,23 +117,24 @@
 				<h1>> 반품 품목</h1>
 			</div>
 		</div>
-		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-2">
-			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="panel-group"></ul>
-			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display:none;">
+		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-11">
+			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
+			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: block;">
 				<li class="list-row">
 					<div class="left_info">
 						<div class="thick">
-							<div class="fnItemNm">품목명</div>
-							<div>-</div>
-							<div class="fnUnit"></div>
-						</div>
-						<div class="thick">
-							<label class="space0">반품가 :</label>
-							<div class="fnRtnAmt"></div>
-						</div>
+			              	<label>품목명</label>
+			                <span>:</span>
+			                <div class="itp_item fnItemNm"></div>
+	                	</div>
+		                <div class="thick">
+		              		<label>구매가</label>
+		                	<span>:</span>
+		                	<div class="itp_amt fnRtnAmt"></div>
+		                </div>
 					</div>
 					<div class="right">
-						<div class="fnRtnQty"></div>
+						<div class="fnnum fnRtnQty">1</div>
 					</div>
 				</li>
 			</div>
@@ -149,6 +153,9 @@
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID" name="rtnReqMgrId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
 			<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>
 					<input id="ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT" name="colReqDt" class="date fnColReqDt" data-check-required="empty" type="date" placeholder="">
@@ -161,43 +168,44 @@
 				</div>
 				<div class="line">
 					<label>반품장소</label>
-					<div class="search_nm">
-						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
-				<div class="line">
+				<div class="header line">
 					<div class="table_header">
-						<h1>>반품 품목</h1>
+						<h1><반품 품목></h1>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
 					</div>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-1-1">
-				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display:none;">
+			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-2-1">
+				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: block;">
 					<li class="list-row">
 						<div class="left_info">
 							<div class="check_box"><!-- class 변경 -->
-								<div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
-							</div>
-							<div class="thick">
-								<div class="fnItemNm">품목명</div>
-								<div>-</div>
-								<div class="fnUnit">EA</div>
+								<input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
 							</div>
 							<div class="thick">
-								<label class="space0">구매가 :</label>
-								<div class="fnUnitAmt"></div>
-							</div>
+				              	<label>품목명</label>
+				                <span>:</span>
+				                <div class="itp_item fnItemNm">품목명</div>
+			              	</div>
+			              	<div class="thick">
+				              	<label>구매가</label>
+				                <span>:</span>
+				                <div class="itp_amt fnUnitAmt"></div>
+			             	 </div>
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
@@ -215,18 +223,30 @@
 		</form>
 	</div>
 	<div id="ITP_POP_MRTNMNG02010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
-		<div class="pop">
+		<div class="pop short">
 			<div class="pop_line">
-				<label>반품요청일 &nbsp;&nbsp;:</label>
-				<div class="fnPopDlvReqDt"></div>
+            	<div class="itp_label_area">
+					<label>반품요청일</label>
+				</div>
+	            <div class="itp_info_area">
+					<div class="fnPopDlvReqDt"></div>
+				</div>
 			</div>
 			<div class="pop_line">
-				<label>품목수&nbsp;&nbsp; :</label>
-				<div class="fnItemQty"></div>
+				<div class="itp_label_area">
+					<label>품목수</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnItemQty"></div>
+				</div>
 			</div>
-			<div class="pop_line">
-				<label>구매금액 &nbsp;&nbsp;:</label>
-				<div class="fnRtnTotalAmt"></div>
+			<div class="pop_line border">
+				<div class="itp_label_area">
+					<label>반품금액</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnRtnTotalAmt"></div>
+				</div>
 			</div>
 			<label class="pop_label msg_save">구매요청 하시겠습니까?</label>
 			<div class="popup_btn">
@@ -253,16 +273,17 @@
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display:none;">
+				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">누리자 B/D</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -289,36 +310,27 @@
 					<input id="ITP_FORM_MRTNMNG02010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
-				<div class="search_bar">
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
+				<div class="select_btn">
+					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display:none;">
+				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
 					<li class="row_2">
-						<div class="left" style="width:180px;">
-							<!--<div class="check_box">
-                                <input type="checkbox" id="ITP_FORM_MRTNMNG02010_POP_ITEM_CHECKBOX" name="itemId" />
-                            </div>-->
-							<div class="thick">
-								<div class="fnItemNm">품목명</div>
-								<div>-</div>
-								<div class="fnUnit">EA</div>
-							</div>
-							<div class="thick" style="font-weight:100;">
-								<div class="space">구매가 :</div>
-								<div class="fnUnitAmt">0</div>
-							</div>
-						</div>
+						 <div class="scroll_left">
+                            <div class="fnItemNm"></div>
+                            <div class="sub fnKg"></div>
+                            <div class="amt fnUnitAmt"></div>
+                        </div>
+                        <div class="scroll_right">
+                            <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
+                        </div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-							<div class="num fnRtnQty">1</div>
+							<div class="num fnPchReqQty">1</div>
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
 						</div>
-						<div class="add">
-							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
-						</div>
 					</li>
 				</div>
 			</div>

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

@@ -12,6 +12,7 @@ body .login {position:fixed;}
 /* 팝업 */
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
 section .popup .pop {position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 360px; padding-top: 20px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
+section .popup .pop.short {height:260px;}
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
 section .popup .pop div.pop_msg {padding:0 5%; text-align:left; position:relative; top:10px; font-size: 16px;}
 section .popup .pop .pop_line {width: 90%; margin:0 5%; display:flex; border:1px solid #aaa; border-bottom:none;}
@@ -377,12 +378,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-2{top: 300px;}
 .row-2-1{top:317px;}
 .row-3{top: 395px;}
+
 .row-4{top: 440px;}
 .row-5{top: 418px;}
 .row-6{top: 468px;}
 .row-7{top: 533px;}
 .row-9{top: 383px;}
-
+.row-10{top: 349px;}
+.row-11{top: 254px;}
 .col-4{width:35% !important;}
 .col-6{width:60% !important;}
 .col-4 .thick{width:100% !important;}