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

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

@@ -17,35 +17,35 @@
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID" name="itemId" value="">
 							
 								<div class="form-group">
-									<label class="col-xs-2 itp_lb">창고명</label>
+									<label class="col-xs-2 itp_lb sw">창고명</label>
 									<div class="col-xs-3 col_3 itp_ip fnWhsNm"></div>
-									<label class="col-xs-2 itp_lb">로케이션</label>
+									<label class="col-xs-2 itp_lb sw">로케이션</label>
 									<div class="col-xs-3 col_3 itp_ip fnLocationNm"></div>
 								</div>
 								<div class="form-group">
-									<label class="col-xs-2 itp_lb">품목번호</label>
+									<label class="col-xs-2 itp_lb sw">품목번호</label>
 									<div class="col-xs-4 col_3 itp_ip fnItemId"></div>
-									<label class="col-xs-2 itp_lb">품목명</label>
+									<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">
-									<label class="col-xs-2 itp_lb">현재고</label>
+									<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">관리등급</label>
+									<label class="col-xs-2 itp_lb sw">관리등급</label>
 									<div class="col-xs-4 col_3 itp_ip"></div>
 								</div>
 								<div class="form-group">
-									<label class="col-xs-2 itp_lb">창고선택</label>
+									<label class="col-xs-2 itp_lb sw">창고선택</label>
 									<div class="col-xs-4 col_3 itp_ip">
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID" class="form-control itp_input" name="targetWhsId"></select>
 									</div>
-									<label class="col-xs-2 itp_lb">Location</label>
+									<label class="col-xs-2 itp_lb sw">Location</label>
 									<div class="col-xs-4 col_3 itp_ip">
 									<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">
-									<label class="col-xs-2 itp_lb colspan">이동수량</label>
+									<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" />
 									</div>									

src/main/webapp/app/stinfo/STINFO06010.html

@@ -52,7 +52,7 @@
 				             <div class="form-group">
 				                <div class="col-xs-3 itp_ip">
 									<div class="input-group">
-				                		<input type="text" id="ITP_FORM_STINFO06010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" placeholder="매장명" disabled />
+				                		<input type="text" id="ITP_FORM_STINFO06010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" placeholder="매장명" readonly />
 										<span class="input-group-btn">
 											<button id="ITP_BTN_STINFO06010_DETAIL_DELETE_STORE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
 										</span>
@@ -63,10 +63,7 @@
 				                </div>
 								 <div class="contDt">
 								 	<div class="col-xs-2 itp_ip itp_noMar">
-										<select id="ITP_BTN_STINFO06010_DETAIL_SEARCH_" class="form-control itp_input" name="search">
-											<option value="">계약기간</option>
-										</select>	
-									</div>									 
+										<label>계약기간</label>									</div>									 
 									<div class="col-xs-3 itp_ip itp_noMar">
 										 <div class="input-daterange input-group date">
 											 <input type="text" id="ITP_FORM_STINFO06010_DETAIL_FROM_DT" data-check-required="empty" class="form-control itp_input" name="contSttDt" value="" readonly>

src/main/webapp/app/stockmng/STOCKMNG01010.html

@@ -5,6 +5,8 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>재고 관리</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_STOCKMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_STOCKMNG01010_ADDROW" class="btn btn-primary btn-sm IPS" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;재고처리&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_STOCKMNG01010_DELROW" class="btn btn-primary btn-sm IPS"><i class="glyphicon"></i>&nbsp;&nbsp;재고이력&nbsp;&nbsp;</button>	
 				</div>					
 			</div>
 			<div class="itp_det_in">
@@ -57,14 +59,6 @@
 							</div>
 						</div>
 					</div>
-					
-					<div class="fix" style="padding-right:15px; margin-bottom: 0px;">
-						<div class="pull-right itp_cicon">
-						<button type="button" id="ITP_BTN_STOCKMNG01010_ADDROW" class="btn btn-primary btn-sm IPS" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;재고처리&nbsp;&nbsp;</button>
-						<button type="button" id="ITP_BTN_STOCKMNG01010_DELROW" class="btn btn-primary btn-sm IPS"><i class="glyphicon"></i>&nbsp;&nbsp;재고이력&nbsp;&nbsp;</button>	
-						</div>
-					</div>	
-					
 					<div class="itp_table fix">
 						<div id="ITP_STOCKMNG01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_STOCKMNG01010_jqGridView" class="itp_views fix"></div>

