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

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

@@ -27,23 +27,6 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar" style="width:9.6%;"></div>
-										<div class="col-xs-4 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_PCH_PODR_UNQ_NO" class="form-control itp_input" name="spchPodrUnqNo" placeholder="발주번호" />
-										</div>
-									</div>
-									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<div class="input-group">
-											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
-											<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
-												<span class="input-group-btn">
-													<button id="ITP_BTN_POMNG07010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
-												</span>
-											</div>
-										</div>	
-										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
-											<button type="button" id="ITP_BTN_POMNG07010_SEARCH_SPPLY_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<div class="input-group">
 											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
@@ -56,6 +39,25 @@
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
 											<button type="button" id="ITP_BTN_POMNG07010_SEARCH_WHS_ID" class="btn btn-success	 btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 										</div>
+									</div>
+									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
+										<div class="brandSearchCond">
+											<div class="col-xs-2 itp_ip itp_noMar">
+												<div class="input-group">
+												<input type="text" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
+												<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
+													<span class="input-group-btn">
+														<button id="ITP_BTN_POMNG07010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+													</span>
+												</div>
+											</div>	
+											<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
+												<button type="button" id="ITP_BTN_POMNG07010_SEARCH_SPPLY_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											</div>
+										</div>
+										<div class="col-xs-4 itp_ip itp_noMar">
+											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_PCH_PODR_UNQ_NO" class="form-control itp_input" name="spchPodrUnqNo" placeholder="발주번호" />
+										</div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>

src/main/webapp/js/app/pomng/ITP_POMNG07010.js

@@ -181,6 +181,11 @@ let pageObj = {
 			$('#ITP_FORM_POMNG07010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
 			
 			$('#ITP_BTN_POMNG07010_EXCEL').show();
+			
+			if (fn_make_user_info.get('storeId') != '') {
+				$('.brandSearchCond').hide();	
+			}
+			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG07010_GRID_ID, POMNG07010_GRID_LIST, 'lg');
@@ -358,7 +363,13 @@ let listObj = {
 			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
-			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			var whsdvsn = "W01";
+			if (fn_make_user_info.get('storeId') != '') {
+				whsdvsn = "W02";
+			}
+			
+			
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:whsdvsn};
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},

