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

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

@@ -162,6 +162,7 @@
 			<div class="line">
 			  <div class="search" style="margin-top:40px;">
 			  	<button id="ITP_BTN_MLOANMNG02010_VIEW_PAY_REQ" class="col_3 btn-primary btn-sm ">결제요청</button>
+  				<button id="ITP_BTN_MLOANMNG02010_VIEW_PAY_REQ_CANCEL" class="col_3 btn-gray btn-sm CLB">취소</button>
 			  </div>
 			</div>
 		  </div>	

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

@@ -36,11 +36,10 @@
 			</div>
 			<div class="table_header">
 			  <h1>> 재고 목록</h1>
-			  <button type="button" id="ITP_BTN_MSTOCKMNG01010_LIST_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
-			  <button type="button" id="ITP_BTN_MSTOCKMNG01010_LIST_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MSTOCKMNG01010_ITEM_AREA">품목추가</button>
+			  <button type="button" id="ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MSTOCKMNG01010_STCK_AREA">재고처리</button>
 			</div>
 		  </div>
-			<div id="ITP_LIST_MSTOCKMNG01010_ITEM_AREA" class="scroll_area row-2">
+			<div id="ITP_POP_MSTOCKMNG01010_STCK_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MSTOCKMNG01010_LIST_ROWS" class="panel-group"></ul>
 			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ROWCOPY" style="display:none;">
 				<li class="history_list">
@@ -97,11 +96,6 @@
 				</li>
 			</div>
 		  </div>
-		  <div class="button_bar">
-			  <button id="ITP_BTN_MSTOCKMNG01010_LIST_REQ_ORDER" data-call-popup="ITP_POP_MSTOCKMNG01010_REQ_AREA" class="col_3 btn-primary REQ">구매요청</button>
-			  <button id="ITP_BTN_MSTOCKMNG01010_LIST_TEMP_SAVE" data-call-popup="ITP_POP_MSTOCKMNG01010_REQ_AREA" class="col_3 btn-gray TSA">임시저장</button>
-			  <button id="ITP_BTN_MSTOCKMNG01010_LIST_CANCEL" class="col_3 btn-gray CLB">취소</button>
-		  </div>
 	  </form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
@@ -109,58 +103,65 @@
 		<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_MSTOCKMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
 				</div>
 			</div>
-			<form id="ITP_FORM_MSTOCKMNG01010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
-				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
-				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
-				<div class="search_bar">
-					<input id="ITP_FORM_MSTOCKMNG01010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
-					<button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
+			<div style="margin-top:10px;">
+				<div class="list_line">
+					<div class="list_label">
+						<label>창고명</label>
+					</div>
+					<div class="list_info">
+						<div class="pay_info fnPayNo">브랜드 창고 2</div>
+					</div>
 				</div>
-				<div class="search_bar">
-					<button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
+				<div class="list_line">
+					<div class="list_label">
+						<label>구매자명</label>
+					</div>
+					<div class="list_info">
+						<div class="pay_info fnPayNm">매장 대표자명</div>
+					</div>
 				</div>
-			</form>
-			<div class="popup_scroll">
-				<ul id="ITP_LIST_MSTOCKMNG01010_POP_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MSTOCKMNG01010_POP_ITEM_ROWCOPY" style="display:block;">
-					<li class="row_2"
-						data-brandUnitUnqNo=""
-						data-podrPssblDvsn=""
-						data-spplyId=""
-						data-stddQty=""
-						data-storeUnitUnqNo=""
-						data-unit=""
-						data-unitAmt=""
-						data-unitGubun="">
-						<div class="left" style="width:200px;">
-							<div class="check_box">
-								<input type="checkbox" id="ITP_FORM_MSTOCKMNG01010_POP_ITEM_CHECKBOX" name="itemId" />
-							</div>
-							<div class="thick">
-								<div class="fnItemNm">품목명</div>
-								<div>-</div>
-								<div class="fnOrdUnit">EA</div>
-							</div>
-							<div class="thick" style="font-weight:100;">
-								<div class="space">구매가 :</div>
-								<div class="fnOrdAmount">0</div>
-							</div>
-						</div>
-						<div class="right">
-							<button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_PLUS">-</button>
-							<div class="num">2</div>
-							<button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_MINUS">+</button>
-						</div>
-						<div class="add">
-							<button id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_ADD">추가</button>
-						</div>
-					</li>
+				<div class="list_line">
+					<div class="list_label">
+						<label>상품명</label>
+					</div>
+					<div class="list_info">
+						<div class="pay_info fnItemNm">매장 아이디 + 월일 + 금액</div>
+					</div>
+				</div>
+				<div class="list_line">
+					<div class="list_label">
+						<label>결제금액 *</label>
+					</div>
+					<div class="list_info">
+						<div class="pay_info fnItemNm">매장 아이디 + 월일 + 금액</div>
+					</div>
+				</div>
+				<div class="list_line">
+					<div class="list_label">
+						<label>휴대전화번호 *</label>
+					</div>
+					<div class="list_info" style="padding-top:10px;">
+						<input id="ITP_FORM_MLOANMNG02010_VIEW_MBL_NO" name="mblNo" type="text">
+					</div>
+				</div>
+				<div class="list_line border">
+					<div class="list_label border">
+						<label>E-mail</label>
+					</div>
+					<div class="list_info mail" style="padding-top:10px;">
+						<input id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL" name="email" class="" type="text">
+						<span>@</span>
+						<input id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL" name="email" class="" type="text">
+						<select name="emailCd" id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL_CD" data-select-code="EMAIL_CD" data-check-required="empty">
+							<option value="">선택</option>
+						</select>
+					</div>
 				</div>
 			</div>
 		</div>

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

@@ -57,6 +57,15 @@ section .popup2 .pop .popup_scroll li .right .num {margin: 0 20px; width: auto;}
 section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 1rem; border-radius: 0px;}
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
 section .popup2 .pop .content .line button {width: 40%; height: 35px;font-size: 1rem; padding: 0; margin: 0 10px;}
+section .popup2	.list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
+section .popup2 .border {border-bottom: 1px solid #000 !important;}
+section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:50px; padding-top:17px; border-bottom:none; background:#eee;}
+section .popup2 .list_line .list_info {width:70%;height:50px; border:1px solid #000; padding-top:17px; border-left:none; border-bottom:none;}
+section .popup2 .list_line .list_info input{width:90%;}
+section .popup2 .list_line .mail input {width:30%;}
+section .popup2 .list_line .mail select {width:30%;}
+section .popup2 .list_line .list_info .pay_info {text-align:left; padding-left:17px;}
+
 
 section .popup3 { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
 section .popup3 .content {position: fixed; z-index: 10; width:100%; height:596px; background: #fff;}