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

src/main/webapp/app/oper/OPER06010.html

@@ -222,8 +222,8 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
 													<select id="ITP_FORM_OPER06010_DETAIL_PROC_DVSN" class="form-control itp_input" name="">
-														<option>배송</option>
-														<option>수거</option>
+														<option>간소화</option>
+														<option>절차</option>
 													</select>
 												</div>
 											</div>

src/main/webapp/app/ordmng/ORDMNG01010.html

@@ -93,7 +93,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">납품장소</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-3 itp_in fnDlvPlace"></div>
+												<div class="col-xs-8 itp_in fnWhsNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">발주 총 금액</label>
 											<div class="col-xs-4 itp_ip fnPodrTotalAmt"></div>

src/main/webapp/app/stinfo/STINFO04010.html

@@ -365,7 +365,7 @@
 											<label class="col-xs-2 itp_lb">매장 배송구분</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_OPER06010_DETAIL_PROC_DVSN" class="form-control itp_input" name="">
+													<select id="ITP_FORM_OPER06010_DETAIL_DLV_DVSN" class="form-control itp_input" name="">
 														<option>공급사배송</option>
 														<option>본사배송</option>
 													</select>

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -463,6 +463,7 @@ let viewObj = {
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnPchPodrUnqNo').text(result.pchPodrUnqNo);
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnPodrDt').text(result.podrDt);
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnPchOdrStCd').text(result.pchOdrStNm);
+		$('#ITP_FORM_ORDMNG01010_VIEW .fnWhsNm').text(result.whsNm);
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnPodrTotalAmt').text(result.podrTotalAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','));
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnPodrMgrNm').text(result.podrMgrNm + ' (' + telNo + ')');
 		$('#ITP_FORM_ORDMNG01010_VIEW .fnDlvReqDt').text(result.dlvReqDt);
@@ -490,7 +491,7 @@ let viewObj = {
 				data: gridData,
 				multiselect: true,
 				loadComplete: function(data) {
-					console.log(data);
+					//console.log(data);
 					itp_fn_grid_load_complete(data, ORDMNG01010_VIEW_GRID_ID, true, 'number', 'ORDMNG01010', viewObj.itp_ORDMNG01010_search, viewObj.empty, true, data.gridRecords, true);
 				}
 			};

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

@@ -138,7 +138,7 @@
 
 	<div id="ITP_CONTAINER" class="fix">
 		<div class="itp_mobile_contents"> 
-			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" >
+			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" style="display:none;">
 				<div class="itp_note_header">
 					<h1>공지사항</h1>
 				</div>				

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

@@ -0,0 +1,112 @@
+<section id="ITP_MOBILE_MPOMNG04011">
+	<div id="ITP_AJAX_MPOMNG04011_VIEW_CONTAINER">
+	  <form id="ITP_FORM_MPOMNG04011_DETAIL" class="put_btn form-horizontal" onsubmit="return false;">
+		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_VIEW_CD" name="viewCd" value="C">
+		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_BRAND_ID" name="brandId" value="">
+		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_STORE_ID" name="storeId" value="">
+		<input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
+		<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">
+				<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 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>
+				  <div class="float_left">
+					  <input type="text" id="ITP_FORM_MPOMNG04011_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" placeholder="" readonly />
+					  <input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
+					  <input type="hidden" id="ITP_FORM_MPOMNG04011_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
+					  <div class="itp_input_btn">
+						   <button id="ITP_BTN_MPOMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button>
+						 </div>
+				  </div>
+				  <div class="float_right_btn">
+					<!-- <button id="ITP_BTN_MPOMNG04011_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG04011_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
+					<button id="ITP_BTN_MPOMNG04011_DETAIL_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_MPOMNG04011_PCH_REQ_UNQ_NO" name="pchReqUnqNo" type="text">
+				  </div>
+			  </div>
+			  <div class="line">
+				  <div class="search">
+					<button id="ITP_BTN_MPOMNG04011_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
+				  </div>
+				</div>
+				<div class="table_header">
+				<h1><발주 대상 내역></h1>
+			  </div>
+		  </div>
+		</div>
+		<div id="ITP_LIST_MPOMNG04011_ITEM_AREA" class="scroll_area row-1">
+		  <ul id="ITP_LIST_MPOMNG04011_DETAIL_ROWS" class="mb_0 panel-group"></ul>
+		   <!--   검색된 데이터가 없습니다  -->
+		   <div class="itp_non_data" style="display:none;">
+			  <div>검색된 데이터가 없습니다.</div>
+		   </div>
+		  <div id="ITP_LIST_MPOMNG04011_DETAIL_ROWCOPY" style="display: block;">
+			<li class="history_list7 item-row">
+				<div class="left">
+				  <div class="nomal">
+					<label class="col_6">구매요청번호</label>
+					<span>:</span>
+					<div class="btn fnPodrDt"></div>
+						<button style="margin-right: 5px;width: 90px;font-size: 12pt;height: 45px;" id="ITP_BTN_MPOMNG04011_DETAIL_REQ_ORDER" class="btn-primary REQ">발주처리</button>
+				  </div>
+				</div>
+				<div class="left">
+				  <div class="nomal">
+					<label class="col_6">납품장소</label>
+					<span>:</span>
+					<div class="non_btn fnLocationNm"></div>
+				  </div>
+				</div>
+				<div id="ITP_LIST_MPOMNG04011_ITEM_AREA" class="scroll_area row-1" style="height:auto;">
+				  <ul id="ITP_LIST_MPOMNG04011_DETAIL_ROWS" class="mb_0 panel-group"></ul>
+					<li class="podr_list">
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">품목명</label>
+							<span>:</span>
+							<div class="non_btn fnLocationNm"></div>
+							<label class="col_4">구매수량</label>
+							<span>:</span>
+							<div class="non_btn fnLocationNm"></div>
+						  </div>
+						</div>
+						<div class="left">
+						  <div class="nomal">
+							<label class="col_4">단가</label>
+							<span>:</span>
+							<div class="non_btn fnLocationNm"></div>
+							<label class="col_4">구매금액</label>
+							<span>:</span>
+							<div class="non_btn fnLocationNm"></div>
+						  </div>
+						</div>
+					</li>
+				</div>
+			  </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>
+  </section>

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

@@ -114,7 +114,7 @@ section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14pt; color:gr
 section .popup2 .pop .popup_scroll li .scroll_left .wichi{font-size:14pt; color:gray;}
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14pt; color:#b88278;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right; width:50px;}
-section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{width:27px; margin:18px 11px 0 11px;}
+section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{width:27px; margin:21px 11px 0 11px;}
 section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height: 38px; padding: 0; background:#8f9fc6; border:1px solid #cacfe3; color:#eee; border-radius: 10px; font-size: 14px; margin:16px 0px;}
 section .popup2 .pop .popup_scroll li .scroll_right button:hover {background:#708cd1;}
 section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:21px; width:91px; height:27px;}
@@ -582,6 +582,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal div.full{width:calc(100% - 90px);}
 .scroll_area li .left .nomal div.full_s{width:calc(100% - 45px);}
 .scroll_area li .left .nomal div.auto{width:auto;}
+.scroll_area li .left .nomal div.btn {flex:1;}
+.scroll_area li .left .nomal div.non_btn {width:calc(100% - 192px);}
 
 
 .scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}