瀏覽代碼

메인 챠트 명칭 변경

isna 2 年之前
父節點
當前提交
df93276c78

+ 4 - 1
src/main/webapp/js/app/main.js

@@ -82,7 +82,7 @@ require(['config'], function() {
82 82
 			// 10:관리자, 20:영업담당자, 30:가맹점, 40:브랜드, 50:매장, 60:공급사
83 83
 			// console.log('>>>> authTpCd = ' + authTpCd);
84 84
 			
85
-			if( authTpCd == '40' || authTpCd == '10' ) { // 브랜드
85
+			if( authTpCd == '40' ) { // 브랜드
86 86
 				$('#ITP_MAIN_HEADER_BRAND').show();
87 87
 			
88 88
 				$('#ITP_MAIN_DRAW_CHART_REQ').show();  
@@ -92,6 +92,7 @@ require(['config'], function() {
92 92
 				google.charts.setOnLoadCallback(drawChartPodr); // 구매발주
93 93
 			
94 94
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
95
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_info').html("요청순위");
95 96
 				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
96 97
 				
97 98
 				if(fn_make_user_info.get('brandId')) {
@@ -115,6 +116,7 @@ require(['config'], function() {
115 116
 				google.charts.setOnLoadCallback(drawChartDeli); // 입고
116 117
 				
117 118
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
119
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_info').html("요청순위");
118 120
 				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
119 121
 				
120 122
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();
@@ -130,6 +132,7 @@ require(['config'], function() {
130 132
 				google.charts.setOnLoadCallback(drawChartRelease); // 출고
131 133
 				
132 134
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
135
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_info').html("수주순위");
133 136
 				google.charts.setOnLoadCallback(drawChartReqUp); // 매출순위
134 137
 				
135 138
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();

+ 3 - 0
src/main/webapp/mobile/js/app/main.js

@@ -166,6 +166,7 @@ var mobMainObj = {
166 166
 				google.charts.setOnLoadCallback(chart.drawChartDeli); // 입고
167 167
 				
168 168
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
169
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_header > label').html("요청순위");
169 170
 				google.charts.setOnLoadCallback(chart.drawChartReqUp); // 매출순위
170 171
 				
171 172
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();
@@ -186,6 +187,7 @@ var mobMainObj = {
186 187
 				google.charts.setOnLoadCallback(chart.drawChartRelease); // 출고
187 188
 				
188 189
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
190
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_header > label').html("수주순위");
189 191
 				google.charts.setOnLoadCallback(chart.drawChartReqUp); // 매출순위
190 192
 				
191 193
 				$('#ITP_MAIN_DRAW_CHART_CORE').show();
@@ -203,6 +205,7 @@ var mobMainObj = {
203 205
 				google.charts.setOnLoadCallback(chart.drawChartPodr); // 구매발주
204 206
 
205 207
 				$('#ITP_MAIN_DRAW_CHART_REQ_UP').show();
208
+				$('#ITP_MAIN_DRAW_CHART_REQ_UP .itp_graph_header > label').html("요청순위");
206 209
 				google.charts.setOnLoadCallback(chart.drawChartReqUp); // 매출순위
207 210
 
208 211
 				if(fn_make_user_info.get('brandId')) {

+ 9 - 9
src/main/webapp/mobile/js/app/mcollmng/ITP_MCOLLMNG01010.js

@@ -162,23 +162,23 @@ let mobContObj = {
162 162
 			var _this = this;
163 163
 			var id = '#ITP_AJAX_MCOLLMNG01010_VIEW_CONTAINER';
164 164
 			$(id).find('.fnBrandNm').text(result.brandNm);
165
-			$(id).find('.fnPchPodrUnqNo').text(result.pchPodrUnqNo);
166
-			$(id).find('.fnPodrDt').text(result.podrDt);
167
-			$(id).find('.fnPchOdrStNm').text(result.pchOdrStNm);
168
-			$(id).find('.fnWhsNm').text(result.whsNm);
169
-			$(id).find('.fnPodrTotalAmt').text(CommonObj.currency.add(result.podrItemQty));
170
-			$(id).find('.fnPodrMgrNm').text(result.podrMgrNm);
165
+			$(id).find('.fnRtnPodrUnqNo').text(result.rtnPodrUnqNo);
166
+			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
167
+			$(id).find('.fnRtnOdrStNm').text(result.rtnOdrStNm);
168
+			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
169
+			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
170
+			$(id).find('.fnRtnMgrNm').text(result.rtnMgrNm);
171 171
 			$.each(result.rtnOdrDtlList, function (i, item) {
172 172
 				$('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_ROWCOPY').html());
173 173
 				var $li = $('#ITP_LIST_MCOLLMNG01010_VIEW_ITEM_AREA .panel-group > .item-row:last');
174 174
 				$li.find('.fnRtnPodrDtlNo').text(item.rtnPodrDtlNo);
175
-				$li.find('.fnItemid').text(item.itemId);
175
+				$li.find('.fnItemId').text(item.itemId);
176 176
 				$li.find('.fnItemNm').text(item.itemNm);
177 177
 				$li.find('.fnUnitQty').text(item.unitQty);
178 178
 				$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
179 179
 				$li.find('.fnUnit').text(item.unit);
180
-				$li.find('.fnRtnReqQty').text(CommonObj.comma.set(item.rtnReqQty));
181
-				$li.find('.fnRtnAmt').text(CommonObj.currency.add(item.rtnAmt));
180
+				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnReqQty));
181
+				$li.find('.fnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));
182 182
 				$li.find('.fnColReqDt').text(result.colReqDt);
183 183
 			});
184 184
 		},