src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -208,7 +208,10 @@ let pageObj = {
 			fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG04010_DETAIL_WHS_ST_CD', true, '선택');
 
 			// 조회일자 지정
-			$('#ITP_TAB_STOCKMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
+			$('#ITP_TAB_STOCKMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);		
+			
+			
+			$('#ITP_FORM_STOCKMNG04010_WHS_DVSN').val("W01");
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(STOCKMNG04010_GRID_ID, STOCKMNG04010_GRID_LIST, 'lg');
@@ -531,11 +534,23 @@ let modifyObj = {
 	},
 	button: {
 		modify: function (param) {
+			var storeId = $('#ITP_FORM_STOCKMNG04010_VIEW_STORE_ID').val();
+			if (storeId != '') {
+				console.log(fn_make_user_info.get('storeId'));
+				if (fn_make_user_info.get('storeId') != storeId) {
+					alert("매장 창고는 매장담당자만 수정 가능합니다.");
+					return;
+				}
+			}
+			
 			itp_fn_form_clear_validate(null, '#ITP_FORM_STOCKMNG04010_DETAIL');
 			const brandIdVal = $('#ITP_FORM_STOCKMNG04010_VIEW_BRAND_ID').val();
 			const whsIdVal = $('#ITP_FORM_STOCKMNG04010_VIEW_WHS_ID').val();
 			const key = {brandId: brandIdVal, whsId: whsIdVal, storeId: '', viewCd: 'R'};
 			var param = $.param(key);
+			
+			console.log(param);
+			
 			modifyObj.load(param);
 		}
 	},

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

@@ -54,15 +54,15 @@
       </div>
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
+         <!--   검색된 데이터가 없습니다  -->
+         <div class="itp_non_data" style="display:none;">
+            <div>검색된 데이터가 없습니다.</div>
+         </div>
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
-      <!--   검색된 데이터가 없습니다  -->
-      	<div class="itp_non_data" style="display:none;">
-      		<div>검색된 데이터가 없습니다.</div>
-      	</div>
           <li class="list-row">
             <div class="left_info">
               <div class="check_box">
-                <div style="display:none;"><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
+                <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
               </div>
               <div class="thick">
                 <div class="itp_item fnItemNm">품목명</div>
@@ -150,206 +150,6 @@
             </div>
         </div>
     </div>
-    <!-- 선불매장결제 -->
-    <div id="ITP_POP_MPOMNG01010_AMT_ADV_AREA" class="popup mobile-pop-close" style="display: none;">
-        <div class="pop">
-            <div class="pop_line">
-	            <div class="itp_label_area">
-	                <label>납품요청일</label>
-	            </div>
-	            <div class="itp_info_area">
-	                <div class="fnPopDlvReqDt"></div>
-	            </div>
-            </div>
-            <div class="pop_line">
-	            <div class="itp_label_area">
-              		<label>품목수</label>
-	            </div>
-   	            <div class="itp_info_area">
-                	<div class="fnItemQty"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매요청금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdReqAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매가능금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdPssblAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line border">
-              	<div class="itp_label_area">
-                	<label>구매금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdAmt"></div>
-                </div>
-            </div>
-            <div class="pop_msg">   선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다. <br>결재를 하시겠습니까?</div>
-            <div class="popup_btn">
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_CONFIRM" class="ok btn-primary COK">결제</button>
-            </div>
-        </div>
-    </div>
-    <!-- 구매한도부족 -->
-    <div id="ITP_POP_MPOMNG01010_AMT_LMT_AREA" class="popup mobile-pop-close" style="display: none;">
-        <div class="pop">
-            <div class="pop_line">
-	            <div class="itp_label_area">
-	                <label>납품요청일</label>
-	            </div>
-	            <div class="itp_info_area">
-	                <div class="fnPopDlvReqDt"></div>
-	            </div>
-            </div>
-            <div class="pop_line">
-	            <div class="itp_label_area">
-              		<label>품목수</label>
-	            </div>
-   	            <div class="itp_info_area">
-                	<div class="fnItemQty"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매요청금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdReqAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매가능금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdPssblAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line border">
-              	<div class="itp_label_area">
-                	<label>구매금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdAmt"></div>
-                </div>
-            </div>
-            <div class="pop_msg">구매한도가 부족합니다.<br>선결재를 하신 후에 구매요청을 하시기 바랍니다.<br> 결재 버튼을 누르시면 임시 저장 후 결재가 진행이 됩니다.<br>결재를 하시겠습니까?</div>
-            <div class="popup_btn">
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_CONFIRM" class="ok btn-primary COK">결제</button>
-            </div>
-        </div>
-    </div>
-     <!-- 선불매장- 임시저장 -->
-    <div id="ITP_POP_MPOMNG01010_AMT_ADV_SAVE_AREA" class="popup mobile-pop-close" style="display: none;">
-        <div class="pop">
-            <div class="pop_line">
-	            <div class="itp_label_area">
-	                <label>납품요청일</label>
-	            </div>
-	            <div class="itp_info_area">
-	                <div class="fnPopDlvReqDt"></div>
-	            </div>
-            </div>
-            <div class="pop_line">
-	            <div class="itp_label_area">
-              		<label>품목수</label>
-	            </div>
-   	            <div class="itp_info_area">
-                	<div class="fnItemQty"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매요청금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdReqAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매가능금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdPssblAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line border">
-              	<div class="itp_label_area">
-                	<label>구매금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdAmt"></div>
-                </div>
-            </div>
-            <div class="pop_msg">선불매장이므로 입금을 하시고,입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다. </div>
-            <div class="popup_btn">
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_SAVE_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_ADV_SAVE_CONFIRM" class="ok btn-primary COK">결제</button>
-            </div>
-        </div>
-    </div>
-    <!-- 구매한도부족- 임시저장 -->
-    <div id="ITP_POP_MPOMNG01010_AMT_LMT_SAVE_AREA" class="popup mobile-pop-close" style="display: none;">
-        <div class="pop">
-            <div class="pop_line">
-	            <div class="itp_label_area">
-	                <label>납품요청일</label>
-	            </div>
-	            <div class="itp_info_area">
-	                <div class="fnPopDlvReqDt"></div>
-	            </div>
-            </div>
-            <div class="pop_line">
-	            <div class="itp_label_area">
-              		<label>품목수</label>
-	            </div>
-   	            <div class="itp_info_area">
-                	<div class="fnItemQty"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매요청금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdReqAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line">
-              	<div class="itp_label_area">
-                	<label>구매가능금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdPssblAmt"></div>
-                </div>
-            </div>
-            <div class="pop_line border">
-              	<div class="itp_label_area">
-                	<label>구매금액 </label>
-                </div>
-                <div class="itp_info_area">
-                	<div class="fnOrdAmt"></div>
-                </div>
-            </div>
-            <div class="pop_msg">구매한도가 부족합니다.<br> 선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.</div>
-            <div class="popup_btn">
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_SAVE_CLOSE" class="cancel btn-gray CLB btn-pop-close">취소</button>
-                <button id="ITP_BTN_MPOMNG01010_POP_AMT_LMT_SAVE_CONFIRM" class="ok btn-primary COK">결제</button>
-            </div>
-        </div>
-    </div>
     <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
         <div class="pop">
             <div class="header">
@@ -387,7 +187,7 @@
             </div>
         </div>
     </div>
-    <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
+    <div id="ITP_POP_MPOMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
         <div class="pop">
             <div class="header">
                 <div class="header_left">
@@ -409,7 +209,7 @@
                 </div>
             </form>
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
-                <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0"></ul>
+                <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
                 <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
                      <li class="row_2">
                         <div class="scroll_left">

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

@@ -1,5 +1,5 @@
 <section id="ITP_MOBILE_MPOMNG02010">
-  <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: block;">
+  <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: none;">
     <div class="content">
       <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
         <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -48,7 +48,7 @@
     </div>
     <div id="ITP_LIST_MPOMNG02010_ITEM_AREA" class="scroll_area row-1">
       <ul id="ITP_LIST_MPOMNG02010_ITEM_ROWS" class="mb_0 panel-group"></ul>
-      <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: none;">
+      <div id="ITP_LIST_MPOMNG02010_ITEM_ROWCOPY" style="display: block;">
         <li class="history_list">
           <div class="left">
             <div class="nomal">
@@ -217,7 +217,7 @@
           <li class="list-row">
             <div class="left_info">
               <div class="check_box">
-                <div style="display:none;"><input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
+                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
               </div>
               <div class="thick">
               	<label>품목명</label>
@@ -246,18 +246,30 @@
     </form>
   </div>
   <div id="ITP_POP_MPOMNG02010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
-    <div class="pop">
-      <div class="pop_line">
-        <label>납품요청일 &nbsp;&nbsp;:</label>
-        <div class="fnPopDlvReqDt"></div>
-      </div>
-      <div class="pop_line">
-        <label>품목수&nbsp;&nbsp; :</label>
-        <div class="fnItemQty">개</div>
-      </div>
+    <div class="pop short">
       <div class="pop_line">
-        <label>구매금액 &nbsp;&nbsp;:</label>
-        <div class="fnOrdAmt">원</div>
+	       <div class="itp_label_area">
+	           <label>납품요청일</label>
+	       </div>
+	       <div class="itp_info_area">
+	           <div class="fnPopDlvReqDt"></div>
+	       </div>
+       </div>
+       <div class="pop_line">
+	      <div class="itp_label_area">
+   		  	<label>품목수</label>
+	      </div>
+	      <div class="itp_info_area">
+         	<div class="fnItemQty"></div>
+	      </div>
+       </div>
+       <div class="pop_line border">
+	      <div class="itp_label_area">
+	        <label>구매금액</label>
+	      </div>  
+	      <div class="itp_info_area">
+	        <div class="fnOrdAmt">원</div>
+	      </div>
       </div>
       <label class="pop_label pop_msg">구매요청 하시겠습니까?</label>
       <div class="popup_btn">

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

@@ -144,7 +144,7 @@
 			  </div>
 			</div>
 			<div class="table_header">
-			  <h1>> 발주 품목</h1>
+			  <h1><발주 품목></h1>
 			</div>
 		  </div>
 		<div id="ITP_LIST_MPOMNG04010_VIEW_ITEM_AREA" class="scroll_area row-2">
@@ -254,7 +254,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+				<button id="ITP_BTN_MPOMNG04010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MPOMNG04010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -273,4 +273,4 @@
 			</div>
 		</div>
 	</div>
-  </section>
+</section>

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

@@ -144,7 +144,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
+				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
 			</div>
 			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
@@ -181,7 +181,7 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>

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

@@ -11,9 +11,9 @@
 				<div class="line">
 					<label>납품예정일</label>
 					<div class="date_to">
-						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
+						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
 						<div class="at">~</div>
-						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
+						<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
 					</div>
 				</div>
 				<div class="line">
@@ -38,8 +38,8 @@
 				<div class="line">
 					<label>납품장소</label>
 					<div class="float_left">
-						<input type="text" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM" data-check-required="empty" class="" name="swhsNm" placeholder="매장명" readonly />
-						<input type="hidden" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID" data-check-required="empty" class="" name="swhsId" />
+						<input type="text" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" class="" name="swhsNm" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" class="" name="swhsId" />
            				<div class="itp_input_btn">
 							<button id="ITP_BTN_MPOMNG06010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 						</div>
@@ -67,7 +67,7 @@
 		<form id="ITP_FORM_MPOMNG06010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
 			<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_AREA" class="scroll_area row-4">
 				<ul id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-				<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY" style="display: none;">
 					<li class="history_list2">
 						<div class="left">
 							<div class="nomal">
@@ -153,15 +153,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
+				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
 			</div>
 			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: block;">
+				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
-							<div class="con_2 fnStNm">($)</div>
+							<div class="con_2 sub fnStNm">($)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
@@ -175,7 +175,7 @@
 		<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_MPOMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
@@ -190,16 +190,16 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
-						  <div class="fnWhsNm">브랜드 창고 명A</div>
-						  <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
-						  <div class="sub fnLocationNm">누리자 B/D</div>
+						  <div class="fnWhsNm"></div>
+						  <div class="sub fnLocationNm"></div>
+						  <div class="sub fnLocationNm"></div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MPOMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>

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

@@ -11,9 +11,9 @@
 	      <div class="line">
 			  <label>입고일자</label>
 	        <div class="date_to">
-				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT" name="fromDt" class="year" type="date">
+				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT" name="fromDt" class="itp_input date" type="text">
 				<div class="at">~</div>
-				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
+				<input id="ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT" name="toDt" class="itp_input date" type="text">
 	        </div>
 	      </div>
 	      <div class="line">
@@ -60,7 +60,7 @@
 	        </div>
 	      </div>
 	      <div class="table_header">
-	        <h1>> 입고 내역</h1>
+	        <h1><입고 내역></h1>
 	      </div>
 	    </div>
       <div id="ITP_LIST_MPOMNG07010_LIST_ITEM_AREA" class="scroll_area row-4">
@@ -147,15 +147,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
+				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_blue">공급업체 ▼</button>
 			</div>
 			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
 				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: block;">
+				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="con_2 fnSpplyNm">공급업체 명A</div>
-							<div class="con_2 fnStNm">($)</div>
+							<div class="con_2 sub fnStNm">($)</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
@@ -184,15 +184,15 @@
 				</form>
 			</div>
 			<div class="select_btn">
-				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">(상세위치내용)</div>
 							<div class="sub fnLocationNm">누리자 B/D</div>
 						</div>
 						<div class="scroll_right">

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

@@ -49,7 +49,7 @@
 					<li class="list-row">
 						<div class="left_info">
 			              <div class="check_box">
-			                <div style="display:none;"><input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
+			                <input style="width:20px;" type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
 			              </div>
 			              <div class="thick">
 			              	<label>품목명</label>
@@ -59,7 +59,7 @@
 			              <div class="thick">
 			              	<label>구매가</label>
 			                <span>:</span>
-			                <div class="itp_amt fnUnitAmt">asdfasdf</div>
+			                <div class="itp_amt fnUnitAmt"></div>
 			              </div>
 			            </div>
 						<div class="right">
@@ -79,18 +79,30 @@
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
 	<div id="ITP_POP_MRTNMNG01010_RTN_AREA" class="popup mobile-pop-close" style="display: none;">
-		<div class="pop">
+		<div class="pop short">
 			<div class="pop_line">
-				<label>반품요청일 &nbsp;&nbsp;:</label>
-				<div class="fnRtnReqDt"></div>
+            	<div class="itp_label_area">
+					<label>반품요청일</label>
+				</div>
+	            <div class="itp_info_area">
+					<div class="fnRtnReqDt"></div>
+				</div>
 			</div>
 			<div class="pop_line">
-				<label>품목수&nbsp;&nbsp; :</label>
-				<div class="fnItemQty">개</div>
+				<div class="itp_label_area">
+					<label>품목수</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnItemQty"></div>
+				</div>
 			</div>
-			<div class="pop_line">
-				<label>반품금액 &nbsp;&nbsp;:</label>
-				<div class="fnRtnAmt">원</div>
+			<div class="pop_line border">
+				<div class="itp_label_area">
+					<label>반품금액</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnRtnAmt"></div>
+				</div>
 			</div>
 			<label class="pop_label msg_save">요청 하시겠습니까?</label>
 			<div class="popup_btn">
@@ -118,7 +130,7 @@
 				</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">반품장소 ▼</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>
@@ -155,12 +167,12 @@
 					<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">품목명 ▼</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: block;">
+				<div id="ITP_LIST_MRTNMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						 <div class="scroll_left">
                             <div class="fnItemNm"></div>

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

@@ -1,9 +1,12 @@
 <section id="ITP_MOBILE_MRTNMNG02010">
-	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: none;">
+	<div id="ITP_AJAX_MRTNMNG02010_LIST_CONTAINER" style="display: block;">
 		<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="">
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
+			  	<div class="line header">
+					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청현황</div>
+		      	</div>
 				<div class="line">
 					<label>반품요청일</label>
 					<div class="input-group date_to date">
@@ -14,7 +17,7 @@
 				</div>
 				<div class="line">
 					<label>반품요청상태</label>
-					<div class="line_right">
+					<div class="float_left">
 						<select id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_RTN_REQ_ST_CD" data-select-code="RTN_REQ_ST_CD" class="stcd" name="srtnReqStCd">
 							<option value="">상태</option>
 						</select>
@@ -22,16 +25,16 @@
 				</div>
 				<div class="line">
 					<label>납품장소</label>
-					<div class="search_wrap">
-						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
 				<div class="line" style="height:50px;">
 					<div class="search">
@@ -39,21 +42,21 @@
 					</div>
 				</div>
 				<div class="table_header">
-					<h1>>구매 요청 내역</h1>
+					<h1><반품 요청 내역></h1>
 				</div>
 			</form>
 		</div>
-		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-1-1">
-			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="panel-group"></ul>
-			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display:none;">
-				<li class="history_list list-row">
+		<div id="ITP_LIST_MRTNMNG02010_LIST_AREA" class="scroll_area row-10">
+			<ul id="ITP_LIST_MRTNMNG02010_LIST_ROWS" class="mb_0 panel-group"></ul>
+			<div id="ITP_LIST_MRTNMNG02010_LIST_ROWCOPY" style="display: block;">
+				<li class="history_list5">
 					<div class="left">
 						<div class="nomal">
 							<label>반품요청일 </label>
 							<span>:</span>
 							<div class="history">
-								<div class="fnRtnReqDt"></div>
-								(<div class="fnRtnReqMgrNm"></div>)
+								<div class="fnRtnReqDt">asdf</div>
+								(<div class="fnRtnReqMgrNm">asdf</div>)
 							</div>
 						</div>
 					</div>
@@ -114,23 +117,24 @@
 				<h1>> 반품 품목</h1>
 			</div>
 		</div>
-		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-2">
-			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="panel-group"></ul>
-			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display:none;">
+		<div id="ITP_LIST_MRTNMNG02010_DETAIL_AREA" class="scroll_area row-11">
+			<ul id="ITP_LIST_MRTNMNG02010_DETAIL_ROWS" class="mb_0 panel-group"></ul>
+			<div id="ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY" style="display: block;">
 				<li class="list-row">
 					<div class="left_info">
 						<div class="thick">
-							<div class="fnItemNm">품목명</div>
-							<div>-</div>
-							<div class="fnUnit"></div>
-						</div>
-						<div class="thick">
-							<label class="space0">반품가 :</label>
-							<div class="fnRtnAmt"></div>
-						</div>
+			              	<label>품목명</label>
+			                <span>:</span>
+			                <div class="itp_item fnItemNm"></div>
+	                	</div>
+		                <div class="thick">
+		              		<label>구매가</label>
+		                	<span>:</span>
+		                	<div class="itp_amt fnRtnAmt"></div>
+		                </div>
 					</div>
 					<div class="right">
-						<div class="fnRtnQty"></div>
+						<div class="fnnum fnRtnQty">1</div>
 					</div>
 				</li>
 			</div>
@@ -149,6 +153,9 @@
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID" name="rtnReqMgrId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
 			<div class="content">
+				<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 id="ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT" name="colReqDt" class="date fnColReqDt" data-check-required="empty" type="date" placeholder="">
@@ -161,43 +168,44 @@
 				</div>
 				<div class="line">
 					<label>반품장소</label>
-					<div class="search_nm">
-						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
-						</div>
-						<div class="float_left_btn">
+					<div class="float_left">
+						<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
+						<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
+						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-							<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 						</div>
 					</div>
+					<div class="float_right_btn">
+						<button id="ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					</div>
 				</div>
-				<div class="line">
+				<div class="header line">
 					<div class="table_header">
-						<h1>>반품 품목</h1>
+						<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>
-			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-1-1">
-				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display:none;">
+			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-2-1">
+				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: block;">
 					<li class="list-row">
 						<div class="left_info">
 							<div class="check_box"><!-- class 변경 -->
-								<div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
-							</div>
-							<div class="thick">
-								<div class="fnItemNm">품목명</div>
-								<div>-</div>
-								<div class="fnUnit">EA</div>
+								<input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
 							</div>
 							<div class="thick">
-								<label class="space0">구매가 :</label>
-								<div class="fnUnitAmt"></div>
-							</div>
+				              	<label>품목명</label>
+				                <span>:</span>
+				                <div class="itp_item fnItemNm">품목명</div>
+			              	</div>
+			              	<div class="thick">
+				              	<label>구매가</label>
+				                <span>:</span>
+				                <div class="itp_amt fnUnitAmt"></div>
+			             	 </div>
 						</div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
@@ -215,18 +223,30 @@
 		</form>
 	</div>
 	<div id="ITP_POP_MRTNMNG02010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
-		<div class="pop">
+		<div class="pop short">
 			<div class="pop_line">
-				<label>반품요청일 &nbsp;&nbsp;:</label>
-				<div class="fnPopDlvReqDt"></div>
+            	<div class="itp_label_area">
+					<label>반품요청일</label>
+				</div>
+	            <div class="itp_info_area">
+					<div class="fnPopDlvReqDt"></div>
+				</div>
 			</div>
 			<div class="pop_line">
-				<label>품목수&nbsp;&nbsp; :</label>
-				<div class="fnItemQty"></div>
+				<div class="itp_label_area">
+					<label>품목수</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnItemQty"></div>
+				</div>
 			</div>
-			<div class="pop_line">
-				<label>구매금액 &nbsp;&nbsp;:</label>
-				<div class="fnRtnTotalAmt"></div>
+			<div class="pop_line border">
+				<div class="itp_label_area">
+					<label>반품금액</label>
+				</div>
+				<div class="itp_info_area">
+					<div class="fnRtnTotalAmt"></div>
+				</div>
 			</div>
 			<label class="pop_label msg_save">구매요청 하시겠습니까?</label>
 			<div class="popup_btn">
@@ -253,16 +273,17 @@
 					<button id="ITP_BTN_MRTNMNG02010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
 				</form>
 			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG02010_POP_WHS_NM" class="btn_blue">납품장소 ▼</button>
 			</div>
 			<div id="ITP_LIST_MRTNMNG02010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_POP_WHS_ROWCOPY" style="display:none;">
+				<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="fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">(상세위치내용)</div>
+							<div class="sub fnLocationNm">누리자 B/D</div>
 						</div>
 						<div class="scroll_right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -289,36 +310,27 @@
 					<input id="ITP_FORM_MRTNMNG02010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
 					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_SEARCH"><img src="../img/search.png"></button>
 				</div>
-				<div class="search_bar">
-					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명▼</button>
+				<div class="select_btn">
+					<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_NM" class="btn_blue">품목명 ▼</button>
 				</div>
 			</form>
 			<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display:none;">
+				<ul id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWS" class="mb_0 panel-group"></ul>
+				<div id="ITP_LIST_MRTNMNG02010_POP_ITEM_ROWCOPY" style="display: block;">
 					<li class="row_2">
-						<div class="left" style="width:180px;">
-							<!--<div class="check_box">
-                                <input type="checkbox" id="ITP_FORM_MRTNMNG02010_POP_ITEM_CHECKBOX" name="itemId" />
-                            </div>-->
-							<div class="thick">
-								<div class="fnItemNm">품목명</div>
-								<div>-</div>
-								<div class="fnUnit">EA</div>
-							</div>
-							<div class="thick" style="font-weight:100;">
-								<div class="space">구매가 :</div>
-								<div class="fnUnitAmt">0</div>
-							</div>
-						</div>
+						 <div class="scroll_left">
+                            <div class="fnItemNm"></div>
+                            <div class="sub fnKg"></div>
+                            <div class="amt fnUnitAmt"></div>
+                        </div>
+                        <div class="scroll_right">
+                            <button id="ITP_BTN_MPOMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
+                        </div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
-							<div class="num fnRtnQty">1</div>
+							<div class="num fnPchReqQty">1</div>
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
 						</div>
-						<div class="add">
-							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
-						</div>
 					</li>
 				</div>
 			</div>

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

@@ -12,6 +12,7 @@ body .login {position:fixed;}
 /* 팝업 */
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
 section .popup .pop {position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 70%; height: 360px; padding-top: 20px; background: #fff; border: 2px solid #000; border-top-left-radius: 10px; border-top-right-radius: 10px;}
+section .popup .pop.short {height:260px;}
 section .popup .pop label.pop_label {position:relative; top:10px; font-size: 16px;}
 section .popup .pop div.pop_msg {padding:0 5%; text-align:left; position:relative; top:10px; font-size: 16px;}
 section .popup .pop .pop_line {width: 90%; margin:0 5%; display:flex; border:1px solid #aaa; border-bottom:none;}
@@ -224,7 +225,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* 메뉴바 */
 #ITP_MENU .menu_area {position: fixed; width: 100%; height: 100%; top: 0; left: -0%; background: #000; opacity: 0.7; z-index: 12; transition: all 0.5s;}
-#ITP_MENU .menu_area button {float: right; width: 20px; height: 20px; padding: 0; background: transparent; border: none;}
+#ITP_MENU .menu_area button {float: right; width: 50px; height: 50px; padding: 0; background: transparent; border: none;}
 #ITP_MENU .menu_area button img {float: right; width: 40px; height: 40px; margin: 7px;}
 #ITP_MENU .menu_bar {position: fixed; width: 70%; height: 100%; left: -0%; top: 0; background: #fff; opacity: 1; z-index: 13; transition: all 0.5s;}
 #ITP_MENU .menu_bar .menu_header {width: 100%; height: 100px; border-bottom: 1px solid #000 ;}
@@ -287,7 +288,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line label {min-width:110px; color:#666; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 10px; font-weight:100;}
 .content .line label.pay_label {margin:38px 1%; width:98%;}
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
-.content .line .itp_label_select {padding:0;width:120px; color:#666; font-size: 18px; float: left; margin-top: 3px; font-weight:100;}
+.content .line .itp_label_select {padding:0;width:116px; color:#666; font-size: 18px; float: left; margin-top: 5px; margin-right:4px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
 .content .line .float_left {float: left; margin-top:2px; width:50%;}
 .content .line .float_left.name {width:60%;}
 .content .line .float_left button {float:right; left:-5px; position:relative; background:transparent; border:none; width:36px; height:36px; padding:0;} 
@@ -311,10 +312,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
 .content .line input.date {width: 50%; margin: 5px 0; height: 35px; float: left; text-align:center; font-size:14px;background: url(../img/calender.png)no-repeat 95% 50%/20px auto #fff;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
-.content .line div.date_to {width:60%; float: left; margin-right:0px;}
-.content .line div.date_to input {width:45%; font-size:14px;}
+.content .line div.date_to {display:flex; width:60%; float: left; margin-right:0px;}
+.content .line div.date_to input {font-weight:100; width:47%; font-size:14px;}
 
-.content .line div.date_to div.at {width: 3%;  font-size: 1rem; float: right; display: contents;}
+.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:8px;}
 .content .line .search button {width: 50%; height: 35px; font-size: 14px; font-weight:100; padding: 0;}
 .content .line .search button.col_3 {width: 25%; margin:0 12px;}
@@ -374,15 +375,17 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area {position: absolute; width: 100%; height: 1090px; bottom: 30px; overflow: auto; background: #fff;}
 .row-1{top: 347px;}
 .row-1-1{top:363px;}
-.row-2{top: 300px;}
+.row-2{top: 345px;}
 .row-2-1{top:317px;}
 .row-3{top: 395px;}
-.row-4{top: 440px;}
+
+.row-4{top: 439px;}
 .row-5{top: 418px;}
 .row-6{top: 468px;}
 .row-7{top: 533px;}
 .row-9{top: 383px;}
-
+.row-10{top: 349px;}
+.row-11{top: 254px;}
 .col-4{width:35% !important;}
 .col-6{width:60% !important;}
 .col-4 .thick{width:100% !important;}
@@ -445,7 +448,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal .half {float:left;}
 .scroll_area li .left .nomal .half label {min-width:auto;}
 .scroll_area li .left .nomal .half div {min-width:auto; margin-right:5px; margin-top:0;}
-.scroll_area li .left .nomal  input{width: 85px; height:30px;}
+.scroll_area li .left .nomal  input{width: 85px; height:30px; margin-top:-3px;}
 
 .scroll_area li .scroll_btn {width:10%; height:158px; margin-top:-5px; display:inline-flex;}
 
@@ -507,7 +510,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 	.content .line .float_left .itp_input_btn {width:70%;}
 	.content .line .float_left {width:70%;}
 	.content .line div.date_to {width:70%;}
-	.content .line div.date_to input {width:45%}
+	.content .line div.date_to input {width:47%}
 	.content .line .float_left.name {width:76%;}
 	.modal-dialog {margin:auto 20% !important;}
 	.scroll_area li .left_info .thick {width: 90%;}

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

@@ -72,6 +72,7 @@ let mobPageObj = {
 
 let mobContObj = {
 	init: function() {
+		this.list.empty();
 		this.data.load();
 	},
 	data: {
@@ -132,6 +133,7 @@ let mobContObj = {
 				$('.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.empty();
 		},
 		detachRow: function () {
 			if($('#ITP_LIST_MPOMNG01010_ITEM_AREA input:checkbox[name=brandUnitUnqNo]:checked').length > 0) {
@@ -144,11 +146,11 @@ let mobContObj = {
 				});
 				this.pchReqAmtTot();
 			}
+			this.empty();
 		},
 		actPlus: function(elem) {
 			var $div = $(elem).siblings('div');
 			var num = Number($div.text());
-			console.log('actPlus ===> ' + num);
 			$($div).text((num + 1).toString());
 			this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
 			this.pchReqAmtTot();
@@ -156,7 +158,6 @@ let mobContObj = {
 		actMinus: function(elem) {
 			var $div = $(elem).siblings('div');
 			var num = Number($div.text());
-			console.log('actMinus ===> ' + num);
 			if(num <= 1) {
 				alert('주문수량을 확인하세요.');
 			} else {
@@ -173,6 +174,9 @@ let mobContObj = {
 				reqAmt += Number(qty) * amt;
 			});
 			$('#ITP_AJAX_MPOMNG01010_VIEW_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
+		},
+		empty: function() {
+			($('#ITP_LIST_MPOMNG01010_DETAIL_ROWS li').length > 0) ? $('.itp_non_data').hide() :  $('.itp_non_data').show();
 		}
 	},
 	cancel: function () {

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

@@ -133,7 +133,7 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG05010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MPOMNG05010_LIST_ITEM_AREA .panel-group > .history_list2:last');
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
 					$li.find('.fnDlvReqDt').text(item.dlvReqDt);
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);

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

@@ -35,8 +35,9 @@ let mobPageObj = {
 			});
 
 			// 조회일자 지정
-			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', 0));
-			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_MOBILE_MPOMNG06010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -61,6 +62,10 @@ let mobPageObj = {
 				return false;
 			});
 
+			$(document).on('click', '#ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS li button', function() {
+				mobPopObj.popSpply.choice($(this));
+			});
+
 			$(document).on('click', '#ITP_LIST_MPOMNG06010_POP_WHS_ROWS li button', function() {
 				mobPopObj.popWhsNm.choice($(this));
 			});
@@ -128,12 +133,12 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG06010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MPOMNG06010_LIST_ITEM_AREA .panel-group > .history_list2:last');
 					$li.find('.fnDlvSttmtUnqNo').text(item.dlvSttmtUnqNo);
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
 					$li.find('.fnSpplyNm').text(item.spplyNm);
 					$li.find('.fnWhsNm').text(item.whsNm);
-					$li.find('.fnItemNm').text(item.itemNm + '(' + item.podrQty + item.unit + ')');
+					$li.find('.fnItemNm').text(item.itemNm);
 					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
 					$li.find('.fnWhsQty').val(item.whsQty);
@@ -144,9 +149,6 @@ let mobContentObj = {
 			const param = $('#ITP_FORM_MPOMNG06010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
 			param.gridSize = this.listSize;
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
-			param.toDt = CommonObj.onlyNumber(param.toDt);
-			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
 		},
 		save: function() {
@@ -209,7 +211,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY').html());
-				var $li = $('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group > .row_2:last');
 				$li.find('.fnSpplyNm').text(item.spplyNm);
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -273,7 +275,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MPOMNG06010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MPOMNG06010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MPOMNG06010_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);
@@ -304,13 +306,8 @@ let mobPopObj = {
 			});
 		},
 		delete: function() {
-			if(_this.popMode === 'RTN_WHS') {
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val('');
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val('');
-			} else {
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val('');
-				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val('');
-			}
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID').val('');
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM').val('');
 		},
 		close: function() {
 			this.rows.length = 0;

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

@@ -35,8 +35,9 @@ let mobPageObj = {
 			});
 
 			// 조회일자 지정
-			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
+			$('#ITP_MOBILE_MPOMNG07010 .itp_input.date').datepicker(ITP_DATE_LANGUAGE);
+			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_FROM_DT').datepicker('setDate', itp_fn_date_add('M', -1));
+			$('#ITP_FORM_MPOMNG07010_LIST_SEARCH_TO_DT').datepicker('setDate', itp_fn_date_add('M', 0));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -132,15 +133,15 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MPOMNG07010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MPOMNG07010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MPOMNG07010_LIST_ITEM_AREA .panel-group > .list-row:last');
+					var $li = $('#ITP_LIST_MPOMNG07010_LIST_ITEM_AREA .panel-group > .history_list2:last');
 					$li.find('.fnPchPodrUnqNo').text(item.pchPodrUnqNo);
 					$li.find('.fnDlvCmpltDt').text(item.dlvCmpltDt);
 					$li.find('.fnDlvSchDt').text(item.dlvSchDt);
 					$li.find('.fnSpplyNm').text(item.spplyNm);
 					$li.find('.fnWhsNm').text(item.whsNm);
 					$li.find('.fnItemNm').text(item.itemNm);
-					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty) + item.unit);
-					$li.find('.fnWhsQty').text(CommonObj.comma.set(item.dlvQty) + item.unit);
+					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty,  item.unit));
+					$li.find('.fnWhsQty').text(CommonObj.comma.set(item.dlvQty,  item.unit));
 					_this.rows.push(item);
 				});
 			};
@@ -148,9 +149,6 @@ let mobContentObj = {
 			const param = $('#ITP_FORM_MPOMNG07010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
 			param.gridSize = this.listSize;
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
-			param.toDt = CommonObj.onlyNumber(param.toDt);
-			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
 		}
 	}
@@ -180,7 +178,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_POP_MPOMNG07010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY').html());
-				var $li = $('#ITP_POP_MPOMNG07010_LIST_SPPLY_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_POP_MPOMNG07010_LIST_SPPLY_AREA .panel-group > .row_2:last');
 				$li.find('.fnSpplyNm').text(item.spplyNm);
 				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
 				$li.find('.fnSpplyId').data('item-key', item.spplyId);
@@ -244,7 +242,7 @@ let mobPopObj = {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MPOMNG07010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MPOMNG07010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MPOMNG07010_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);

src/main/webapp/mobile/js/config.js

@@ -55,10 +55,9 @@ require([
 	});
 
 	$('#ITP_MOBILE_BTN_SETTING').on('click', function() {
-		$('#ITP_MENU').toggle();
 	});
 
-	$('#ITP_BTN_NAV_CLOSE').on('click', function() {
+	$('.ITP_BTN_NAV_CLOSE').on('click', function() {
 		$('#ITP_MENU').toggle();
 	});
 
@@ -508,6 +507,16 @@ function itp_fn_modal_confirm(msg, fn, args) {
 	}
 }
 
+function itp_fn_modal_empty(msg) {
+	$('#ITP_MODAL_NOT_INPUT').hide();
+	$('#ITP_MODAL_NOT_INPUT').modal('show');
+	$('#ITP_MODAL_NOT_INPUT').find('.fnNotInput').html(msg);
+	$('#ITP_MODAL_NOT_INPUT_CONFIRM').off('click');
+	$('#ITP_MODAL_NOT_INPUT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_NOT_INPUT').modal('hide');
+	});
+};
+
 let itp_fn_form_validate = function(form, element, arry, msg, type) {
 	var error = function(txt) {
 		if (type != 'ONLYCHK') {
@@ -663,8 +672,7 @@ let itp_fn_form_event = {
 				isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined, alertMsg);
 				if(!isValid) {
 					if(alertMsg && alertMsg.length > 0) {
-						itp_fn_modal_alert($(this).data('alert-msg'));
-						// alert($(this).data('alert-msg'));
+						itp_fn_modal_empty($(this).data('alert-msg'));
 					}
 					return false;
 				}