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

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

@@ -10,6 +10,7 @@ let MAIN_CHART_PCH_ODR_CHART = '/api/main/chart/pch-odr-chart';
 let MAIN_CHART_PR_RANK_CHART = '/api/main/chart/pr-rank-chart';
 let MAIN_CHART_STL_CHART = '/api/main/chart/stl-chart';
 let MAIN_CHART_SFT_STCK_CHART = '/api/main/chart/sft-stck-chart';
+let MAIN_CHART_DELI_CHART = '/api/main/chart/deli-chart';
 
 require(['config'], function() {
 	require([
@@ -27,43 +28,92 @@ require(['config'], function() {
 	    	// itp_fn_fire_window_resize();
 
 			// 조회
-	    	itp_fn_MAIN_NOTICE_search();		
+	    	itp_fn_MAIN_NOTICE_search();
 
-		}, 300);
-		
-		$('#ITP_FORM_MAIN_SEARCH_PR_TYPE').on('change', function() {
-			drawChartReq();
-		});
-		
-		$('#ITP_FORM_MAIN_SEARCH_PO_TYPE').on('change', function() {
-			drawChartPodr();
-		});
-		
-		$('#ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE').on('change', function() {
-			drawChartReqUp();
-		});
-		
-		//그래프 
-		google.charts.load('current', {'packages':['corechart']});
-		google.charts.load('current', {'packages':['bar']});
-		
-		var authTpCd = fn_make_user_info.get('authTpCd'); // 10:관리자, 20:영업담당자, 30:가맹점, 40:브랜드, 50:매장, 60:공급사
-		
-		if( authTpCd == '40' ) {  
-			google.charts.setOnLoadCallback(drawChartReq); // 구매요청	
-		}
-		if( authTpCd == '40' ) {
-			google.charts.setOnLoadCallback(drawChartPodr); // 구매발주	
-		}
-		if( authTpCd == '40' ) {
-			google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위 	
-		}
-		if( authTpCd == '40' ) {
-			google.charts.setOnLoadCallback(drawChartcore); // 정산	
-		}
-		if( authTpCd == '40' ) {
-			google.charts.setOnLoadCallback(drawLine); // 안전재고 	
-		}
+			$('#ITP_FORM_MAIN_SEARCH_PR_TYPE').on('change', function() {
+				drawChartReq();
+			});
+			
+			$('#ITP_FORM_MAIN_SEARCH_PO_TYPE').on('change', function() {
+				drawChartPodr();
+			});
+			
+			$('#ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE').on('change', function() {
+				drawChartReqUp();
+			});
+			
+			$('#ITP_FORM_MAIN_SEARCH_DELI_TYPE').on('change', function() {
+				drawChartDeli();
+			});
+			
+			$('#ITP_FORM_MAIN_SEARCH_RELEASE_TYPE').on('change', function() {
+				drawChartRelease();
+			});
+			
+			$('#ITP_FORM_MAIN_SEARCH_ORDERS_TYPE').on('change', function() {
+				drawChartOrders();
+			});
+			
+			//그래프 
+			google.charts.load('current', {'packages':['corechart']});
+			google.charts.load('current', {'packages':['bar']});
+			
+			$('#ITP_MAIN_DRAW_CHART_REQ').hide();
+			$('#ITP_MAIN_DRAW_CHART_PODR').hide();
+			$('#ITP_MAIN_DRAW_CHART_REQ_UP').hide();
+			$('#ITP_MAIN_DRAW_CHART_CORE').hide();
+			$('#ITP_MAIN_DRAW_LINE').hide();
+			$('#ITP_MAIN_DRAW_DELI_CHART').hide(); 		// 입고
+			$('#ITP_MAIN_DRAW_RELEASE_CHART').hide();	// 출고
+			$('#ITP_MAIN_DRAW_ORDERS_CHART').hide();	// 수주내역
+			
+			var authTpCd = fn_make_user_info.get('authTpCd'); // 10:관리자, 20:영업담당자, 30:가맹점, 40:브랜드, 50:매장, 60:공급사
+			// console.log('>>>> authTpCd = ' + authTpCd);
+			
+			if( authTpCd == '40' ) { // 브랜드
+				$('#ITP_MAIN_DRAW_CHART_REQ').show();  
+				google.charts.setOnLoadCallback(drawChartReq); // 구매요청
+				
+				$('#ITP_MAIN_DRAW_CHART_PODR').show();
+				google.charts.setOnLoadCallback(drawChartPodr); // 구매발주
+			
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
+				
+				$('#ITP_MAIN_DRAW_CHART_CORE').show();
+				google.charts.setOnLoadCallback(drawChartcore); // 정산
+			
+				$('#ITP_MAIN_DRAW_LINE').show();	
+				google.charts.setOnLoadCallback(drawLine); // 안전재고
+			} else if( authTpCd == '50' ) { // 매장
+				$('#ITP_MAIN_DRAW_CHART_REQ').show();  
+				google.charts.setOnLoadCallback(drawChartReq); // 구매요청
+				
+				$('#ITP_MAIN_DRAW_DELI_CHART').show();  
+				google.charts.setOnLoadCallback(drawChartDeli); // 입고
+				
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
+				
+				$('#ITP_MAIN_DRAW_CHART_CORE').show();
+				google.charts.setOnLoadCallback(drawChartcore); // 정산
+				
+			} else if( authTpCd == '60' ) { // 공급사
+			
+				$('#ITP_MAIN_DRAW_ORDERS_CHART').show();  
+				google.charts.setOnLoadCallback(drawChartOrders); // 수주내역
+				
+				$('#ITP_MAIN_DRAW_RELEASE_CHART').show();  
+				google.charts.setOnLoadCallback(drawChartRelease); // 출고
+				
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
+				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
+				
+				$('#ITP_MAIN_DRAW_CHART_CORE').show();
+				google.charts.setOnLoadCallback(drawChartcore); // 정산
+			}		
+
+		}, 300);		
 	});
 });
 