src/main/webapp/app/stockmng/STOCKMNG02010.html

@@ -8,6 +8,7 @@
 					<button type="button" id="ITP_BTN_STOCKMNG02010_STOCK_CDD" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;재고실사&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_STOCKMNG02010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_STOCKMNG02010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
 				</div>					
 			</div>
 			<div class="itp_det_in">
@@ -96,11 +97,6 @@
 							</div>
 						</div>
 					</div>
-					<div class="fix" style="padding-right:15px;margin-bottom: 13px;">
-						<div class="pull-right itp_cicon">
-							<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
-						</div>
-					</div>
 					<div class="itp_table fix">
 						<div id="ITP_STOCKMNG02010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_STOCKMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>

src/main/webapp/app/stockmng/STOCKMNG03010.html

@@ -6,6 +6,8 @@
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_STOCKMNG03010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_STOCKMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_DELROW" class="btn btn-danger btn-sm SHOW"><i class="glyphicon"></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>	
 				</div>					
 			</div>
 			<div class="itp_det_in">
@@ -65,14 +67,6 @@
 							</div>
 						</div>
 					</div>
-					
-					<div class="fix" style="padding-right:15px; margin-bottom: 0px;">
-						<div class="pull-right itp_cicon">
-						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
-						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_DELROW" class="btn btn-danger btn-sm SHOW"><i class="glyphicon"></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>	
-						</div>
-					</div>					
-					
 					<div class="itp_table fix">
 						<div id="ITP_STOCKMNG03010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_STOCKMNG03010_jqGridView" class="itp_views fix"></div>

src/main/webapp/css/style.css

@@ -597,6 +597,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 #ITP_ASIDE .itp_modal .itp_form .shot{height:43px !important; border-bottom:1px solid #aaa;}
 #ITP_ASIDE .itp_modal .itp_form .form-group.border {border-bottom:1px solid #ddd;}
 #ITP_ASIDE .itp_modal .itp_form .form-control {font-size:13px; color:#333;}
+#ITP_ASIDE .itp_modal .itp_form .sw{width:100px !important;}
 #ITP_ASIDE .itp_modal .itp_form .itp_lb {top:0; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; width:125px; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
 #ITP_ASIDE .itp_modal .itp_form .itp_lb.itp_normal {font-weight:normal; padding-left:19px;}
 #ITP_ASIDE .itp_modal .itp_form .itp_ip {padding:9px 10px 0 10px;;}

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -449,6 +449,7 @@ let pageObj = {
 			});
 
 			$('#ITP_AJAX_STINFO06010_DETAIL_CONTAINER').show();
+			$('#ITP_BTN_STINFO06010_SRH').show();
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_CANCELLIST', '#ITP_BTN_STINFO06010_SAVE']);
 
 			$('#ITP_BTN_STINFO06010_DETAIL_SEARCH_STORE').removeAttr('disabled');
@@ -470,6 +471,7 @@ let pageObj = {
 			}
 			$('#ITP_BTN_STINFO06010_DETAIL_SEARCH_STORE').attr('disabled', true);
 			$('#ITP_BTN_STINFO06010_DETAIL_DELETE_STORE').attr('disabled', true);
+			$('#ITP_BTN_STINFO06010_SRH').show();
 
 			// 브랜드그룹 정보 설정
 			$('#ITP_FORM_STINFO06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));

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

@@ -275,6 +275,7 @@ const gridColModel = {
 			index: 'CDD_QTY', name: 'cddQty',
 			label: "실사수량",
 			width: '10', fixed: false, align: 'center',
+			classes: 'input_color',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false}
 		}
