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

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

@@ -8,7 +8,6 @@
 		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
 		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
 		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
-		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
 		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_MALL_ID" name="mallId" value="">
 		<div class="content">
 			<div class="content_fix">
@@ -17,7 +16,12 @@
 				</div>
 			  <div class="line">
 				<label>납기요청일</label>
-				<input type="text" id="ITP_FORM_MPOMNG04011_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="itp_input date" data-check-required="empty" readonly>
+				<div class="date_to date">
+		          <input type="text" id="ITP_FORM_MPOMNG04011_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" readonly>
+		          <div class="at">~</div>
+		          <input type="text" id="ITP_FORM_MPOMNG04011_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" readonly>
+		        </div>
+				<!-- <input type="text" id="ITP_FORM_MPOMNG04011_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="itp_input date" data-check-required="empty" readonly> -->
 			  </div>
 			  <div class="line">
 				<label>납품장소</label>
@@ -98,11 +102,6 @@
 			  </li>
 		  </div>
 		</div>
-		<div class="button_bar">
-		  <button id="ITP_BTN_MPOMNG04011_DETAIL_REQ_ORDER" data-call-popup="ITP_POP_MPOMNG04011_REQ_AREA" class="col_3 btn-m-orange REQ">구매요청</button>
-		  <button id="ITP_BTN_MPOMNG04011_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MPOMNG04011_REQ_AREA" class="col_3 btn-w-gray TSA">임시저장</button>
-		  <button id="ITP_BTN_MPOMNG04011_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
-		</div>
 	  </form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>

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

@@ -1,6 +1,6 @@
 <section id="ITP_MOBILE_MRTNMNG04011">
 	<div id="ITP_AJAX_MRTNMNG04011_VIEW_CONTAINER">
-	  <form id="ITP_FORM_MRTNMNG04011_DETAIL" class="put_btn form-horizontal" onsubmit="return false;">
+	  <form id="ITP_FORM_MRTNMNG04011_DETAIL" class="area_full form-horizontal" onsubmit="return false;">
 		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_VIEW_CD" name="viewCd" value="C">
 		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_BRAND_ID" name="brandId" value="">
 		<input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_STORE_ID" name="storeId" value="">
@@ -17,7 +17,12 @@
 				</div>
 			  <div class="line">
 				<label>수거요청일</label>
-				<input type="text" id="ITP_FORM_MRTNMNG04011_DETAIL_COL_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
+				<div class="date_to date">
+		          <input type="text" id="ITP_FORM_MRTNMNG04011_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" readonly>
+		          <div class="at">~</div>
+		          <input type="text" id="ITP_FORM_MRTNMNG04011_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" readonly>
+		        </div>
+				<!-- <input type="text" id="ITP_FORM_MRTNMNG04011_DETAIL_COL_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly> -->
 			  </div>
 			  <div class="line">
 				<label>수거장소</label>
@@ -26,8 +31,8 @@
 					  <input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
 					  <input type="hidden" id="ITP_FORM_MRTNMNG04011_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
 					  <div class="itp_input_btn">
-						   <button id="ITP_BTN_MRTNMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button>
-						 </div>
+					   <button id="ITP_BTN_MRTNMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button>
+					 </div>
 				  </div>
 				  <div class="float_right_btn">
 					<!-- <button id="ITP_BTN_MRTNMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
@@ -98,11 +103,6 @@
 			  </li>
 		  </div>
 		</div>
-		<div class="button_bar">
-		  <button id="ITP_BTN_MRTNMNG04011_DETAIL_REQ_ORDER" data-call-popup="ITP_POP_MRTNMNG04011_REQ_AREA" class="col_3 btn-m-orange REQ">구매요청</button>
-		  <button id="ITP_BTN_MRTNMNG04011_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG04011_REQ_AREA" class="col_3 btn-w-gray TSA">임시저장</button>
-		  <button id="ITP_BTN_MRTNMNG04011_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
-		</div>
 	  </form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>

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

@@ -58,7 +58,7 @@ section .popup2 .pop .search_bar {width: 90%; height: 60px; margin:0 auto; paddi
 section .popup2 .pop .search_bar input {width: 80%; height: 34px; position:relative; font-size:14px;}
 section .popup2 .pop .search_bar select {width: 80%; height: 34px; position:relative; font-size:14px;}
 section .popup2 .pop .search_bar select:focus {outline:none;}
-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 {position:relative; width:34px; height:34px; background:transparent; margin-right:0%; margin-top:3px; border: 1px solid #ccc; 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;}