@@ -85,6 +135,66 @@ function drawChartReq() {
 	
 }
 
+//수주내역 그래프
+function drawChartOrders() {
+	
+	const key = { brandId:fn_make_user_info.get('brandId'), 
+			      spplyId:fn_make_user_info.get('spplyId'), 
+				  poType: $('#ITP_FORM_MAIN_SEARCH_ORDERS_TYPE').val() };
+	var param = $.param(key);
+	fn_ajax_call(MAIN_CHART_PCH_ODR_CHART, param, function(result) {
+		
+		var data = google.visualization.arrayToDataTable( eval(result.chartData) );
+	  	var options = {
+			legend: { position: 'left' }
+	  	};	
+	  	var chart = new google.charts.Bar(document.getElementById('ITP_ORDERS_GRAPH'));
+	  	chart.draw(data, options);
+		
+	}, 'GET');
+	
+}
+
+//입고 그래프
+function drawChartDeli() {
+	
+	const key = { brandId:fn_make_user_info.get('brandId'), 
+				  storeId:fn_make_user_info.get('storeId'), 
+				  deliType: $('#ITP_FORM_MAIN_SEARCH_DELI_TYPE').val() };
+	var param = $.param(key);
+	fn_ajax_call(MAIN_CHART_DELI_CHART, param, function(result) {
+		
+		var data = google.visualization.arrayToDataTable( eval(result.chartData) );
+	  	var options = {
+			legend: { position: 'left' }
+	  	};	
+	  	var chart = new google.charts.Bar(document.getElementById('ITP_DELI_GRAPH'));
+	  	chart.draw(data, options);
+		
+	}, 'GET');
+	
+}
+
+//출고 그래프
+function drawChartRelease() {
+	
+	const key = { brandId:fn_make_user_info.get('brandId'), 
+				  spplyId:fn_make_user_info.get('spplyId'), 
+				  deliType: $('#ITP_FORM_MAIN_SEARCH_RELEASE_TYPE').val() };
+	var param = $.param(key);
+	fn_ajax_call(MAIN_CHART_DELI_CHART, param, function(result) {
+		
+		var data = google.visualization.arrayToDataTable( eval(result.chartData) );
+	  	var options = {
+			legend: { position: 'left' }
+	  	};	
+	  	var chart = new google.charts.Bar(document.getElementById('ITP_RELEASE_GRAPH'));
+	  	chart.draw(data, options);
+		
+	}, 'GET');
+	
+}
+
 //구매발주 그래프
 function drawChartPodr() {
 	

src/main/webapp/main.html

@@ -69,7 +69,7 @@
 			<!-- 상단 탭 부분 -->
 			<div id="ITP_TAB_BAR" class="itp_tabs">
 				<ul class="nav nav-tabs itp_tab_list" role="tablist">
-					<li class="active"><a href="#ITP_TAB_SUMMARY" role="tab" data-toggle="tab" class="itp_tab_open">메뉴안내</a></li>
+					<li class="active"><a href="#ITP_TAB_SUMMARY" role="tab" data-toggle="tab" class="itp_tab_open">대시보드</a></li>
 				</ul>
 			</div>
 		</header>
@@ -142,7 +142,7 @@
 			<div class="tab-content itp_contents">
 				<section id="ITP_TAB_SUMMARY" class="tab-pane active itp_sec">
 					<div class="itp_cont">
-						<h2 class="hidden">메뉴안내</h2>
+						<h2 class="hidden">대시보드</h2>
 						<article class="itp_detail">
 							<div id="ITP_AJAX_SUMMARY_DETAIL_CONTAINER" class="itp_det_in">
 								<form id="ITP_FORM_MAIN_SEARCH" class="form-horizontal">
@@ -223,7 +223,7 @@
 									</div>
 								</div>
 								<div id="ITP_MAIN_GRAPH_AREA">
-									<div class="itp_graph_box">
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_CHART_REQ">
 										<div class="itp_graph_side">
 											<select id="ITP_FORM_MAIN_SEARCH_PR_TYPE" name="prType">
 												<option value="A">당일</option>
@@ -237,7 +237,53 @@
 										</div>
 										<div id="ITP_PCH_REQ_GRAPH" class="itp_graph_area"></div>
 									</div>
-									<div class="itp_graph_box">
+									
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_DELI_CHART">
+										<div class="itp_graph_side">
+											<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="deliType">
+												<option value="A">당일</option>
+												<option value="B">1주일</option>
+												<option value="C">15일</option>
+												<option value="D">1개월</option>
+											</select>
+											<div class="itp_graph_info_bar">
+												<div class="itp_graph_info">입고</div>
+											</div>
+										</div>
+										<div id="ITP_DELI_GRAPH" class="itp_graph_area"></div>
+									</div>
+									
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_ORDERS_CHART">
+										<div class="itp_graph_side">
+											<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE">
+												<option value="A">당일</option>
+												<option value="B">1주일</option>
+												<option value="C">15일</option>
+												<option value="D">1개월</option>
+											</select>
+											<div class="itp_graph_info_bar">
+												<div class="itp_graph_info">수주내역</div>
+											</div>
+										</div>
+										<div id="ITP_ORDERS_GRAPH" class="itp_graph_area"></div>
+									</div>
+									
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_RELEASE_CHART">
+										<div class="itp_graph_side">
+											<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE">
+												<option value="A">당일</option>
+												<option value="B">1주일</option>
+												<option value="C">15일</option>
+												<option value="D">1개월</option>
+											</select>
+											<div class="itp_graph_info_bar">
+												<div class="itp_graph_info">출고</div>
+											</div>
+										</div>
+										<div id="ITP_RELEASE_GRAPH" class="itp_graph_area"></div>
+									</div>
+									
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_CHART_PODR">
 										<div class="itp_graph_side">
 											<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="poType">
 												<option value="A">당일</option>
@@ -251,7 +297,8 @@
 										</div>
 										<div id="ITP_PCH_PODR_GRAPH" class="itp_graph_area"></div>
 									</div>
-									<div class="itp_graph_box">
+									
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_CHART_REQ_UP">
 										<div class="itp_graph_side">
 											<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="itemCntType">
 												<option value="A">당일</option>
@@ -265,7 +312,7 @@
 										</div>
 										<div id="ITP_PCH_REQ_UP_ITEM_GRAPH" class="itp_graph_area"></div>
 									</div>
-									<div class="itp_graph_box">
+									<div class="itp_graph_box" id="ITP_MAIN_DRAW_CHART_CORE">
 										<div class="itp_graph_side">
 											<div class="itp_graph_info_bar">
 												<div class="itp_graph_info" style="padding-top:8px;">&nbsp;정&nbsp;&nbsp;산</div>
@@ -273,7 +320,7 @@
 										</div>
 										<div id="ITP_STTL_GRAPH" class="itp_graph_area"></div>
 									</div>
-									<div class="itp_graph_box" style="width:100%">
+									<div class="itp_graph_box" style="width:100%" id="ITP_MAIN_DRAW_LINE">
 										<div class="itp_graph_side" style="width:12%;">
 											<div class="itp_graph_info_bar">
 												<div class="itp_graph_info">안전재고</div>