@@ -391,6 +392,7 @@ let pageObj = {
 			$('#ITP_BTN_STOCKMNG02010_CANCELLIST').hide();
 			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();
 			$('#ITP_BTN_STOCKMNG02010_SAVE').hide();
+			$('#ITP_BTN_STOCKMNG02010_DETAIL_ADDROW').hide();
 			
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_SRH');
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_STOCK_CDD');
@@ -404,7 +406,8 @@ let pageObj = {
 			$('#ITP_BTN_STOCKMNG02010_SRH').hide();
 			$('#ITP_BTN_STOCKMNG02010_MODIFY').hide();
 			$('#ITP_BTN_STOCKMNG02010_STOCK_CDD').hide();
-			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();			
+			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();		
+			$('#ITP_BTN_STOCKMNG02010_DETAIL_ADDROW').show();
 			
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_CANCELLIST');
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_SAVE');

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

@@ -15,13 +15,15 @@
     <script src="../js/properties.js"></script>
     <script src="../../js/require.min.js" data-main="../js/config.js"></script>
   </head>
+    <div class="bg_gray"></div>
     <div id="ITP_LOGIN">
       <form id="ITP_FORM_MOBILE_LOGIN" class="form-horizontal" action="" method="post" onsubmit="return false;">
         <input id="userId" name="userId" type="hidden" value="" />
         <input id="password" name="password" type="hidden" value="" />
       <div class="login_popup">
         <div class="login_info">
-          <h1>서비스<br>VISUAL IMAGE</h1>
+			<img src="../img/oqpologo.png" alt="로고" class=" ">
+       		<h1>Order Queen</h1>
         </div>
         <div class="num_area">
           <div class="input_area">

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

@@ -33,21 +33,12 @@
 				<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
 			</div>
 			<div class="logout">
-				<button id="ITP_MOBILE_BTN_LOGOUT">로그<br>아웃</button>
+				<button id="ITP_MOBILE_BTN_LOGOUT"><img src="../img/logout.png" alt=""></button>
 			</div>
 			<div class="name_info">
-				<label>
-					<div class="fnMenuNm"></div>
-				</label>
-				<label>
-					<div class="fnBrnadNm">브랜드명</div>
-				</label>
-				<label class="fnLblDash">
-					<div>-</div>
-				</label>
-				<label class="fnLblStoreNm">
-					<div class="fnStoreNm">매장명</div>
-				</label>
+				<div class="bn fnMenuNm"></div>
+				<div class="bn fnBrnadNm">브랜드명</div>
+				<div class="fnStoreNm">매장명</div>
 			</div>
 		</div>
 	</header>

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

@@ -30,7 +30,7 @@
           <label>납품장소</label>
           <div class="search_nm">
             <div class="float_left">
-              <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
+                <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" 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>
@@ -50,7 +50,7 @@
       </div>
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
-        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display:none;">
+        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: block;">
           <li class="list-row">
             <div class="left_info">
               <div class="check_box"><!-- class 변경 -->

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

@@ -1,7 +1,7 @@
 @font-face { font-family: 'NanumBarunGothic';src: url('../fonts/NanumBarunGothic.eot');src: url('../fonts/NanumBarunGothic.eot') format('embedded-opentype'),url('../fonts/NanumBarunGothic.woff') format('woff');}
 * {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'NanumBarunGothic', 'serif'; list-style: none;}
 section {}
-body{background: #fff; position: relative; width: 100%; height: auto;}
+body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'NanumBarunGothic';}
 .color-gray {color:#aaa;}
 /* 팝업 */
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
@@ -128,38 +128,38 @@ body.eee {height: 700px; background: #eee;}
 .upgrade .btn .info_btn2 button {width: 65%;color: #ccc;background-color: blue;}
 
 /* 로그인 */
+.bg_gray {width:100%; height:180px; background:#ecebea; border-bottom-left-radius:50%; border-bottom-right-radius:50%;}
 #ITP_LOGIN {max-width: 500px; margin: 0 auto;}
-#ITP_LOGIN .login_popup {position: relative; width: 100%; top: 80px; text-align: center;}
-#ITP_LOGIN .login_popup h1 { font-size: 1.5rem; color: #333; font-weight: normal;}
+#ITP_LOGIN .login_popup {position: relative; width: 100%; text-align: center;}
+#ITP_LOGIN .login_popup h1 { font-size: 1.5rem; color: #333; font-weight: 700;}
 #ITP_LOGIN .login_popup input { position: relative; height: 30px; font-size: 2.2rem;}
-#ITP_LOGIN .login_popup .login_info { margin-bottom: 100px;}
+#ITP_LOGIN .login_popup .login_info { margin-bottom: 30px; position:relative; top:-50px;}
+#ITP_LOGIN .login_popup .login_info img {width:100px; margin-bottom:10px;}
 #ITP_LOGIN .login_popup .num_area { position: relative; width: 100%;  margin-bottom: 40px;}
 #ITP_LOGIN .login_popup .num_area .input_area {margin-bottom: 10px;}
-#ITP_LOGIN .login_popup .num_area .input_area input {width:52%; font-size: 0.8rem; }
-#ITP_LOGIN .login_popup .num_area .input_area button {font-weight: 700; margin-left: 0.1%; width: 16.5%; height: 40px; background-color: blue; color: #eee; font-size: 1rem; padding: 0;}
-#ITP_LOGIN .login_popup .num_area .brand_list select {padding-left: 10px; width: 70%; height: 40px; font-size: 0.8rem; background: url(../img/down.png)no-repeat 100% 50%/40px auto; -webkit-appearance:none; appearance:none;}
+#ITP_LOGIN .login_popup .num_area .input_area input {width:50%; font-size: 0.8rem; }
+#ITP_LOGIN .login_popup .num_area .input_area button {margin-left: 0.1%; width: 19.5%; height: 45px; background-color: #f7b014; color: #eee; font-size: 16px; padding: 0; border:3px solid #fbd896; border-radius: 10px;}
+#ITP_LOGIN .login_popup .num_area .brand_list select {padding-left: 10px; width: 70%; height: 45px; font-size: 0.8rem; border:2px solid #ddd; border-radius:10px; background: url(../img/downarrow.png)no-repeat 95% 50%/20px auto; -webkit-appearance:none; appearance:none;}
 #ITP_LOGIN .login_popup .num_area .brand_list select option {text-align: left; width: 70%; height: 50px; border: 1px solid #000; font-size: 20px;} 
 
 #ITP_LOGIN .login_page {position: relative; width: 100%;  margin-bottom: 30px;}
 
 #ITP_LOGIN .input_area {position: relative; width: 100%;  margin-bottom: 10px;}
-#ITP_LOGIN .input_area input {width: 70%; height: 40px; position: relative; padding: 10px; text-align: left; border:1px solid #666; font-size: 0.7rem; color: #000; outline: none; margin:0;}
-#ITP_LOGIN .input_area label {position: absolute; left: 18%; top: 12px; font-size: 1rem; transition: all .5s ease;}
+#ITP_LOGIN .input_area input {width: 70%; height: 45px; position: relative; padding: 10px; text-align: left; border:2px solid #ddd; border-radius:10px; font-size: 0.7rem; color: #000; outline: none; margin:0;}
+#ITP_LOGIN .input_area label {position: absolute; left: 18%; top: 14px; font-size: 15px; transition: all .5s ease; color:#666;}
 #ITP_LOGIN .input_area input:focus + label,
-#ITP_LOGIN .input_area input:valid + label {top: 2px; left: 16%; font-size: 0.6rem; color: blue;}
+#ITP_LOGIN .input_area input:valid + label {top: 4px; left: 18%; font-size: 0.6rem; color: blue;}
 #ITP_LOGIN .error {margin: 0 auto; margin-top: 100px;}
 #ITP_LOGIN .error label {font-size: 1rem;}
-#ITP_LOGIN .login_btn {position: absolute; bottom: 0; left: 0;}
+#ITP_LOGIN .login_btn {position: relative; top: -20px; left: 0;}
 #ITP_LOGIN .login_btn button {
-  font-weight: 700;
-  position: fixed;
-  background-color: #aaa;
+  font-weight: nomal;
+  border:3px solid #fbd896; border-radius: 10px;
   color: #eee;
-  bottom: 0px;
-  width: 100%;
-  height: 60px;
-  border-top: 1px solid #000;
-  font-size: 1.2rem;
+  background-color: #f7b014;
+  width: 70%;
+  height: 50px;
+  font-size: 20px;
 }
 
 /* 메인화면 */
@@ -176,22 +176,25 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {margin-top: 3px; border: 1px solid #000; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
+input {margin-top: 3px; border: 1px solid #aaa; border-radius:5px; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
 select {border: 1px solid #000; height: 35px; font-size: 1rem; text-align: left; padding:0 15px;}
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 /* 공통화면 */
 
-#ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 55px;background-color:#92c7f6;align-items: center;border-bottom: 1px solid #000;z-index: 11;}
+#ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 55px;background-color:#F7B014;align-items: center;border-bottom: 1px solid #000;z-index: 11;}
 #ITP_WRAPPER header .header_wrap {width: 100%; height: 55px; margin: 0 auto;}
 #ITP_WRAPPER header .header_wrap .menu_logo button {width: 40px; height: 40px; float: left; padding: 0; background: transparent; border: none; margin-top: 7px; margin-left: 7px;}
-#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 35px; height: 35px; margin: 0; border-radius: 0; border: none;}
+#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 25px; height: 20px; margin: 0; border-radius: 0; border: none;}
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
-#ITP_WRAPPER header .header_wrap .name_info {width: auto; float: right;}
-#ITP_WRAPPER header .header_wrap .name_info label {width: auto; font-size: 1.1rem; }
+#ITP_WRAPPER header .header_wrap .name_info {width: 50%; height:55px; margin:0 auto; display:inline-flex;}
+#ITP_WRAPPER header .header_wrap .name_info div {width: auto; font-size: 20px; color:#eee; margin-top:17px;}
+#ITP_WRAPPER header .header_wrap .name_info div.bn {padding-right:5px; font-size:22px; margin-top:14px;}
+
 #ITP_WRAPPER header .header_wrap .logout {float: right; width: 60px;}
-#ITP_WRAPPER header .header_wrap .logout button { margin: 3px 0px; padding: 0px; width: 50px; height: 50px; border-radius: 15px; font-size: 0.8rem;}
+#ITP_WRAPPER header .header_wrap .logout button { margin: 3px 0px; width: 50px; height: 50px; border:none; font-size: 0.8rem;background: transparent;}
+#ITP_WRAPPER header .header_wrap .logout button img {width:22px;}
 
 /* 메뉴바 */
 #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;}
@@ -247,24 +250,25 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   padding-top: 50px;
   font-size: 2rem;
 }
-.content {top: 55px; position: fixed; z-index: 10; width:100%; background: #fff;}
-.content .line {position: relative; display: inline-block; width: 100%; height: 35px; margin-bottom: 0px;}
+.content {z-index: 10; margin-top:5px; width:100%; background: #f4f5f4;}
+.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin-bottom: 0px;}
 .content .line div {font-weight: 700;}
-.content .line label {font-size: 1.2rem; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
+.content .line label {min-width:110px; color:#555; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
 .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 .search_nm {float: right; margin-right: 2%;}
+.content .line .search_nm {float: left; margin-right: 2%;}
 .content .line .search_wrap {float:right; margin-right:10px;}
-.content .line .float_left {float: left;}
+.content .line .float_left {float: left; margin-top:2px;}
+.content .line .float_left button {float: left;	border:none;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #000; text-align: left;}
 .content .line .float_left div {font-size: 1rem; margin-top: 8px;}
-.content .line .float_left_btn {float: left; margin-top: 5px; margin-left: 5px;}
+.content .line .float_left_btn {float: left; margin-top: 0px; margin-left: 5px;}
 .content .line .float_left_btn button {padding:0; width:36px; height:36px; border-radius:5px;}
 .content .line .float_left_btn button img {width:20px; height:20px;}
 .content .line .float_left select {float: left; width: 150px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem;}
 .content .line .line_right {font-size: 2rem; float: right; margin-right: 0%;}
-.content .line .line_right div {float: right; font-size: 1.2rem; margin-top: 12px; margin-right: 30px;}
+.content .line .line_right div {float: right; font-size: 18px;; margin-top: 12px; margin-right: 30px; color:#555;}
 .content .line .line_right input {position: relative; text-align: right; margin-right: 84px;}
 .content .line .line_right input.m9 {margin-right:93px;}
 .content .line .line_right input.left {text-align: left;}
@@ -272,7 +276,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right select.m9 {margin-right:83px;}
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
 .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: 40%; margin: 10px; height: 40px; float: right; margin-right: 3%;}
+.content .line input.date {width: 40%; margin: 10px; height: 35px; float: left;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
 .content .line div.date_to {float: right; margin-right:10px;}
 .content .line div.date_to input.year {width: 120px; height: 30px;}

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

@@ -214,18 +214,11 @@ let mobContentObj = {
 	barcode: {
 		callApp: function() {
 			location.replace('app:scan');
-			// return;
-			// var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
-			// itp_fn_form_clear_validate(null, formId);
-			// if (itp_fn_form_event.isValid(formId)) {
-			// 	location.replace('app:scan');
-			// }
 		}
 	}
 };
 
 function appCallFnBarcode(barcode) {
-	console.log(JSON.stringify(barcode));
 	var infoFn = function(result) {
 		console.log(JSON.stringify(result));
 		if(result) {
@@ -238,7 +231,6 @@ function appCallFnBarcode(barcode) {
 		'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
 		'sBarcode': barcode
 	};
-	console.log(JSON.stringify(param));
 	fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
 }