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

src/main/webapp/app/popup/biz/BIZPOP_PO_STOCK_PROC.html

@@ -28,7 +28,7 @@
 									<label class="col-xs-2 itp_lb sw">품목명</label>
 									<div class="col-xs-4 col_3 itp_ip fnItemNm"></div>
 								</div>
-								<div class="form-group border">
+								<div class="form-group">
 									<label class="col-xs-2 itp_lb sw">현재고</label>
 									<div class="col-xs-4 col_3 itp_ip fnStckQty"></div>
 									<label class="col-xs-2 itp_lb sw">관리등급</label>
@@ -44,7 +44,7 @@
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
 									</div>
 								</div>
-								<div class="form-group colspan">
+								<div class="form-group border colspan">
 									<label class="col-xs-2 itp_lb colspan sw">이동수량</label>
 									<div class="col-xs-4 col_3 itp_ip">
 									<input type="text" id="ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY" class="form-control itp_input" name="moveQty" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');"/>

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

@@ -358,8 +358,8 @@
 						<button type="button" class="btn-pop-close"><img src="../img/close.png"></button>
 					</div>
 				</div>
-				<div id="ITP_POP_NOTICE_AREA" style="position:relative; top:-40px;">
-					<div class="itp_notify_row">
+				<div id="ITP_POP_NOTICE_AREA">
+					<div class="itp_notify_row" style="width:85%;">
 						<label class="noti_label">공지제목</label>
 						<span>:</span>
 						<div class="fnNoteNm noti_text"></div>

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

@@ -124,10 +124,11 @@
 				</li>
 			</div>
 		  </div>
+		  <!--
 		<div class="button_bar">
 		  <button id="ITP_BTN_MCOLLMNG03010_LIST_COL_VIEW" class="ok col_12 btn-m-orange IVDETAIL">수거서보기</button>
-		  <!--<button id="ITP_BTN_MCOLLMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
 		</div>
+		-->
 	  </form>
 	</div>
 	<div id="ITP_AJAX_MCOLLMNG03010_VIEW_CONTAINER" style="display: none;">

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

@@ -11,7 +11,7 @@
 				<div class="line">
 				  <label>매장선택</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_NM" name="storeNm" type="text" placeholder="A매장명">
+					<input id="ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_NM" name="storeNm" type="text" placeholder="">
 					<div class="itp_input_btn">		
 						<button id="ITP_BTN_MLOANMNG01010_LIST_SEARCH_STORE_NM"><img src="../img/search.png" alt=""></button>
 					</div>

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

@@ -12,7 +12,7 @@
 				<div class="line">
 				  <label>매장선텍</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM" name="sstoreNm" type="text" placeholder="A매장명" readonly>
+					<input id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM" name="sstoreNm" type="text" placeholder="" readonly>
 					<div class="itp_input_btn">	
 						<button id="ITP_BTN_MLOANMNG02010_LIST_SEARCH_RTN_PLACE"><img src="../img/search.png" alt=""></button>
 					</div>
@@ -61,7 +61,7 @@
 					<div class="nomal">
 					  <label class="col_4">매장명</label>
 					  <span>:</span>
-					  <div class="full_s fnStoreNm">fasdfsdfssfdsfadfsadfsadfasdsfdsfd</div>
+					  <div class="full_s fnStoreNm"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
@@ -71,7 +71,7 @@
 					  <div class="fnLoanDvsnNm"></div>
 				      <label class="sub_info">요청일자</label>
 					  <span>:</span>
-					  <div class="text_btn fnReqDt">2020.20.20</div>
+					  <div class="text_btn fnReqDt"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">
@@ -81,7 +81,7 @@
 					  <div class="fnDpstDt"></div>
 					  <label class="sub_info">입금금액</label>
 					  <span>:</span>
-					  <div class="text_btn fnDpstAmt">12,000,00000</div>
+					  <div class="text_btn fnDpstAmt"></div>
 					</div>
 				  </div>
 				  <div class="left btn_list">

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

@@ -11,7 +11,7 @@
 				<div class="line">
 				    <label>매장선택</label>
 					<div class="float_left">
-						<input id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_STORE_NM" name="storeNm" type="text" placeholder="A매장명" readonly>
+						<input id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_STORE_NM" name="storeNm" type="text" placeholder="" readonly>
 						<div class="itp_input_btn">	
 							<button id="ITP_BTN_MLOANMNG03010_LIST_SEARCH_STORE_NM"><img src="../img/search.png" alt=""></button>
 						</div>

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

@@ -13,7 +13,7 @@
 			   <div class="line">
 				  <label>납품장소</label>
 				   <div class="float_left">
-					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="납품장소">
+					   <input id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					   <input type="hidden" id="ITP_FORM_MORDMNG02010_LIST_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"/>
 	       			   <div class="itp_input_btn">
 		   			  		<button type="button" id="ITP_BTN_MORDMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -123,10 +123,12 @@
 						</div>
 					</li>
 				</div>
+				<!--
 				<div class="button_bar">
 					<button id="ITP_BTN_MORDMNG03010_LIST_DLV_VIEW" class="ok col_12 btn-m-orange IVDETAIL">납품서보기</button>
-					<!--<button id="ITP_BTN_MORDMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+					 
 				</div>
+				-->
 			</div>
 		</form>
 	</div>

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

@@ -38,7 +38,7 @@
 	        <div class="line">
 	          <label>납품장소</label>
 	            <div class="float_left">
-	                <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" placeholder="납품장소" readonly />
+	                <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="납품장소" placeholder="" readonly />
 	                <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
 	                <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
 			        <div class="itp_input_btn">

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

