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

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

@@ -104,7 +104,209 @@
 
 	<div id="ITP_CONTAINER" class="fix">
 		<div class="itp_mobile_contents">
-
+<section id="ITP_MOBILE_MPOMNG05010">
+	<div id="ITP_AJAX_MPOMNG05010_LIST_CONTAINER" >
+		<form id="ITP_FORM_MPOMNG05010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
+			<input type="hidden" id="ITP_FORM_MPOMNG0500_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
+			<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
+			<input type="hidden" id="ITP_FORM_MPOMNG05010_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">
+					<select class="itp_label_select" name="dtlGubun" id="ITP_FORM_MPOMNG05010_LIST_DTL_GUBUN">
+						<option value="1">발주생성일</option>
+						<option value="2">납품요청일</option>
+						<option value="3">납품예정일</option>
+						<option value="4">납품완료일</option>
+					</select>
+					<div class="date_to">
+						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
+						<div class="at">~</div>
+						<input id="ITP_FORM_MPOMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
+					</div>
+				</div>
+				<div class="line">
+					<label>납품상태</label>
+					<div class="float_left">
+						<select id="ITP_FORM_MPOMNG04010_LIST_SEARCH_DLV_ST_CD" data-select-code="DLV_ST_CD" class="stcd" name="sdlvStCd">
+						<select name="dlvStCd" id="ITP_FORM_MPOMNG05010_LIST_DLV_ST_CD">
+							<option value=""></option>
+						</select>
+					</div>
+				</div>
+				<div class="line">
+					<label>공급업체</label>
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
+						<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
+           				<div class="itp_input_btn">
+							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
+						</div>
+					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_SPPLY_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
+				</div>
+				<div class="line">
+					<label>납품장소</label>
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
+           				<div class="itp_input_btn">
+							<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+						</div>
+					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MPOMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
+				</div>
+				<div class="line">
+					<label>품목명</label>
+					<div class="float_left name">
+						<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
+					</div>
+				</div>
+				<div class="line" style="height:50px;">
+					<div class="search">
+						<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
+					</div>
+				</div>
+				<div class="table_header">
+					<h1><납품서 내역></h1>
+				</div>
+			</div>
+			<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_AREA" class="scroll_area row-4">
+				<ul id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
+					<li class="history_list2">
+						<div class="left">
+							<div class="nomal">
+								<label class="">납품번호 </label>
+								<span>:</span>
+								<div class="fnDlvSttmtUnqNo"></div>
+							</div>
+						</div>
+						<div class="left">
+							<div class="nomal">
+								<label>납품예정일</label>
+								<span>:</span>
+								<div class="fnDlvReqDt history_info"></div>
+								<label class="fn sub_info">납품일자</label>
+								<span>:</span>
+								<div class="fnDlvSchDt"></div>
+							</div>
+						</div>
+						<div class="left">
+							<div class="nomal">
+								<label>공급업체</label>
+								<span>:</span>
+								<div class="fnSpplyNm history_info"></div>
+								<label class="sub_info">납품장소</label>
+								<span>:</span>
+								<div class="fnWhsNm"></div>
+							</div>
+						</div>
+						<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="fnPodrQty history_info"></div>
+								<label class="sub_info">납품수량</label>
+								<span>:</span>
+								<div class="fnDlvQty"></div>
+							</div>
+						</div>
+					</li>
+				</div>
+			</div>
+		</form>
+	</div>
+	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MPOMNG05010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
+		<div class="pop">
+			<div class="header">
+				<div class="header_left">
+					<label>공급업체</label>
+				</div>
+				<div class="header_right">
+					<button type="button" id="ITP_BTN_MPOMNG05010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MPOMNG05010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MPOMNG05010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
+					<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="select_btn">
+				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
+			</div>
+			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
+				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
+					<li class="row_2">
+						<div class="scroll_left">
+							<div class="con_2 fnSpplyNm">공급업체 명A</div>
+							<div class="con_2 sub fnStNm">($)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="ITP_POP_MPOMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+		<div class="pop">
+			<div class="header">
+				<div class="header_left">
+					<label>납품장소</label>
+				</div>
+				<div class="header_right">
+					<button type="button" id="ITP_BTN_MPOMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MPOMNG05010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MPOMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MPOMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="select_btn">
+				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
+			</div>
+			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display: none;">
+					<li class="row_2">
+						<div class="scroll_left">
+							<div class="fnWhsNm"></div>
+							<div class="sub fnLocationNm"></div>
+							<div class="sub fnLocationNm"></div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MPOMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
+</section>
 		</div>
 	</div>
 	<footer id="ITP_FOOTER">

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

