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

src/main/webapp/app/pomng/POMNG05010.html

@@ -46,7 +46,7 @@
 											<button type="button" id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" />
+											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
 											<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
 										</div>
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">

src/main/webapp/css/style.css

@@ -126,8 +126,8 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_HEADER .itp_logo {margin:0; padding:0; color:#337ab7; float:left; width:30px;}
 #ITP_HEADER .itp_logo img{width:30px;}
 #ITP_HEADER .itp_txt_brand {float:left; margin:1px; padding:0 4px; color:#fff; font-size:18px; text-decoration:none;}
-#ITP_HEADER .itp_sch_brand {margin:0 4px; padding:0; color:#337ab7; float:left; width:30px;}
-#ITP_HEADER .itp_sch_brand button{width:33px;}
+#ITP_HEADER .itp_sch_brand {margin:0 4px; padding:0; color:#337ab7; float:left; width:90px;}
+#ITP_HEADER .itp_sch_brand button{width:90px; border:1px solid #000;}
 #ITP_HEADER .itp_menu {float:left; border:1px solid #ddd; line-height: 26px; background:#eee;margin:4px; border-radius: 2px; padding:0 4px;}
 #ITP_HEADER .itp_menu a {color:#000; font-size:13px; text-decoration:none;}
 #ITP_HEADER .itp_out {float:left; border:1px solid #000; line-height: 27px; background:#666; margin:4px; border-radius: 2px; padding:0 4px;}

src/main/webapp/main.html

@@ -62,8 +62,7 @@
 					<!--<span class="itp_logo"><img src="/oqpo-view/images/favicon.ico" alt="로고"></span>-->
 					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_TIMEOUT"></span>
 					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_BRAND"></span>
-					<span class="itp_sch_brand"><button type="button" id="ITP_BTN_MAIN_SHR_AFFL" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button></span>
-					<span class="itp_menu"><a href="javascript:void(0)" class="">메뉴안내</a></span>
+					<span class="itp_sch_brand"><button type="button" id="ITP_BTN_MAIN_SHR_AFFL" class="btn btn-success btn-sm SEB">가맹점검색</button></span>
 					<span class="itp_out"><a href="javascript:void(0)" class="ITP_BTN_LOGOUT">로그아웃</a></span>
 				</div>
 			</div>

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

@@ -143,7 +143,7 @@
 			</div>
 		</div>
 	</div>
-	<div id="ITP_POP_MSTOCKMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
+	<div id="ITP_POP_MSTOCKMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -156,48 +156,35 @@
 			<form id="ITP_FORM_MSTOCKMNG02010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
-				<div class="search_bar">
+				<div class="search_item_bar">
 					<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_ST_CD" data-select-code="ST_CD" name="sitemStCd"></select>
 					<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_GUBUN" data-select-code="ITEM_GUBUN" name="sitemGubun"></select>
 					<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_TYPE" data-select-code="ITEM_TYPE" name="sitemType"></select>
 					<input id="ITP_FORM_MSTOCKMNG02010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
-					<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
+				<div class="search_btn_bar">
+					<div class="btn_right">
+						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_SEARCH" class="btn-primary"><img src="../img/w_search.png">조회</button>
+						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_CHECK" class="btn-green"><img src="../img/w_check.png">선택</button>
+					</div>
+				</div>	
+			<table border="1">
+				<tbody>
+				<th><input type="checkbox"checked></th>
+				<th>품목번호</th>
+				<th>품목명</th>
+				<th>단위</th>
+				<th>현재고수량</th>
+				<tr>
+					<td><input type="checkbox"checked></td>
+					<td>212212121212121</td>
+					<td>테스트 품목명 3</td>
+					<td>ㅁㄴㅇ</td>
+					<td>ㄻㄴㅇ</td>
+				</tr>
+				</tbody>
+			</table>
 			</form>
-			<div id="ITP_LIST_MSTOCKMNG02010_POP_ITEM_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MSTOCKMNG02010_POP_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MSTOCKMNG02010_POP_ITEM_ROWCOPY" style="display:none;">
-					<li class="row_2">
-						<div class="left" style="width:180px;">
-							<div class="check_box">
-                                <input type="checkbox" id="ITP_FORM_MSTOCKMNG02010_POP_ITEM_CHECKBOX" name="itemId" />
-                            </div>
-							<div class="thick">
-								<div class="fnItemId">품목번호</div>
-							</div>
-							<div class="thick">
-								<div class="fnItemNm">품목명</div>
-							</div>
-							<div class="thick" style="font-weight:100;">
-								<div class="space">단위 :</div>
-								<div class="fnUnit"></div>
-							</div>
-							<div class="thick" style="font-weight:100;">
-								<div class="space">현재고수량 :</div>
-								<div class="fnStckQty"></div>
-							</div>
-						</div>
-						<div class="right">
-							<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-							<div class="num fnPchReqQty">1</div>
-							<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
-						</div>
-						<div class="add">
-							<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
-						</div>
-					</li>
-				</div>
-			</div>
 		</div>
 	</div>
   </section>

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

@@ -36,7 +36,16 @@ section .popup2 .pop .search_bar button {float: right; border: none; padding-top
 section .popup2 .pop .search_bar button img {width: 30px; height: 30px;}
 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_bar button.btn_blue {float: right; width: 100px; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000;}
-
+section .popup2 .pop .search_item_bar {width:100%; margin-top:10px;}
+section .popup2 .pop .search_item_bar input {width:22%; border-radius:2px;}
+section .popup2 .pop .search_item_bar select {width:22%;border-radius:2px;}
+section .popup2 .pop .search_btn_bar {width:100%; height:50px; margin-top:10px; margin-right:10px;}
+section .popup2 .pop .search_btn_bar .btn_right {float:right; margin-right:10px;}
+section .popup2 .pop .search_btn_bar .btn_right button img{width:18px; height:18px; margin-right:2px;}
+section .popup2 .pop .search_btn_bar .btn_right button {height:35px; padding:5px 8px; font-size:12px; border-radius:3px; border:1px solid #333;}
+section .popup2 .pop table{width:98%; margin:0 1%;}
+section .popup2 .pop table tbody th {height:50px; font-size:16px;}
+section .popup2 .pop table tbody input{width:15px;}
 section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
 section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
@@ -94,6 +103,7 @@ button.btn-primary  {color: #fff; background-color: #337ab7; border: 1px solid #
 button.btn-yellow   {color: #fff; background-color: rgb(255, 183, 0); border: 1px solid #000;font-weight: 700;}
 button.btn-gray     {color: #fff; background-color: gray; border: 1px solid #000;font-weight: 700;}
 button.btn-danger   {color: #fff; background-color: rgb(247, 76, 76); border: 1px solid #000;font-weight: 700;}
+button.btn-green	{color: #fff; background-color: #5cb85c; border: 1px solid #000;font-weight: 700;}
 button:hover {background: rgb(229, 248, 202); color: #000;}
 
 /* 실행,로딩 */