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

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -184,6 +184,14 @@ div.tablediv > .table-bordered {
 	text-align:left;
 	overflow-x:auto !important;
 }
+.ui-jqgrid .ui-jqgrid-lmt-20 {
+	position: relative;
+	height:510px !important;
+	margin:0;
+	padding:0;
+	text-align:left;
+	overflow-x:auto !important;
+}
 .ui-jqgrid .ui-jqgrid-btable {
 	table-layout: fixed;
 	border-left:none ;

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

@@ -19,7 +19,7 @@
 				<button id="ITP_BTN_MLOANMNG01010_LIST_DELETE_STORE_NM"><img src="../img/delete.png" alt=""></button>
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line top6">
 			  <label>정산타입</label>
 			  <div class="float_left">
 				<select name="sloanDvsn" id="ITP_FORM_MLOANMNG01010_LIST_LOAN_DVSN" data-select-code="LOAN_DVSN">
@@ -27,7 +27,7 @@
 				</select>
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line top9">
 			  <label>사용여부</label>
 			  <div class="float_left">
 				<select name="suseYn" id="ITP_FORM_MLOANMNG01010_LIST_USE_YN" data-select-code="USE_YN" name="suseYn">
@@ -35,7 +35,7 @@
 				</select>
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line top3">
 			  <div class="search">
 				<button id="ITP_BTN_MLOANMNG01010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 			  </div>
@@ -46,11 +46,12 @@
 		  </div>
 	   <div id="ITP_LIST_MLOANMNG01010_LIST_ITEM_AREA" class="scroll_area row-2">
 		  <ul id="ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MLOANMNG01010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list">
 				  <div class="left">
 					<div class="nomal">
-					  <label>매장명 &nbsp;:</label>
+					  <label class="col_3">매장명</label>
+					  <span>:</span>
 					  <div class="history">
 						<div class="fnStoreNm"></div>
 					  </div>
@@ -62,7 +63,8 @@
 				  </div>
 				  <div class="left">
 					<div class="nomal">
-					  <label>한도금액 &nbsp;:</label>
+					  <label class="col_3">한도금액</label>
+					  <span>:</span>
 					  <div class="history">
 						<div class="fnLimitAmt"></div>
 					  </div>
@@ -74,7 +76,8 @@
 				  </div>
 				  <div class="left">
 					<div class="nomal">
-					  <label class="col_6">가수금금액 &nbsp;:</label>
+					  <label class="col_3">가수금금액</label>
+					  <span>:</span>
 					  <div class="history">
 						<div class="fnTmpRcvAcctTotal"></div>
 					  </div>
@@ -86,7 +89,8 @@
 				  </div>
 				  <div class="left">
 					<div class="nomal">
-					  <label>사용여부 &nbsp;:</label>
+					  <label class="col_3">사용여부</label>
+					  <span>:</span>
 					  <div class="history">
 						<div class="fnUseYnNm"></div>
 					  </div>
@@ -135,15 +139,15 @@
 					  <div class="fnUseAmtTotal">0원</div>
 				  </div>
 			  </div>
-			<div class="line">
+			<div class="line top6">
 			  <label>거래일자</label>
 			  <div class="date_to">
 				<input id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
-				<div class="at">~</div>
+				<div style="margin:4px;">~</div>
 				<input id="ITP_FORM_MLOANMNG01010_VIEW_SEARCH_TO_DT" name="toDt" class="year" type="date">
 			  </div>
 			</div>
-			<div class="line" style="height:45px;">
+			<div class="line">
 			  <div class="search">
 				<button id="ITP_BTN_MLOANMNG01010_VIEW_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 			  </div>
@@ -152,9 +156,9 @@
 			  <h1><여신 입출금 이력></h1>
 			</div>
 		  </div>
-			<div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_AREA" class="scroll_area row-6">
-			 <ul id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWCOPY" style="display: none;">
+			<div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_AREA" class="scroll_area row-11">
+			 <ul id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
+			  <div id="ITP_LIST_MLOANMNG01010_VIEW_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list6">
 				  <div>
 					<div class="detail_line">
@@ -222,11 +226,11 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MLOANMNG01010_POP_SOTRE_NM" class="btn_blue">매 장 ▼</button>
+				<button id="ITP_BTN_MLOANMNG01010_POP_SOTRE_NM" class="btn_blue">매 장 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MLOANMNG01010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: none;">
+				<div id="ITP_LIST_MLOANMNG01010_POP_STORE_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="con_2 fnStoreNm"></div>

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

@@ -51,7 +51,7 @@
 					  <div class="fnUseAmtTotal">0원</div>
 				  </div>
 			  </div>
-			<div class="line">
+			<div class="line top3">
 			  <label>거래일자</label>
 			  <div class="date_to">
 				  <input type="text" id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
@@ -59,15 +59,15 @@
 				  <input type="text" id="ITP_FORM_MLOANMNG01011_VIEW_SEARCH_TO_DT" name="toDt" class="itp_input date">
 			  </div>
 			</div>
-			  <div class="line">
+			  <div class="line top3">
 				  <label>입금지급구분</label>
-				  <div class="float_left" style="margin-left:5px;">
+				  <div class="float_left">
 					  <select name="sdpstPayDvsn" id="ITP_FORM_MLOANMNG01011_VIEW_DPST_PAY_DVSN" data-select-code="DPST_PAY_DVSN">
 						  <option value=""></option>
 					  </select>
 				  </div>
 			  </div>
-			<div class="line" style="height:45px;">
+			<div class="line">
 			  <div class="search">
 				<button id="ITP_BTN_MLOANMNG01011_VIEW_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 			  </div>
@@ -76,9 +76,9 @@
 			  <h1><여신 입출금 이력></h1>
 			</div>
 		  </div>
-			<div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_AREA" class="scroll_area row-6">
+			<div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_AREA" class="scroll_area row-14">
 			  <ul id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list4 list-row">
 				  <div>
 					<div class="detail_line">

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

@@ -10,19 +10,17 @@
 	      	</div>
 			<div class="line">
 			  <label>매장선텍</label>
-			  <div class="search_wrap">
-				  <div class="float_left">
-					<input id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM" name="sstoreNm" type="text" placeholder="A매장명" readonly>
-					<div class="itp_input_btn">	
-						<button id="ITP_BTN_MLOANMNG02010_LIST_SEARCH_RTN_PLACE"><img src="../img/search.png" alt=""></button>
-					</div>
-				  </div>
-				  <div class="float_right_btn">
-					<button id="ITP_BTN_MLOANMNG02010_LIST_DELETE_RTN_PLACE"><img src="../img/delete.png" alt=""></button>
-				  </div>
+			  <div class="float_left">
+				<input id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM" name="sstoreNm" type="text" placeholder="A매장명" readonly>
+				<div class="itp_input_btn">	
+					<button id="ITP_BTN_MLOANMNG02010_LIST_SEARCH_RTN_PLACE"><img src="../img/search.png" alt=""></button>
+				</div>
+			  </div>
+			  <div class="float_right_btn">
+				<button id="ITP_BTN_MLOANMNG02010_LIST_DELETE_RTN_PLACE"><img src="../img/delete.png" alt=""></button>
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line top6">
 			  <label>입금상태</label>
 			  <div class="float_left">
 				<select name="sdpstStCd" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_DPST_ST_CD" data-select-code="DPST_ST_CD">
@@ -30,7 +28,7 @@
 				</select>
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line top12">
 			  <label>입금일자</label>
 			  <div class="date_to">
 				  <input type="text" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
@@ -38,7 +36,7 @@
 				  <input type="text" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line top6">
 			  <div class="search">
 			  	<button id="ITP_BTN_MLOANMNG02010_LIST_PAY" class="col_3 btn-danger btn-sm ">결제하기</button>
 				<button id="ITP_BTN_MLOANMNG02010_LIST_ADD" class="col_3 btn-yellow btn-sm ">입금등록</button>
@@ -49,7 +47,7 @@
 			  <h1><입금 요청 내역></h1>
 			</div>
 		  </div>
-			<div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
+			<div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA" class="scroll_area row-12">
 			  <ul id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list4">
@@ -151,7 +149,7 @@
 					<div class="list_label">
 						<label>결제금액 *</label>
 					</div>
-					<div class="list_info" style="padding-top:4px;">
+					<div class="list_info" style="padding-top:8px;">
 						<!-- <div class="pay_info fnItemNm"></div> -->
 						<input id="ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT" name="goodsAmt" value="100" type="text" readonly>
 					</div>
@@ -160,7 +158,7 @@
 					<div class="list_label">
 						<label>결제방법 *</label>
 					</div>
-					<div class="list_info mail" style="padding-top:4px;">
+					<div class="list_info mail" style="padding-top:10px;">
 						<select id="ITP_FORM_MLOANMNG02010_PAY_PAY_METHOD" name="payMethod" style="width:90%;">
 							<option value="11">신용카드</option>
 							<option value="21">계좌이체</option>
@@ -171,7 +169,7 @@
 					<div class="list_label">
 						<label>휴대전화번호 *</label>
 					</div>
-					<div class="list_info" style="padding-top:4px;">
+					<div class="list_info" style="padding-top:8px;">
 						<input id="ITP_FORM_MLOANMNG02010_PAY_ORD_TEL" name="ordTel" value="010-2329-8816" type="text" data-check-required="empty" data-key-up="number">
 					</div>
 				</div>
@@ -179,7 +177,7 @@
 					<div class="list_label border">
 						<label>E-mail</label>
 					</div>
-					<div class="list_info mail" style="padding-top:4px;">
+					<div class="list_info mail" style="padding-top:8px;">
 						<input id="ITP_FORM_MLOANMNG02010_PAY_ORD_EMAIL" name="ordEmail" class="" type="hidden">
 						<input id="ITP_FORM_MLOANMNG02010_PAY_EMAIL_ID" name="emailId" class="" type="text" data-check-required="empty">
 						<span>@</span>
@@ -224,7 +222,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_blue">매 장 ▼</button>
+				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_blue">매 장 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MLOANMNG02010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG02010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -256,37 +254,37 @@
 					</div>
 				</div>
 				<div class="content" style="border:none;">
-					<div class="line">
+					<div class="line mt_5">
 						<label>브랜드명</label>
 						<div class="search_wrap itp_ip">
 							<input id="ITP_FORM_MLOANMNG02010_POP_BRAND_NM" name="brandNm" data-check-required="empty" type="text" placeholder="A 브랜드명" readonly>
 						</div>
 					</div>
-					<div class="line">
+					<div class="line mt_5">
 						<label>매장명</label>
 						<div class="search_wrap itp_ip">
 							<input id="ITP_FORM_MLOANMNG02010_POP_STORE_NM" name="storeNm" data-check-required="empty" type="text" placeholder="A매장명" readonly>
 						</div>
 					</div>
-					<div class="line">
+					<div class="line mt_5">
 						<label>입금금액</label>
 						<div class="search_wrap itp_ip">
 							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_AMT" name="dpstAmt" data-check-required="empty" type="text" >
 						</div>
 					</div>
-					<div class="line">
+					<div class="line mt_5">
 						<label>입금일자</label>
 						<div class="search_wrap itp_ip">
 							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_DT" name="dpstDt" data-check-required="empty" type="date">
 						</div>
 					</div>
-					<div class="line itp_ip">
+					<div class="line mt_5">
 						<label>입금자명</label>
 						<div class="search_wrap">
 							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_NM" name="dpstNm" data-check-required="empty" type="text" >
 						</div>
 					</div>
-					<div class="line">
+					<div class="line mt_5">
 						<label>입금은행</label>
 						<div class="search_wrap itp_ip">
 							<select name="dpstBnkCd" id="ITP_FORM_MLOANMNG02010_POP_DPST_BNK" data-select-code="BNK_CD" data-check-required="empty" >
@@ -294,7 +292,7 @@
 							</select>
 						</div>
 					</div>
-					<div class="line" style="height:70px;">
+					<div class="line mt_5" style="height:70px;">
 						<label>입금계좌번호</label>
 						<div class="search_wrap itp_ip">
 							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_ACCT_NO" name="rcvAcctNo" data-check-required="empty" type="text" >
@@ -355,7 +353,7 @@
 				<div class="line">
 					<label>입금은행</label>
 					<div class="pop_right">
-						<div class="fnDpstBnk">></div>
+						<div class="fnDpstBnk"></div>
 					</div>
 				</div>
 				<div class="line">

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

@@ -27,7 +27,7 @@
 				</select>
 			  </div>
 			</div> -->
-			<div class="line">
+			<div class="line top9">
 			  <label>정산요청일</label>
 			  <div class="date_to">
 				  <input type="text" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date">
@@ -35,7 +35,7 @@
 				  <input type="text" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date">
 			  </div>
 			</div>
-			<div class="line" style="height:45px;">
+			<div class="line top6">
 			  <div class="search">
 				<button id="ITP_BTN_MLOANMNG03010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 			  </div>
@@ -44,9 +44,9 @@
 			  <h1><정산 내역></h1>
 			</div>
 		  </div>
-			<div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA" class="scroll_area row-0">
+			<div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA" class="scroll_area row-13">
 			  <ul id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list4" style="padding-top:3px;">
 				  <div class="left">
 					<div class="nomal">
@@ -165,14 +165,14 @@
 			  <h1><정산 상세 내역></h1>
 			</div>
 		  </div>
-		  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-5-1">
+		  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_AREA" class="scroll_area row-4-1">
 			  <ul id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MLOANMNG03010_VIEW_ITEM_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
 				<li class="history_list2 list-row">
 				  <div>
 					<div class="left">
 					  <div class="nomal">
-						<label>품목아이디 </label>
+						<label class="col_3">품목아이디 </label>
 						<span>:</span>
 						<div class="space2">
 						  <div class="fnItemId">asdfasdfassd</div>
@@ -185,7 +185,7 @@
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label>단가</label>
+						<label class="col_3">단가</label>
 						<span>:</span>
 						<div class="space2">
 						  <div class="fnUnitAmt">52525525</div>
@@ -224,7 +224,7 @@
 					</div>
 					<div class="left">
 					  <div class="nomal">
-						<label class="">정산구분</label>
+						<label class="col_3">정산구분</label>
 						<span>:</span>
 						<div class="space2">
 						  <div class="fnSttlDvsnNm"></div>
@@ -282,7 +282,7 @@
 					<div class="list_label">
 						<label>결제금액 *</label>
 					</div>
-					<div class="list_info" style="padding-top:4px;">
+					<div class="list_info" style="padding-top:8px;">
 						<div class="pay_info fnItemNm"></div>
 						<input id="ITP_FORM_MLOANMNG03010_PAY_GOODS_AMT" name="goodsAmt" type="text" readonly>
 					</div>
@@ -291,7 +291,7 @@
 					<div class="list_label">
 						<label>결제방법 *</label>
 					</div>
-					<div class="list_info mail" style="padding-top:4px;">
+					<div class="list_info mail" style="padding-top:10px;">
 						<select id="ITP_FORM_MLOANMNG02010_PAY_PAY_METHOD" name="payMethod" style="width:90%;">
 							<option value="11">신용카드</option>
 							<option value="21">계좌이체</option>
@@ -302,7 +302,7 @@
 					<div class="list_label">
 						<label>휴대전화번호 *</label>
 					</div>
-					<div class="list_info" style="padding-top:4px;">
+					<div class="list_info" style="padding-top:8px;">
 						<input id="ITP_FORM_MLOANMNG03010_PAY_ORD_TEL" name="ordTel" type="text" data-check-required="empty">
 					</div>
 				</div>
@@ -310,7 +310,7 @@
 					<div class="list_label border">
 						<label>E-mail</label>
 					</div>
-					<div class="list_info mail" style="padding-top:4px;">
+					<div class="list_info mail" style="padding-top:8px;">
 						<input id="ITP_FORM_MLOANMNG03010_PAY_ORD_EMAIL" name="ordEmail" class="" type="hidden">
 						<input id="ITP_FORM_MLOANMNG03010_PAY_EMAIL_ID" name="emailId" class="" type="text" data-check-required="empty">
 						<span>@</span>
@@ -355,7 +355,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_blue">매 장 ▼</button>
+				<button id="ITP_BTN_MLOANMNG02010_POP_SOTRE_NM" class="btn_blue">매 장 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MLOANMNG03010_POP_STORE_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MLOANMNG03010_POP_STORE_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -58,7 +58,7 @@
          <div class="itp_non_data" style="display:none;">
             <div>검색된 데이터가 없습니다.</div>
          </div>
-        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: grid;">
+        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
           <li class="list-row">
             <div class="left_info">
               <div class="check_box">
@@ -68,9 +68,9 @@
                 <div class="itp_item fnItemNm">품목명</div>
               </div>
               <div class="thick">
-                <div class="itp_gram fnUnitAmt">12,120,000</div>
+                <div class="itp_gram fnUnitAmt"></div>
                 <div>/</div>
-                <div class="itp_amt fnUnitAmt">12,012,000</div>
+                <div class="itp_amt fnOrdAmt"></div>
               </div>
             </div>
             <div class="right">

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

@@ -34,21 +34,19 @@
 						<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="header line">
-					<div class="table_header">
-						<h1><빈품 품목></h1>
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
-					</div>
+				<div class="table_header">
+					<h1><빈품 품목></h1>
+					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
+					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-2-1">
+			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-7">
 				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: none;">
+				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
 					<li class="list-row">
 						<div class="left_info">
 			              <div class="check_box">
-			                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
+			                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
 			              </div>
 			              <div class="thick">
 			              	<label>품목명</label>
@@ -129,16 +127,16 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 ▼</button>
+				<button id="ITP_BTN_MRTNMNG01010_POP_WHS_NM" class="btn_blue">반품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG01010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="sub fnLocationNm">(상세위치내용)</div>
-							<div class="sub fnLocationNm">누리자 B/D</div>
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
+							
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -148,7 +146,7 @@
 			</div>
 		</div>
 	</div>
-	<div id="ITP_POP_MRTNMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
+	<div id="ITP_POP_MRTNMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -166,17 +164,20 @@
 					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
 				<div class="select_btn">
-					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
+					<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
+				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						 <div class="scroll_left">
-                            <div class="fnItemNm"></div>
-                            <div class="sub fnKg"></div>
-                            <div class="amt fnUnitAmt"></div>
+                            <div class="fnItemNm">품목명</div>
+                            <div class="mg_0">
+				                 <div class="sub fnKg">12,000,000</div>
+				                 <div class="type_hide">/</div>
+				                 <div class="amt fnUnitAmt">12,000,000</div>
+			                 </div>
                         </div>
                         <div class="scroll_right">
                             <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>

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

@@ -1,5 +1,5 @@
 <section id="ITP_MOBILE_MRTNMNG02010">
-	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: block;">
+	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: none;">
 		<div class="content">
 			<form id="ITP_FORM_MRTNMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -46,9 +46,9 @@
 				</div>
 			</form>
 		</div>
-		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-10">
+		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-8">
 			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
-			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: none;">
+			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: block;">
 				<li class="history_list5">
 					<div class="left">
 						<div class="nomal">
@@ -62,25 +62,20 @@
 					</div>
 					<div class="left">
 						<div class="nomal">
-							<div class="half">
-								<label>반품상태</label>
-								<span>:</span>
-								<div class="history">
-									<div class="fnRtnReqStNm"></div>
-								</div>
+							<label>반품상태</label>
+							<span>:</span>
+							<div class="history">
+								<div class="fnRtnReqStNm"></div>
 							</div>
-							<div class="half">
-								<label>수거장소명 </label>
-								<span>:</span>
-								<div class="history">
-									<div class="fnRtnWhsNm"></div>
-								</div>
+							<label>수거장소명  :</label>
+							<div class="history">
+								<div class="fnRtnWhsNm"></div>
 							</div>
 						</div>
 					</div>
 					<div class="left">
 						<div class="nomal">
-							<label style="width: 127px;">반품요청 정보</label>
+							<label>반품요청 정보</label>
 							<span>:</span>
 							<div class="history">
 								<div class="fnRtnReqItemQty"></div>
@@ -117,12 +112,12 @@
 				</div>
 			</div>
 			<div class="table_header">
-				<h1>> 반품 품목</h1>
+				<h1><반품 품목></h1>
 			</div>
 		</div>
-		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-11">
+		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-7">
 			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
-			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: block;">
+			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: grid;"><!-- style="display: grid;" -->
 				<li class="list-row">
 					<div class="left_info">
 						<div class="thick">
@@ -146,7 +141,7 @@
 			<button id="ITP_BTN_MRTNMNG02010_DETAIL_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
 		</div>
 	</div>
-	<div id="ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER" style="display: none;">
+	<div id="ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER" style="display: block;">
 		<form id="ITP_FORM_MRTNMNG02010_MODIFY" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_VIEW_CD" name="viewCd" value="U">
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_BRAND_ID" name="brandId" value="">
@@ -183,17 +178,15 @@
 						<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="header line">
-					<div class="table_header">
-						<h1><반품 품목></h1>
-						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
-						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
-					</div>
+				<div class="table_header">
+					<h1><반품 품목></h1>
+					<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
+					<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-2-1">
+			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-7">
 				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: gird;"><!-- style="display: gird;" -->
 					<li class="list-row">
 						<div class="left_info">
 							<div class="check_box"><!-- class 변경 -->
@@ -277,16 +270,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="sub fnLocationNm">(상세위치내용)</div>
-							<div class="sub fnLocationNm">누리자 B/D</div>
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -296,7 +288,7 @@
 			</div>
 		</div>
 	</div>
-	<div id="ITP_POP_MRTNMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
+	<div id="ITP_POP_MRTNMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -314,7 +306,7 @@
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
 				<div class="select_btn">
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
+					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 <img src="../img/arrow_down.png"></button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
@@ -322,9 +314,12 @@
 				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						 <div class="scroll_left">
-                            <div class="fnItemNm"></div>
-                            <div class="sub fnKg"></div>
-                            <div class="amt fnUnitAmt"></div>
+                            <div class="fnItemNm">fdssfd</div>
+                            <div class="mg_0">
+				                 <div class="sub fnKg">12,000,000</div>
+				                 <div class="type_hide">/</div>
+				                 <div class="amt fnUnitAmt">12,000,000</div>
+			                 </div>
                         </div>
                         <div class="scroll_right">
                             <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>

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

@@ -18,16 +18,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
+				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display: none;">
+				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="list-row row_2">
 						<div class="scroll_left">
-							<div class="fnWhsNm"></div>
-							<div class="sub fnLocationNm"></div>
-							<div class="sub fnLocationNm"></div>
+							<div class="con_2 fnWhsNm"></div>
+							<div class="con_2 sub fnLocationNm"></div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -75,7 +74,7 @@
 						<button id="ITP_BTN_MRTNMNG04010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top3">
 					<label>반품입고장소</label>
 					<div class="float_left">
 						<input type="text" id="ITP_FORM_MRTNMNG04010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
@@ -97,26 +96,26 @@
 					<h1><반품 발주 내역></h1>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA" class="scroll_area row-3">
+			<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA" class="scroll_area row-9">
 				<ul id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY" style="display: none;">
-					<li class="history_list">
+				<div id="ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY" style="display: block;">
+					<li class="history_list7">
 						<div class="left">
 							<div class="nomal">
-								<label>반품발주일자 &nbsp;:</label>
+								<label>반품발주일자 :</label>
 								<div class="history">
-									<div class="fnRtnOdrRegDt"></div>
+									<div class="fnRtnOdrRegDt">s</div>
 									(<div class="fnColDvsnNm"></div>)
 								</div>
 							</div>
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>반품발주상태 &nbsp;:</label>
+								<label>반품발주상태 :</label>
 								<div class="history">
 									<div class="fnRtnOdrStNm"></div>
 								</div>
-								<label>납품장소명&nbsp;:</label>
+								<label>납품장소명 :</label>
 								<div class="history">
 									<div class="fnWhsNm"></div>
 								</div>
@@ -124,7 +123,7 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>반품발주정보 &nbsp;:</label>
+								<label>반품발주정보 :</label>
 								<div class="history">
 									<div class="fnRtnDodrItemQty">품목수($)</div>
 									<i>-</i>
@@ -134,7 +133,7 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label>반품입고장소 &nbsp;:</label>
+								<label>반품입고장소 :</label>
 								<div class="history">
 									<div class="fnRtnWhsNm"></div>
 								</div>
@@ -177,23 +176,23 @@
 					</div>
 				</div>
 				<div class="table_header">
-					<h1>> 반품 발주 품목</h1>
+					<h1><반품 발주 품목></h1>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3-1">
+			<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA" class="scroll_area row-3">
 				<ul id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: none;">
-					<li class="list-row2">
+				<div id="ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY" style="display: block;">
+					<li class="history_list5">
 					  <div class="left">
 						<div class="nomal">
-						  <label>품목명</label>
+						  <label class="col_1">품목명</label>
 						  <span>:</span>
 						  <div class="fnItemNm"></div>
 						</div>
 					  </div>
 					  <div class="left">
 						<div class="nomal">
-						  <label>수량</label>
+						  <label class="col_1">수량</label>
 						  <span>:</span>
 						  <div class="history">
 							<div class="fnRtnOdrQty"></div>
@@ -206,7 +205,7 @@
 					  </div>
 					  <div class="left">
 						<div class="nomal">
-						  <label>구매가 </label>
+						  <label class="col_1">구매가 </label>
 						  <div class="history">
 						  <span>:</span>
 						  <div class="fnUnitAmt"></div>
@@ -214,6 +213,7 @@
 						</div>
 					  </div>
 					</li>
+					
 				</div>
 			</div>
 			<div class="button_bar">

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

@@ -18,13 +18,11 @@
 				</div>
 				<div class="line">
 					<label>수거서번호</label>
-					<div class="search_wrap">
-						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
-						</div>
+					<div class="float_left">
+						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text" placeholder="">
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top3">
 					<label>반품입고장소</label>
 					<div class="float_left">
 						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
@@ -37,7 +35,7 @@
 						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top6">
 					<label>반품장소</label>
 					<div class="float_left">
 						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
@@ -50,13 +48,13 @@
 						<button id="ITP_BTN_MRTNMNG05010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top9">
 					<label>반품품목명</label>
 					<div class="float_left name">
 						<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="A매장명">
 					</div>
 				</div>
-				<div class="header line">
+				<div class="header line top6">
 					<div class="search">
 						<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 					</div>
@@ -67,9 +65,9 @@
 			</div>
 		</form>
 		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
-			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-4">
+			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-10">
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
+				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
 					<li class="history_list2">
 						<div class="left">
 							<div class="nomal">
@@ -114,7 +112,7 @@
 						</div>
 						<div class="left">
 							<div class="nomal">
-								<label class="col_2">반품요청수량</label>
+								<label class="col_0">반품요청수량</label>
 								<div class=" history">
 									<span>:</span>
 									<div class=" fnRtnReqQty"></div>
@@ -136,7 +134,7 @@
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
-	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -155,16 +153,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
+				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="list-row row_2">
 						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="sub fnLocationNm">(상세위치내용)</div>
-							<div class="sub fnLocationNm">(상세위치내용)</div>
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -22,7 +22,7 @@
 						<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top3">
 					<label>반품입고장소</label>
 					<div class="float_left">
 						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
@@ -35,35 +35,35 @@
 						<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM"><img src="../img/delete.png" alt=""></button>
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top6">
 					<label>반품장소</label>
-						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
-							<div class="itp_input_btn">
-								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							</div>
-						</div>
-						<div class="float_right_btn">
-							<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID" class="" name="swhsId" />
+						<div class="itp_input_btn">
+							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 						</div>
+					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
-				<div class="line">
+				<div class="line top9">
 					<label>품목명</label>
 					<div class="float_left">
 						<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
 					</div>
 				</div>
-				<div class="line">
+				<div class="line top6">
 					<div class="search">
 						<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
 					</div>
 				</div>
 				<div class="table_header">
-					<h1>> 반품 내역</h1>
+					<h1><반품 내역></h1>
 				</div>
 			</div>
-			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-4">
+			<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_AREA" class="scroll_area row-6">
 				<ul id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG06010_LIST_ITEM_ROWCOPY" style="display: block;">
 					<li class="history_list2 ">
@@ -128,7 +128,7 @@
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
-	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
+	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -147,16 +147,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
+				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
 				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: block;">
 					<li class="row_2">
 						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="sub fnLocationNm">(상세위치내용)</div>
-							<div class="sub fnLocationNm">(상세위치내용)</div>
+							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>
+							<div class="con_2 sub fnLocationNm">(상세위치내용)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -10,7 +10,7 @@
 			<div class="line">
 			  <label>창고선택</label>
 			  <div class="float_left">
-				<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" name="whsNm" type="text" placeholder="A창고명">
+				<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A창고명">
 				<div class="itp_input_btn">		
 					<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 				</div>
@@ -45,7 +45,7 @@
 		  </div>
 			<div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: block;">
+			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list2 list-row">
 				  <div>
 					<div class="left">
@@ -143,7 +143,7 @@
 			</div>
 			<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="fnWhsNm">브랜드 창고 명A</div>
@@ -179,7 +179,7 @@
 						<label>창고명</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnWhsNm">브랜드 창고 2</div>
+						<div class="pay_info fnWhsNm"></div>
 					</div>
 				</div>
 				<div class="list_line">
@@ -187,7 +187,7 @@
 						<label>로케이션</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnLocation">로케이션 1</div>
+						<div class="pay_info fnLocation"></div>
 					</div>
 				</div>
 				<div class="list_line">
@@ -195,7 +195,7 @@
 						<label>품목번호</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnItemNo">2212110424155511</div>
+						<div class="pay_info fnItemId"></div>
 					</div>
 				</div>
 				<div class="list_line">
@@ -203,7 +203,7 @@
 						<label>품목명</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnItemNm">누리 시럽</div>
+						<div class="pay_info fnItemNm"></div>
 					</div>
 				</div>
 				<div class="list_line">
@@ -211,7 +211,7 @@
 						<label>현재고</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnStckQty">100개</div>
+						<div class="pay_info fnStckQty"></div>
 					</div>
 				</div>
 				<div class="list_line border">

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

@@ -10,13 +10,13 @@
 			<div class="line">
 			  <label style="margin-left:5px; margin-right:5px;">재고실사일자</label>
 			  <div class="float_left">
-				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="cddDt" class="date full" type="date" data-check-required="empty">
+				  <input type="text" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="cddDt" class="itp_input date full" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="재고실사일자" readonly>
 			  </div>
 			</div>
 			<div class="line">
 			  <label>창고선택</label>
 			  <div class="float_left">
-				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="whsNm" type="text" placeholder="A창고명">
+				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A창고명">
 				<div class="itp_input_btn">		
 					<button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 				</div>
@@ -28,13 +28,13 @@
 			<div class="line">
 			  <label>Location</label>
 			  <div class="float_left">
-				<select name="slocation" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION" data-check-required="empty"></select>
+				<select name="slocation" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="Location"></select>
 			  </div>
 			</div>
 			  <div class="line">
 				  <label>실사구분</label>
 				  <div class="float_left">
-					  <select id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_CDD_DVSN" data-select-code="CDD_DVSN" data-check-required="empty" name="cddDvsn"></select>
+					  <select id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_CDD_DVSN" data-select-code="CDD_DVSN" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="실사구분" name="cddDvsn"></select>
 				  </div>
 			  </div>
 			<div class="line" style="height:45px;">
@@ -288,7 +288,7 @@
 					</div>
 				</div>
 			</div>
-			<div id="ITP_POP_MSTOCKMNG02010_TABLE_TR" class="table_body" style="display: block;">
+			<div id="ITP_POP_MSTOCKMNG02010_TABLE_TR" class="table_body" style="display: none;">
 				<div class="table_tr">
 					<div class="table_td" style="width:10%; border:none;">
 						<input type="checkbox" class="chkItem" checked>

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -37,26 +37,26 @@
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
 
 								<div class="form-group shot">
-									<label class="col-xs-2 itp_lb shot">주문번호</label>
+									<label class="col-xs-4 itp_lb shot">주문번호</label>
 									<div class="col-xs-9 itp_ip fnPoOrdNo"></div>
 								</div>
 								<div class="form-group shot">
-									<label class="col-xs-2 itp_lb shot">구매자명</label>
+									<label class="col-xs-4 itp_lb shot">구매자명</label>
 									<div class="col-xs-9 itp_ip fnOrdNm"></div>
 								</div>
 								<div class="form-group shot">
-									<label class="col-xs-2 itp_lb shot">상품명</label>
+									<label class="col-xs-4 itp_lb shot">상품명</label>
 									<div class="col-xs-9 itp_ip fnGoodsNm"></div>
 								</div>
 								<div class="form-group">
-									<label class="col-xs-2 itp_lb">결제금액*</label>
+									<label class="col-xs-4 itp_lb">결제금액*</label>
 									<div class="col-xs-9 itp_ip">
 										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" />
 									</div>
 								</div>
 								<div class="form-group shot">
-									<label class="col-xs-2 itp_lb shot">결제방법*</label>
-									<div class="col-xs-3 itp_ip">
+									<label class="col-xs-4 itp_lb shot">결제방법*</label>
+									<div class="col-xs-9 itp_ip">
 										<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
 											<option value="11">신용카드</option>
 											<option value="21">계좌이체</option>
@@ -64,13 +64,13 @@
 									</div>
 								</div>
 								<div class="form-group">
-									<label class="col-xs-2 itp_lb">휴대폰번호*</label>
+									<label class="col-xs-4 itp_lb">휴대폰번호*</label>
 									<div class="col-xs-9 itp_ip">
 										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" placeholder="010-0000-0000" />
 									</div>
 								</div>
 								<div class="form-group shot">
-									<label class="col-xs-2 itp_lb shot">이메일</label>
+									<label class="col-xs-4 itp_lb shot">이메일</label>
 									<div class="col-xs-9 itp_ip">
 										<div class="col-xs-3 itp_pd_none">
 											<input id="ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL" name="ordEmail" class="" type="hidden">

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

@@ -97,7 +97,7 @@ section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height:
 section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:16px; height:38px;}
 section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 22px; width:24px;}
 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: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