@@ -104,6 +104,9 @@
   </div>
   <div id="ITP_AJAX_MPOMNG02010_VIEW_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">
@@ -132,7 +135,7 @@
         <h1><구매 품목></h1>
       </div>
     </div>
-    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-2">
+    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-3-1">
       <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="mb_0 panel-group"></ul>
       <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display: block;">
         <li class="list-row">
@@ -213,7 +216,7 @@
       </div>
       <div id="ITP_LIST_MPOMNG02010_MODIFY_AREA" class="scroll_area row-1-1">
         <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
-        <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: none;">
+        <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: block;">
           <li class="list-row">
             <div class="left_info">
               <div class="check_box">

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

@@ -109,10 +109,13 @@
 		  </div>
 	  </form>
 	</div>
-	<div id="ITP_AJAX_MPOMNG04010_VIEW_CONTAINER" style="display: none;">
+	<div id="ITP_AJAX_MPOMNG04010_VIEW_CONTAINER" style="display: block;">
 	   <form id="ITP_FORM_MPOMNG04010_VIEW" class="form-horizontal" onsubmit="return false;">
 		<input type="hidden" id="ITP_FORM_MPOMNG04010_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">
@@ -147,9 +150,9 @@
 			  <h1><발주 품목></h1>
 			</div>
 		  </div>
-		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-2">
+		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
 		  <ul id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display:none;">
+			  <div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_ROWCOPY" style="display: block;">
 				<li class="list-row2">
 				  <div class="left">
 					<div class="nomal">

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

@@ -5,13 +5,12 @@
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG05010_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">
-						<!--<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" readonly>
-						<span class="input-group-addon itp_date_to">~</span>
-						<input type="text" id="ITP_FORM_STINFO02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" readonly>-->
-
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
 						<div class="at">~</div>
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
@@ -21,63 +20,62 @@
 					<label>수거서번호</label>
 					<div class="search_wrap">
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" style="width: 262px;" type="text" placeholder="">
+							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
 						</div>
 					</div>
 				</div>
 				<div class="line">
 					<label>반품입고장소</label>
-					<div class="search_nm">
-						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" data-check-required="empty" class="" name="srtnWhsId" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" data-check-required="empty" class="" name="srtnWhsId" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG05010_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_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
 				<div class="line">
 					<label>반품품목명</label>
-					<div class="search_wrap">
-						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="A매장명">
-						</div>
+					<div class="float_left name">
+						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
 					</div>
 				</div>
-				<div class="line" style="height:50px;">
+				<div class="header line">
 					<div class="search">
 						<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 					</div>
 				</div>
 				<div class="table_header">
-					<h1>> 반품서 내역</h1>
+					<h1><반품서 내역></h1>
 				</div>
 			</div>
 		</form>
 		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-4">
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list2 list-row">
+				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
+					<li class="history_list2">
 						<div class="left">
 							<div class="nomal">
 								<label>반품번호 </label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnRtnPodrUnqNo"></div>
 								</div>
 							</div>
@@ -86,6 +84,7 @@
 							<div class="nomal">
 								<label class="history_label">반품예정일</label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnRtnSchDt history_info"></div>
 								</div>
 							</div>
@@ -94,10 +93,12 @@
 							<div class="nomal">
 								<label>공급업체</label>
 								<div class="history">
+									<span>:</span>	
 									<div class="history_info fnSpplyNm"></div>
 								</div>
 								<label class="sub_info">반품장소</label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnRtnWhsNm"></div>
 								</div>
 							</div>
@@ -106,6 +107,7 @@
 							<div class="nomal">
 								<label>품목 </label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnItemNm"></div>
 								</div>
 							</div>