@@ -27,7 +27,7 @@
 	      <div class="line">
 	        <label>납품장소</label>
 	        <div class="float_left">
-	          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
+	          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="" readonly>
 	             <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
 	             <div class="itp_input_btn">
 	         		 <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -28,7 +28,7 @@
 				<div class="line">
 				  <label>공급업체</label>
 				  <div class="float_left">
-					<input type="text" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명">
+					<input type="text" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="">
 					<input type="hidden" id="ITP_FORM_MPOMNG04010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 					<div class="itp_input_btn">
 						<button id="ITP_BTN_MPOMNG04010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -164,7 +164,7 @@
 					  <label class="col_3">수량</label>
 					  <span>:</span>
 					  <div class="fnPodrQty"></div>
-					  <label class="sub_info">금액</label>
+					  <label class="sub_info">단가</label>
 					  <span>:</span>
 					  <div class="fnUnitAmt"></div>
 					</div>

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

@@ -34,7 +34,7 @@
 					<div class="line">
 						<label>공급업체</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
+							<input type="text" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="" readonly>
 							<input type="hidden" id="ITP_FORM_MPOMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 	           				<div class="itp_input_btn">
 								<button id="ITP_BTN_MPOMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -60,7 +60,7 @@
 					<div class="line">
 						<label>품목명</label>
 						<div class="float_left name">
-							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
+							<input id="ITP_FORM_MPOMNG05010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
 						</div>
 					</div>
 					<div class="line">

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

@@ -26,7 +26,7 @@
 					<div class="line">
 						<label>공급업체</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
+							<input type="text" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="" readonly>
 							<input type="hidden" id="ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 	           				<div class="itp_input_btn">
 								<button id="ITP_BTN_MPOMNG06010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -39,7 +39,7 @@
 					<div class="line">
 						<label>납품장소</label>
 						<div class="float_left">
-							<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="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>
@@ -52,7 +52,7 @@
 					<div class="line">
 						<label>품목명</label>
 						<div class="float_left name">
-							<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
+							<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="">
 						</div>
 					</div>
 					<div class="line">

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

@@ -26,7 +26,7 @@
 				<div class="line">
 					<label>공급업체</label>
 					<div class="float_left">
-						<input type="text" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="A공급업체명" readonly>
+						<input type="text" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_SPPLY_NM" name="sspplyNm" placeholder="" readonly>
 						<input type="hidden" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 	       				<div class="itp_input_btn">
 							<button id="ITP_BTN_MPOMNG07010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -52,7 +52,7 @@
 		      <div class="line">
 		        <label>품목명</label>
 		        <div class="float_left">
-		          <input id="ITP_FORM_MPOMNG07010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
+		          <input id="ITP_FORM_MPOMNG07010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
 		        </div>
 		      </div>
 		      <div class="line">

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

@@ -27,7 +27,7 @@
 					<div class="line">
 						<label>납품장소</label>
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
+							<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>

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

@@ -26,7 +26,7 @@
 					<div class="line">
 						<label>수거창고</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
 							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID" class="" name="srtnWhsId" />
 							<div class="itp_input_btn">
 								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -39,7 +39,7 @@
 					<div class="line">
 						<label>공급업체</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_NM" class="" name="sspplyNm" placeholder="공급업체" readonly />
+							<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_NM" class="" name="sspplyNm" placeholder="" readonly />
 							<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 							<div class="itp_input_btn">
 								<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>

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

@@ -25,7 +25,7 @@
 					<div class="line">
 						<label>수거창고</label>
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="수거창고" readonly>
+							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" 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" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -38,7 +38,7 @@
 					<div class="line">
 						<label>공급업체</label>
 						<div class="float_left">
-							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_NM" class="" name="sspplyNm" placeholder="공급업체" readonly />
+							<input type="text" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_NM" class="" name="sspplyNm" placeholder="" readonly />
 							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_ID" class="" name="sspplyId" />
 							<div class="itp_input_btn">
 								<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_SPPLY_NM"><img src="../img/search.png" alt=""></button>
@@ -51,7 +51,7 @@
 					<div class="line">
 						<label>품목명</label>
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
+							<input id="ITP_FORM_MRTNMNG06010_LIST_ITEM_NM" name="sitemNm" type="text" placeholder="">
 						</div>
 					</div>
 					<div class="line">

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

@@ -11,7 +11,7 @@
 				<div class="line">
 				  <label>창고선택</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A창고명">
+					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					<div class="itp_input_btn">		
 						<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 					</div>
@@ -31,7 +31,7 @@
 				<div class="line">
 				  <label>품목명</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="품목명">
+					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" type="text" placeholder="">
 				  </div>
 				</div>
 				<div class="line">

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

@@ -17,7 +17,7 @@
 				<div class="line">
 				  <label>창고선택</label>
 				  <div class="float_left">
-					<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A창고명">
+					<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="">
 					<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" type="hidden">
 					<div class="itp_input_btn">		
 						<button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>

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

@@ -440,7 +440,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.btn_col_6 {width: 65%;}
 .button_bar button.btn_col_3,
 .button_bar button.btn_col_6 {border:none; float: left; height: 47px; font-size: 14pt; font-weight: 100; border-radius: 0px;}
-.button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt;}
+.button_bar button.col_12 {font-weight:100; width: 100%; height: 47px; font-size: 14pt; border:none;}
 
 /* scroll_area 조정 */
 .scroll_area {position: relative; top:0; flex:1; width: 100%; height: 456px; overflow: auto; background: #fff;}