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

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

@@ -7,101 +7,98 @@
 		  <input type="hidden" id="ITP_FORM_MORDMNG01010_SEARCH_SPPLY_ID" name="sspplyId" value="">
 		  <input type="hidden" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_IDX" name="sidx" value="0">
 		  <div class="content">
-			<div class="line">
-			  <label>납품장소</label>
-			  <div class="search_wrap">
+			  <div class="content_fix">
+			  	<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="float_left">
-					<input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
+					  <input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A매장명">
 					  <input type="hidden" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
+   					  <div class="itp_input_btn">
+						  <button type="button" id="ITP_BTN_MORDMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+					  </div>
 				  </div>
-				  <div class="float_left_btn">
-					  <button type="button" id="ITP_BTN_MORDMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
+				  <div class="float_right_btn">
 					  <button type="button" id="ITP_BTN_MORDMNG01010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 				  </div>	
-			  </div>
-			</div>
-			<div class="line">
-			  <label>수주상태</label>
-			  <div class="line_right">
-				<select name="spchOdrStCd" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_ST_CD" data-select-code="PCH_ODR_ST_CD">
-				  <option value=""></option>
-				</select>
-			  </div>
-			</div>
-			<div class="line">
-			  <label>수주일자</label>
-			  <div class="date_to">
-				  <input type="text" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
-				  <div class="at">~</div>
-				  <input type="text" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
-			  </div>
-			</div>
-			<div class="line">
-				<label>발주번호/품목번호/품목명</label>
-			  <div class="search_wrap">
-				<input id="ITP_FORM_MORDMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="검색어입력">
-			  </div>
-			</div>
-			<div class="line" style="height:50px;">
-			  <div class="search">
-				<button id="ITP_BTN_MORDMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
-			  </div>
-			</div>
-			<div class="table_header">
-			  <h1>> 수거수주 내역</h1>
+				</div>
+				<div class="line">
+				  <label>수주상태</label>
+				  <div class="float_left">
+					<select name="spchOdrStCd" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_ST_CD" data-select-code="PCH_ODR_ST_CD">
+					  <option value=""></option>
+					</select>
+				  </div>
+				</div>
+				<div class="line">
+				  <label>수주일자</label>
+				  <div class="date_to">
+					  <input type="text" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
+					  <div class="at">~</div>
+					  <input type="text" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
+				  </div>
+				</div>
+				<div class="line">
+					<label>검색명</label>
+				  <div class="float_left name">
+					<input style="font-size:12pt;" id="ITP_FORM_MORDMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="발주번호/품목번호/품목명">
+				  </div>
+				</div>
+				<div class="line">
+				  <div class="search">
+					<button id="ITP_BTN_MORDMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
+				  </div>
+				</div>
+				<div class="table_header">
+				  <h1><수거수주 내역></h1>
+				</div>
 			</div>
 		  </div>
 		  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_AREA" class="scroll_area row-3">
-			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
+			  <ul id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
+			  <div id="ITP_LIST_MORDMNG01010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list list-row">
 				  <div class="btn_check">
 					<div class="left">
 					  <div class="nomal">
-						<label>브랜드명 &nbsp;:</label>
-						<div>
-						  <div class="fnBrandNm"></div>
-						</div>
-						<label>발주번호&nbsp;:</label>
-						<div>
-						  <div class="fnPchPodrUnqNo"></div>
-						</div>
+						<label>브랜드명</label>
+						<span>:</span>
+					    <div class="fnBrandNm"></div>
+						<label>발주번호</label>
+						<span>:</span>
+					    <div class="fnPchPodrUnqNo"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label>발주상태 &nbsp;:</label>
-						<div>
-						  <div class="fnPchOdrStNm"></div>
-						</div>
-						<label>발주일자&nbsp;:</label>
-						<div>
-						  <div class="fnPodrDt"></div>
-						</div>
+						<label>발주상태</label>
+						<span>:</span>
+					    <div class="fnPchOdrStNm"></div>
+						<label>발주일자</label>
+						<span>:</span>
+					    <div class="fnPodrDt"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label class="col_6">납품요청일 &nbsp;:</label>
-						<div>
-						  <div class="fnDlvReqDt"></div>
-						</div>
-						<label>납품장소&nbsp;:</label>
-						<div>
-						  <div class="fnWhsNm"></div>
-						</div>
+						<label class="col_6">납품요청일</label>
+						<span>:</span>
+					    <div class="fnDlvReqDt"></div>
+						<label>납품장소</label>
+						<span>:</span>
+					    <div class="fnWhsNm"></div>
 					  </div>
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label>발주금액 &nbsp;:</label>
-						<div>
-						  <div class="fnPodrTotalAmt"></div>
-						</div>
-						<label>품목수&nbsp;:</label>
-						<div>
-						  <div class="fnPodrItemQty">3개</div>
-						</div>
+						<label>발주금액</label>
+						<span>:</span>
+					    <div class="fnPodrTotalAmt"></div>
+						<label>품목수</label>
+						<span>:</span>
+					    <div class="fnPodrItemQty">3개</div>
 					  </div>
 					</div>
 				  </div>

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

@@ -582,7 +582,6 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 	.content .line div.date_to input {width:47%}
 	.modal-dialog {margin:auto 20% !important;}
 	.scroll_area li .left_info .thick {width: 90%;}
-	.content .line .search_wrap input {width:78%;}
 	.content .line .search_wrap select {width:78%;}	
 	
 }