+section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; 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;}
@@ -118,6 +118,10 @@ section .popup2 .search .right {width:20%; float:right; margin-right:20px;}
 
 section .popup2 .search .left button,
 section .popup2 .search .right button {width:100%;}
+section .popup2 .content .line .search_wrap input {float:right; width:50%; margin-right:10px; margin-top:0;}
+section .popup2 .content .line.mt_5 {margin-top:5px;}
+section .popup2 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
+
 
 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;}
@@ -301,10 +305,12 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line.top3 {top:3px;}
 .content .line.top6 {top:6px;}
 .content .line.top9 {top:9px;}
+.content .line.top12 {top:12px;}
+
 .content .line .pop_right {width:50%; height:46px; float:right;}
 .content .line .pop_right div {float:right; margin-right:10px; padding-top:8px; text-align:right; font-size:16px;}
 .content .line .search_wrap input {float:right; width:50%; margin-right:10px;}
-.content .line .search_wrap select {float:right; width:50%; margin-right:10px;}
+.content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
 .content .line div.itp_search_header {font-weight:100;padding:5px 10px 0px 9px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14px;}
 .content .line div.itp_search_header img{width:14px; top:-2px; position:relative;}
 .content .line label {min-width:92px; color:#666; font-size: 14px; margin-left: 10px; float: left; text-align: left; margin-top: 7px; font-weight:100;}
@@ -340,7 +346,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to div.at {width: 6%;  font-size: 16px; padding-top:12px; float: right;}
 .content .line .search {width: 100%; height: 50px; padding-top:12px;}
 .content .line .search button {width: 40%; height: 27px; font-size: 12px; font-weight:100; padding: 0;}
-.content .line .search button.col_3 {width: 25%; margin:0 10px;}
+.content .line .search button.col_3 {width: 25%; height:30px; margin:0 10px;}
 .content .list_line {width:98%; float:left; height:50px;display: inline-flex; margin:0 1%; font-size:12px;}
 .content .border {border-bottom: 1px solid #000 !important;}
 .content .list_line .list_label {width:30%;border:1px solid #000; height:50px; padding-top:17px; border-bottom:none; background:#eee;}
@@ -349,7 +355,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .list_info input{width:90%;}
 
 .content .list_line .mail input {width:30%;}
-.content .list_line .mail select {width:30%; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
+.content .list_line .mail select {width:30%; height:27px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:15px;}
 .content .table_header {margin-top: 10px; width: 100%; height: 36px;}
 .content .table_header h1 {margin: 10px; font-size: 14px; float: left; color: #000; font-weight: 700;}
@@ -392,8 +398,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.btn_col_3 {width: 35%;}
 .button_bar button.btn_col_6 {width: 65%;}
 .button_bar button.btn_col_3,
-.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 60px; font-size: 16px; font-weight: 100; border-radius: 0px;}
-.button_bar button.col_12 {font-weight:100; width: 100%; height: 60px; font-size: 18px;}
+.button_bar button.btn_col_6 {border: 1px solid #000; float: left; height: 40px; font-size: 15px; font-weight: 100; border-radius: 0px;}
+.button_bar button.col_12 {font-weight:100; width: 100%; height: 40px; font-size: 16px;}
 
 /* scroll_area 조정 */
 .scroll_area {position: absolute; width: 100%; height: 456px;border-bottom:2px solid #000; bottom: 30px; overflow: auto; background: #fff;}
@@ -405,15 +411,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-4-1{top:253px;}
 .row-5{top: 293px;}
 .row-6{top: 291px;}
-.row-3-2{top:393px;}
-.row-3-1{top: 355px;}
-
-.row-5-1{top: 391px;}
-
-.row-7{top: 533px;}
-.row-9{top: 383px;}
-.row-10{top: 349px;}
-.row-11{top: 309px;}
+.row-7{top: 200px;}
+.row-8{top: 240px;}
+.row-9{top: 266px;}
+.row-10{top: 271px;}
+.row-11{top: 317px;}
+.row-12{top: 237px;}
+.row-13{top: 210px;}
+.row-14{top: 398px;}
 
 .col-4{width:35% !important;}
 .col-6{width:60% !important;}
@@ -430,8 +435,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
 .scroll_area li .left_info div {display: inline-block; font-size:14px;}
 .scroll_area li .left_info span {font-size: 14px;}
-.scroll_area li .left_info label{font-size: 16px; font-weight:100; margin-left:10px;}
-.scroll_area li .left_info .check_box {padding:10px; height:72px; float:left; width:30px;}
+.scroll_area li .left_info label{font-size: 14px; font-weight:100; margin-left:10px;}
+.scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
 .scroll_area li .left_info .thick {float:left; margin-top: 2px; font-size: 18px; text-align: left; width: 200px; height:20px; font-weight: 100;}
 .scroll_area li .left_info .thick .itp_item {color:gray;}
 .scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14px;}
@@ -454,6 +459,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li.history_list4 {height: 150px;}
 .scroll_area li.history_list5 {height: 100px; padding-top:5px;}
 .scroll_area li.history_list6 {height: 110px; padding-top:5px;}
+.scroll_area li.history_list7 {height: 120px; padding-top:5px;}
 .scroll_area li .history_info {width: auto;}
 .scroll_area li .left {width:100%; height:30px; margin-top:0px;}
 .scroll_area li .btn_list {width:calc(100% - 65px); height:35px; padding-top:12px;}
@@ -490,7 +496,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .btn_bar button{width: 25px; height: 30px; font-size: 1rem; padding: 0;}
 .scroll_area li .left .nomal .btn_bar .col_0{min-width: auto; margin: 5px 20px;}
 
-.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:14px; font-weight:700; min-width:90px; text-align:left;}
+.scroll_area li .left .nomal label{position:relative; margin-left: 10px; font-size:14px; font-weight:700; min-width:81px; text-align:left;}
 .scroll_area li .left .nomal label.sub_info{min-width: auto; display: inline-flex;}
 .scroll_area li .left .nomal label.col_1{min-width: 45px;}
 .scroll_area li .left .nomal label.col_3{min-width: 70px;}

src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -218,7 +218,7 @@ let mobContentObj = {
 				// 결제 팝업 결과
 				var popFn = function(rowDataPop) {
 					console.log(JSON.stringify(rowDataPop));
-					// listObj.grid.search();
+					listObj.grid.search();
 				};
 				// 결제 팝업
 				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제)), 30(후불(선결제))
@@ -339,7 +339,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MLOANMNG02010_POP_STORE_AREA .panel-group').append($('#ITP_LIST_MLOANMNG02010_POP_STORE_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MLOANMNG02010_POP_STORE_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MLOANMNG02010_POP_STORE_AREA .panel-group > .row_2:last');
 				$li.find('.fnStoreNm').text(item.storeNm);
 				$li.find('.fnStoreStNm').text(item.storeStNm);
 				$li.find('.fnStoreId').data('store-id', item.storeId);

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG01010.js

@@ -127,10 +127,11 @@ let mobContObj = {
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnPchReqQty').text(item.pchReqQty);
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
-				this.pchReqAmtTot();
+				$li.find('.fnOrdAmt').text(CommonObj.currency.add(Number(item.unitAmt) * Number(item.pchReqQty)));
 				$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_PLUS')[$li.index()].addEventListener('click', function() { _this.actPlus(this); });
 				$('.list-row #ITP_BTN_MPOMNG01010_DETAIL_MINUS')[$li.index()].addEventListener('click', function() { _this.actMinus(this); });
 				this.rows.push(item);
+				this.pchReqAmtTot();
 			}
 			this.empty();
 		},
@@ -159,6 +160,7 @@ let mobContObj = {
 			var num = Number($div.text());
 			$($div).text((num + 1).toString());
 			this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
+			this.pchReqAmtUnit(elem, $($div).text());
 			this.pchReqAmtTot();
 		},
 		actMinus: function(elem) {
@@ -169,9 +171,15 @@ let mobContObj = {
 			} else {
 				$($div).text((num - 1).toString());
 				this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
+				this.pchReqAmtUnit(elem,  $($div).text());
 				this.pchReqAmtTot();
 			}
 		},
+		pchReqAmtUnit: function(elem, qty) {
+			var $div = $(elem).parent().prev();
+			var unitAmt = CommonObj.onlyNumber($div.find('.fnUnitAmt').text());
+			$div.find('.fnOrdAmt').text(CommonObj.currency.add(Number(unitAmt ? unitAmt : 0) * Number(qty)));
+		},
 		pchReqAmtTot: function() {
 			var reqAmt = 0;
 			$.each(this.rows, function(index, item) {

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG01010.js

@@ -45,7 +45,7 @@ let mobPageObj = {
 				var id = $(this).attr('id');
 				switch (id) {
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
-					case 'ITP_BTN_MSTOCKMNG01010_LIST_DETELE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
+					case 'ITP_BTN_MSTOCKMNG01010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH'			: mobContentObj.list.search();		break;
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK'			: mobContentObj.list.procStck(); 	break;
 				}
@@ -120,7 +120,6 @@ let mobContentObj = {
 		init: function() {
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
 			// this.search();
-			this.whsList();
 		},
 		search: function() {
 			this.listPage = 0;
@@ -160,32 +159,6 @@ let mobContentObj = {
 			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
 		},
-		whsList: function() {
-			const brandIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_BRAND_ID').val();
-			const storeIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_ID').val();
-			const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
-			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), function(result) {
-				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM');
-				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_WHS_NM');
-				if(result.gridRecords > 0) {
-					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').trigger('change');
-				}
-			}, 'POST');
-		},
-		locationList: function() {
-			var _this = this;
-			const brandIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_BRAND_ID').val();
-			const storeIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_ID').val();
-			const whsIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').val();
-			const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
-			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), function(result) {
-				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION');
-				// fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_LOCATION');
-				if(result.gridRecords > 0) {
-					_this.search();
-				}
-			}, 'POST');
-		},
 		choice: function(item) {
 			this.item = item;
 		},
@@ -268,13 +241,13 @@ let mobPopObj = {
 			};
 			const param = $('#ITP_FORM_MSTOCKMNG01010_POP_WHS').serializeObject();
 			console.log(JSON.stringify(param));
-			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
+			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA .panel-group > .row_2:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);
@@ -302,7 +275,7 @@ let mobPopObj = {
 				'storeId': fn_make_user_info.get('storeId'),
 				'whsId': whsId
 			};
-			fn_ajax_call(API_MOBILE_LOCATION, JSON.stringify(param), callbackFn, 'POST');
+			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		action: function() {
 			var _this = this;
@@ -319,6 +292,7 @@ let mobPopObj = {
 		delete: function() {
 			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_ID').val('');
 			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').val('');
+			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION option').remove();
 		},
 		close: function() {
 			this.rows.length = 0;
@@ -342,6 +316,7 @@ let mobPopObj = {
 			var id = '#' + this.popId;
 			$(id).find('.fnWhsNm').text(this.item.whsNm);
 			$(id).find('.fnLocation').text(this.item.locationNm);
+			$(id).find('.fnItemId').text(this.item.itemId);
 			$(id).find('.fnItemNm').text(this.item.itemNm);
 			$(id).find('.fnStckQty').text(CommonObj.currency.add(this.item.stckQty, '개'));
 			$(id).find('.fnWhsNm').text(this.item.whsNm);

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -37,7 +37,8 @@ let mobPageObj = {
 			});
 
 			// 조회일자 지정
-			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_MOBILE_MSTOCKMNG02010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
+			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -52,6 +53,8 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MSTOCKMNG02010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
+					case 'ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
+					case 'ITP_BTN_MSTOCKMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_SEARCH'			: mobContentObj.list.search();		break;
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_BARCODE'			: mobContentObj.barcode.callApp();	break;
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_SAVE'				: mobContentObj.list.save();		break;
@@ -112,7 +115,6 @@ let mobContentObj = {
 		rows: [],
 		init: function() {
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
-			this.whsList();
 		},
 		search: function() {
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
@@ -121,27 +123,6 @@ let mobContentObj = {
 				mobPopObj.popItemNm.init();
 			}
 		},
-		whsList: function() {
-			const brandIdVal = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_BRAND_ID').val();
-			const storeIdVal = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STORE_ID').val();
-			const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
-			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), function(result) {
-				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID');
-				if(result.gridRecords > 0) {
-					$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').trigger('change');
-				}
-			}, 'POST');
-		},
-		locationList: function() {
-			var _this = this;
-			const brandIdVal = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_BRAND_ID').val();
-			const storeIdVal = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STORE_ID').val();
-			const whsIdVal = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val();
-			const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
-			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), function(result) {
-				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION');
-			}, 'POST');
-		},
 		itemAdd: function(rows) {
 			var _this = this;
 			$.each(rows, function(index, item) {
@@ -235,6 +216,84 @@ function appCallFnBarcode(barcode) {
 }
 
 let mobPopObj = {
+	popWhsNm: {
+		popId: 'ITP_POP_MSTOCKMNG02010_WHS_AREA',
+		rows: [],
+		init: function () {
+			this.rows.length = 0;
+			mobPopObj.show(this.popId);
+			this.search();
+			this.action();
+		},
+		search: function () {
+			var _this = this;
+			$('#ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA .panel-group').empty();
+			var callbackFn = function(result) {
+				console.log(result);
+				_this.view(result.gridRows);
+			};
+			const param = $('#ITP_FORM_MSTOCKMNG02010_POP_WHS').serializeObject();
+			console.log(JSON.stringify(param));
+			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
+		},
+		view: function(gridRows) {
+			this.rows = gridRows;
+			$.each(gridRows, function (i, item) {
+				$('#ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_POP_WHS_ROWCOPY').html());
+				var $li = $('#ITP_LIST_MSTOCKMNG02010_POP_WHS_AREA .panel-group > .row_2:last');
+				$li.find('.fnWhsNm').text(item.whsNm);
+				$li.find('.fnLocationNm').text(item.locationNm);
+				$li.find('.fnWhsId').data('whs-id', item.whsId);
+			});
+		},
+		choice: function(elem) {
+			var _this = this;
+			var whsId = $(elem).data('whs-id');
+			$.each(this.rows, function (i, item) {
+				if(whsId === item.whsId) {
+					$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(item.whsId);
+					$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM').val(item.whsNm);
+					_this.close();
+					_this.location(item.whsId);
+					return false;
+				}
+			});
+		},
+		location: function(whsId) {
+			var callbackFn = function(result) {
+				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION');
+			};
+			var param = {
+				'brandId': fn_make_user_info.get('brandId'),
+				'storeId': fn_make_user_info.get('storeId'),
+				'whsId': whsId
+			};
+			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), callbackFn, 'POST');
+		},
+		action: function() {
+			var _this = this;
+			$('button[id^="ITP_BTN_MSTOCKMNG02010_POP_WHS"]').off('click').on('click', function() {
+				var id = $(this).attr('id');
+				switch (id) {
+					case 'ITP_BTN_MSTOCKMNG02010_POP_WHS_SEARCH'	: _this.search();			break;
+					case 'ITP_BTN_MSTOCKMNG02010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
+					case 'ITP_BTN_MSTOCKMNG02010_POP_WHS_CLOSE'		: _this.close(); 			break;
+				}
+				return false;
+			});
+		},
+		delete: function() {
+			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val('');
+			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM').val('');
+			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION option').remove();
+		},
+		close: function() {
+			this.rows.length = 0;
+			$('#ITP_POP_MSTOCKMNG02010_LIST_WHS_AREA .panel-group').empty();
+			$('#ITP_FORM_MSTOCKMNG02010_POP_WHS #ITP_FORM_MSTOCKMNG02010_POP_WHS_KEYWORD').val('');
+			mobPopObj.hide(this.popId);
+		}
+	},
 	popItemNm: {
 		popId: 'ITP_POP_MSTOCKMNG02010_ITEM_AREA',
 		rows: [],
@@ -251,15 +310,29 @@ let mobPopObj = {
 				console.log(result);
 				_this.rows = result.gridRows;
 				$.each(result.gridRows, function (i, item) {
-					var tr =	'<tr>' +
-								'	<td><input type="checkbox" checked></td>' +
-								'	<td class="fnItemId">' 	+ item.itemId + '</td>' +
-								'	<td class="fnItemNm">' 	+ item.itemNm + '</td>' +
-								'	<td class="fnUnit">' 	+ item.unit + '</td>' +
-								'	<td class="fnStckQty">' + CommonObj.currency.add(item.stckQty, '개') + '</td>' +
-								'</tr>';
-					$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > tbody').append(tr);
+					$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA').append($('#ITP_POP_MSTOCKMNG02010_TABLE_TR').html());
+					// if(i === 0) {
+					// 	var tmp = $('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA.table > .table_tr:last');
+					// 	console.log(tmp);
+					// 	console.log($(tmp).html());
+					// }
+					var $li = $('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > .table_tr:last');
+					$li.find('.fnItemId').text(item.itemId);
+					$li.find('.fnItemNm').text(item.itemNm);
+					$li.find('.fnUnit').text(item.unit);
+					$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
+
+					// var tr =	'<tr>' +
+					// 			'	<td><input type="checkbox" checked></td>' +
+					// 			'	<td class="fnItemId">' 	+ item.itemId + '</td>' +
+					// 			'	<td class="fnItemNm">' 	+ item.itemNm + '</td>' +
+					// 			'	<td class="fnUnit">' 	+ item.unit + '</td>' +
+					// 			'	<td class="fnStckQty">' + CommonObj.currency.add(item.stckQty, '개') + '</td>' +
+					// 			'</tr>';
+					// $('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > tbody').append(tr);
 				});
+				console.log($('#ITP_POP_MSTOCKMNG02010_TABLE_AREA').prop('tagName'));
+				// console.log($('#ITP_POP_MSTOCKMNG02010_TABLE_AREA.table').find($('.table_tr')));
 			};
 			var param = $('#ITP_FORM_MSTOCKMNG02010_POPUP_ITEM').serializeObject();
 			fn_ajax_call(API_POP_STOCK_MNG_LIST, JSON.stringify(param), callbackFn, 'POST');

src/main/webapp/mobile/js/app/payment.js

@@ -11,7 +11,6 @@ require(['config'], function() {
 var pageObj = {
 	init: function() {
 		this.setParam();
-		this.mobileCert();
 	},
 	setParam() {
 		var nowAddress = unescape(location.href);
@@ -21,11 +20,11 @@ var pageObj = {
 			var param = parameters[i].split('=');
 			$('#frm_pay input[name="' + param[0] + '"]').val(param[1]);
 		}
-		console.log(JSON.stringify($('#frm_pay').serializeObject()));
+		this.mobileCert();
+		// console.log(JSON.stringify($('#frm_pay').serializeObject()));
 	},
 	mobileCert() {
 		var KICC_JAVASCRIPT_URL = CommonObj.getParameter('kiccJavascriptUrl');
-		console.log('KICC_JAVASCRIPT_URL : ' + KICC_JAVASCRIPT_URL);
 
 		var head = document.getElementsByTagName('head')[0];
 		var script = document.createElement('script');

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -308,8 +308,8 @@ function f_mobile_cert() {
 	// 	$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
 	// }, 200);
 	var param = $('#frm_pay').serializeObject();
-	// $(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
-	itp_fn_call_app.payment($.param(param));
+	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/payment.html?' + $.param(param));
+	// itp_fn_call_app.payment($.param(param));
 }
 
 /* 모바일 승인 요청 */