Browse Source

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

yhl88 2 years ago
parent
commit
9c09cb64b8
2 changed files with 31 additions and 6 deletions
  1. 5 5
      src/main/webapp/mobile/app/main.html
  2. 26 1
      src/main/webapp/mobile/js/app/main.js

+ 5 - 5
src/main/webapp/mobile/app/main.html

@@ -218,7 +218,7 @@
218
 				<div id="ITP_MAIN_DRAW_DELI_CHART" class="itp_graph_area">
218
 				<div id="ITP_MAIN_DRAW_DELI_CHART" class="itp_graph_area">
219
 					<div class="itp_graph_header">
219
 					<div class="itp_graph_header">
220
 						<label>입고</label>
220
 						<label>입고</label>
221
-						<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
221
+						<select id="MAIN_CHART_DELI_CHART" name="prType">
222
 							<option value="A">당일</option>
222
 							<option value="A">당일</option>
223
 							<option value="B">1주일</option>
223
 							<option value="B">1주일</option>
224
 							<option value="C">15일</option>
224
 							<option value="C">15일</option>
@@ -230,7 +230,7 @@
230
 				<div id="ITP_MAIN_DRAW_ORDERS_CHART" class="itp_graph_area">
230
 				<div id="ITP_MAIN_DRAW_ORDERS_CHART" class="itp_graph_area">
231
 					<div class="itp_graph_header">
231
 					<div class="itp_graph_header">
232
 						<label>수주내역</label>
232
 						<label>수주내역</label>
233
-						<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
233
+						<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
234
 							<option value="A">당일</option>
234
 							<option value="A">당일</option>
235
 							<option value="B">1주일</option>
235
 							<option value="B">1주일</option>
236
 							<option value="C">15일</option>
236
 							<option value="C">15일</option>
@@ -242,7 +242,7 @@
242
 				<div id="ITP_MAIN_DRAW_RELEASE_CHART" class="itp_graph_area">
242
 				<div id="ITP_MAIN_DRAW_RELEASE_CHART" class="itp_graph_area">
243
 					<div class="itp_graph_header">
243
 					<div class="itp_graph_header">
244
 						<label>출고</label>
244
 						<label>출고</label>
245
-						<select id="ITP_FORM_MAIN_SEARCH_DELI_TYPE" name="prType">
245
+						<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
246
 							<option value="A">당일</option>
246
 							<option value="A">당일</option>
247
 							<option value="B">1주일</option>
247
 							<option value="B">1주일</option>
248
 							<option value="C">15일</option>
248
 							<option value="C">15일</option>
@@ -254,7 +254,7 @@
254
 				<div id="ITP_MAIN_DRAW_CHART_PODR" class="itp_graph_area">
254
 				<div id="ITP_MAIN_DRAW_CHART_PODR" class="itp_graph_area">
255
 					<div class="itp_graph_header">
255
 					<div class="itp_graph_header">
256
 						<label>구매발주</label>
256
 						<label>구매발주</label>
257
-						<select id="ITP_FORM_MAIN_SEARCH_RELEASE_TYPE" name="prType">
257
+						<select id="ITP_FORM_MAIN_SEARCH_PO_TYPE" name="prType">
258
 							<option value="A">당일</option>
258
 							<option value="A">당일</option>
259
 							<option value="B">1주일</option>
259
 							<option value="B">1주일</option>
260
 							<option value="C">15일</option>
260
 							<option value="C">15일</option>
@@ -266,7 +266,7 @@
266
 				<div id="ITP_MAIN_DRAW_CHART_REQ_UP" class="itp_graph_area">
266
 				<div id="ITP_MAIN_DRAW_CHART_REQ_UP" class="itp_graph_area">
267
 					<div class="itp_graph_header">
267
 					<div class="itp_graph_header">
268
 						<label>매출순위</label>
268
 						<label>매출순위</label>
269
-						<select id="ITP_FORM_MAIN_SEARCH_ORDERS_TYPE" name="prType">
269
+						<select id="ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE" name="prType">
270
 							<option value="A">당일</option>
270
 							<option value="A">당일</option>
271
 							<option value="B">1주일</option>
271
 							<option value="B">1주일</option>
272
 							<option value="C">15일</option>
272
 							<option value="C">15일</option>

+ 26 - 1
src/main/webapp/mobile/js/app/main.js

@@ -33,10 +33,11 @@ var mobMainObj = {
33
 		this.notice.init();
33
 		this.notice.init();
34
 		this.count.init();
34
 		this.count.init();
35
 		this.chart.init();
35
 		this.chart.init();
36
+		
36
 	},
37
 	},
37
 	ui: function() { 
38
 	ui: function() { 
38
 		var authTpCd = fn_make_user_info.get('authTpCd');
39
 		var authTpCd = fn_make_user_info.get('authTpCd');
39
-		if(authTpCd === '40' || authTpCd === '10') {
40
+		if(authTpCd === '40' ) {
40
 			$('#ITP_MAIN_HEADER_BRAND').show();
41
 			$('#ITP_MAIN_HEADER_BRAND').show();
41
 		} else if(authTpCd === '50') {
42
 		} else if(authTpCd === '50') {
42
 			$('#ITP_MAIN_HEADER_STORE').show();
43
 			$('#ITP_MAIN_HEADER_STORE').show();
@@ -147,6 +148,30 @@ var mobMainObj = {
147
 				} else {
148
 				} else {
148
 					chartCnt=3;
149
 					chartCnt=3;
149
 				}
150
 				}
151
+				const me=this;
152
+				$('#ITP_FORM_MAIN_SEARCH_PR_TYPE').on('change', function() {
153
+					me.drawChartReq();
154
+				});
155
+				
156
+				$('#ITP_FORM_MAIN_SEARCH_PO_TYPE').on('change', function() {
157
+					me.drawChartPodr();
158
+				});
159
+				
160
+				$('#ITP_FORM_MAIN_SEARCH_ITEM_CNT_TYPE').on('change', function() {
161
+					me.drawChartReqUp();
162
+				});
163
+				
164
+				$('#ITP_FORM_MAIN_SEARCH_DELI_TYPE').on('change', function() {
165
+					// this.drawChartDeli();
166
+				});
167
+				
168
+				$('#ITP_FORM_MAIN_SEARCH_RELEASE_TYPE').on('change', function() {
169
+					// this.drawChartRelease();
170
+				});
171
+				
172
+				$('#ITP_FORM_MAIN_SEARCH_ORDERS_TYPE').on('change', function() {
173
+					// this.drawChartOrders();
174
+				});
150
 
175
 
151
 				$('#ITP_MAIN_DRAW_LINE').show();
176
 				$('#ITP_MAIN_DRAW_LINE').show();
152
 				$('#ITP_MAIN_DRAW_LINE .itp_main_draw_line').show();
177
 				$('#ITP_MAIN_DRAW_LINE .itp_main_draw_line').show();