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

src/main/webapp/main.html

@@ -437,7 +437,7 @@
 									<div class="itp_graph_panel" id="ITP_MAIN_DRAW_DELI_CHART">
 										<div class="itp_graph_title">
 											<div class="itp_graph_info">입고</div>
-											<select id="MAIN_CHART_DELI_CHART" name="prType">
+											<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
 												<option value="A">당일</option>
 												<option value="B">1주일</option>
 												<option value="C">15일</option>

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

@@ -138,7 +138,7 @@
 
 	<div id="ITP_CONTAINER" class="fix">
 		<div class="itp_mobile_contents"> 
-			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" style="display: none;">
+			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" >
 				<div class="itp_note_header">
 					<h1>> 공지사항</h1>
 				</div>				
@@ -221,7 +221,7 @@
 				<div id="ITP_MAIN_DRAW_DELI_CHART" class="itp_graph_area">
 					<div class="itp_graph_header">
 						<label>입고</label>
-						<select id="MAIN_CHART_DELI_CHART" name="prType">
+						<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
 							<option value="A">당일</option>
 							<option value="B">1주일</option>
 							<option value="C">15일</option>

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

@@ -114,6 +114,9 @@
 		<input type="hidden" id="ITP_FORM_MCOLLMNG01010_VIEW_VIEW_CD" name="viewCd" value="C">
 		  <div class="content">
 			 <div class="content_fix">
+			 	<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="line_right">

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

@@ -114,6 +114,9 @@
 		<input type="hidden" id="ITP_FORM_MCOLLMNG02010_VIEW_VIEW_CD" name="viewCd" value="C">
 		  <div class="content">
 			  <div class="content_fix">
+			  	<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="line_right">

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

@@ -99,8 +99,8 @@
 				</li>
 			</div>
 			<div class="button_bar">
-			  <button id="ITP_BTN_MORDMNG02010_LIST_DLV_VIEW" class="ok col_12 btn-m-orange IVC">납품서생성</button>
-			  <!--<button id="ITP_BTN_MORDMNG02010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
+			  <button id="ITP_BTN_MORDMNG02010_LIST_DLV_VIEW" class="ok btn_col_6 btn-m-orange IVC">납품서생성</button>
+			  <button id="ITP_BTN_MORDMNG02010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
 			</div>
 		  </div>
 	  </form>

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

@@ -123,12 +123,9 @@
 						</div>
 					</li>
 				</div>
-				<!--
 				<div class="button_bar">
 					<button id="ITP_BTN_MORDMNG03010_LIST_DLV_VIEW" class="ok col_12 btn-m-orange IVDETAIL">납품서보기</button>
-					 
 				</div>
-				-->
 			</div>
 		</form>
 	</div>

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

@@ -118,6 +118,8 @@ function itp_fn_login_proc() {
 		// var url = CommonObj.isApp ? '/api/member/sign-in-app' : '/api/member/sign-in';
 		fn_ajax_call(url, JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
 	};
+	// 사용자정보 세션 초기화
+	sessionStorage.removeItem("itp_manage_user_info");
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.
 }
 

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

@@ -144,15 +144,15 @@ var mobMainObj = {
 			});
 			
 			$('#ITP_FORM_MAIN_SEARCH_DELI_TYPE').on('change', function() {
-				this.drawChartDeli();
+				me.drawChartDeli();
 			});
 			
 			$('#ITP_FORM_MAIN_SEARCH_RELEASE_TYPE').on('change', function() {
-				this.drawChartRelease();
+				me.drawChartRelease();
 			});
 			
 			$('#ITP_FORM_MAIN_SEARCH_ORDERS_TYPE').on('change', function() {
-				this.drawChartOrders();
+				me.drawChartOrders();
 			});
 		},
 		store: {

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

@@ -134,9 +134,8 @@ let mobContObj = {
 					$li.find('.fnItemId').text(item.itemId);
 					$li.find('.fnItemNm').text(item.itemNm);
 					$li.find('.fnUnit').text(item.unit);
-					$li.find('.fnUnitQty').text(item.unitQty);
-					$li.find('.fnStckQty').text(item.stckQty);
-					$li.find('.fnPrpStckQty').text(item.prpStckQty);
+					$li.find('.fnStckQty').text(CommonObj.comma.set(item.stckQty));
+					$li.find('.fnPrpStckQty').text(CommonObj.comma.set(item.prpStckQty));
 					$li.find('.fnSftStckRt').text(CommonObj.nullToString(item.sftStckRt));
 					mobContObj.list.rows.push(item);
 				});