@@ -113,11 +115,13 @@
 						<div class="left">
 							<div class="nomal">
 								<label class="col_2">반품요청수량</label>
-								<div class="col_5 history">
-									<div class="col_5 fnRtnReqQty"></div>
+								<div class=" history">
+									<span>:</span>
+									<div class=" fnRtnReqQty"></div>
 								</div>
 								<label class="col_0">반품발주수량</label>
 								<div class="history">
+									<span>:</span>
 									<input class="" id="ITP_FORM_MRTNMNG05010_LIST_RTN_PODR_QTY" type="text" name="rtnPodrQty">
 								</div>
 							</div>
@@ -127,7 +131,7 @@
 			</div>
 			<div class="button_bar">
 				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-primary INPS">반품처리</button>
-				<!--<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+				<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
 		</form>
 	</div>
@@ -136,7 +140,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_MRTNMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -150,16 +154,17 @@
 					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display:none;">
-					<li class="list-row">
+				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: block;">
+					<li class="list-row row_2">
 						<div class="scroll_left">
 							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">(상세위치내용)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -5,6 +5,9 @@
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_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">
@@ -15,47 +18,43 @@
 				</div>
 				<div class="line">
 					<label>반품발주번호</label>
-					<div class="search_wrap">
-						<div class="line_right">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
-						</div>
+					<div class="float_left">
+						<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
 					</div>
 				</div>
 				<div class="line">
 					<label>반품입고장소</label>
-					<div class="search_wrap">
-						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
-							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
+						<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG06010_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_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
 							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
+							<div class="itp_input_btn">
+								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+							</div>
 						</div>
-						<div class="float_left_btn">
-							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+						<div class="float_right_btn">
 							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
-					</div>
 				</div>
 				<div class="line">
 					<label>품목명</label>
-					<div class="search_wrap">
-						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="품목명">
-						</div>
+					<div class="float_left">
+						<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
 					</div>
 				</div>
-				<div class="line" style="height:50px;">
+				<div class="line">
 					<div class="search">
 						<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 					</div>
@@ -65,13 +64,14 @@
 				</div>
 			</div>
 			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-4">
-				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list2 list-row">
+				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: block;">
+					<li class="history_list2 ">
 						<div class="left">
 							<div class="nomal">
 								<label>반품발주번호 </label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnRtnPodrNo"></div>
 								</div>
 							</div>
@@ -80,6 +80,7 @@
 							<div class="nomal">
 								<label class="history_label">반품예정일</label>
 								<div class="history">
+									<span>:</span>
 									<div class="fn_info fnRtnSchDt"></div>
 								</div>
 							</div>
@@ -88,10 +89,12 @@
 							<div class="nomal">
 								<label>공급업체</label>
 								<div>
+									<span>:</span>
 									<div class="fnSpplyNm">A공급업체명</div>
 								</div>
 								<label class="sub_info">납품장소</label>
 								<div>
+									<span>:</span>
 									<div class="fnWhsNm">A매장내</div>
 								<div>
 							</div>
@@ -100,6 +103,7 @@
 							<div class="nomal">
 								<label>품목 </label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnItemNm">품목명(EA)</div>
 								</div>
 							</div>
@@ -108,10 +112,12 @@
 							<div class="nomal">
 								<label>반품발주수량</label>
 								<div class="history">
+									<span>:</span>
 									<div class="col_5 fnRtnPodrQty"></div>
 								</div>
 								<label class="sub_info">반품입고수량</label>
 								<div class="history">
+									<span>:</span>
 									<div class="fnRtnWhsQty">10</div>
 								</div>
 							</div>
@@ -122,11 +128,11 @@
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
-	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
 		<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_MRTNMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -140,16 +146,17 @@
 					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display:none;">
-					<li class="list-row">
+				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG06010_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">(상세위치내용)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -379,7 +379,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-2-1{top:317px;}
 .row-3{top: 395px;}
 .row-3-1{top: 355px;}
-.row-4{top: 439px;}
+.row-4{top: 435px;}
+.row-4-1 {top: 400px;}
 .row-5{top: 418px;}
 .row-6{top: 468px;}
 .row-7{top: 533px;}