Browse Source

메인챠트 수정 및 입금확정처리 수정

isna 2 years ago
parent
commit
7f0894acdf

+ 2 - 0
src/main/webapp/js/app/main.js

@@ -319,6 +319,8 @@ function drawLine() {
319
 		var options = {
319
 		var options = {
320
 		    title: '',
320
 		    title: '',
321
 		    width: 900,
321
 		    width: 900,
322
+			crosshair: { trigger: 'both', color:'#ddd' },
323
+			pointSize: 4,
322
 		    legend: { position: 'top' }
324
 		    legend: { position: 'top' }
323
 		};
325
 		};
324
 		
326
 		

+ 1 - 1
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DSPT_INFO_REG.js

@@ -47,7 +47,7 @@ var popPageObj = {
47
 			const formId = '#ITP_FORM_DSPT_INFO_REG_POPUP';
47
 			const formId = '#ITP_FORM_DSPT_INFO_REG_POPUP';
48
 			itp_fn_form_clear_validate(null, formId);
48
 			itp_fn_form_clear_validate(null, formId);
49
 			
49
 			
50
-			var vali_dpstAmt = itp_fn_form_validate(formId, formId + '_DPST_AMT', ['empty','number'], undefined); // 입금금액
50
+			var vali_dpstAmt = itp_fn_form_validate(formId, formId + '_DPST_AMT', ['empty','num'], undefined); // 입금금액
51
 			var vali_dpstDt = itp_fn_form_validate(formId, formId + '_DPST_DT', ['empty'], undefined); // 입금일자
51
 			var vali_dpstDt = itp_fn_form_validate(formId, formId + '_DPST_DT', ['empty'], undefined); // 입금일자
52
 			var vali_dpstNm = itp_fn_form_validate(formId, formId + '_DPST_NM', ['empty'], undefined); // 입금자명
52
 			var vali_dpstNm = itp_fn_form_validate(formId, formId + '_DPST_NM', ['empty'], undefined); // 입금자명
53
 			var vali_dpstBnkCd = itp_fn_form_validate(formId, formId + '_DPST_BNK_CD', ['empty'], undefined); // 입금은행
53
 			var vali_dpstBnkCd = itp_fn_form_validate(formId, formId + '_DPST_BNK_CD', ['empty'], undefined); // 입금은행

+ 8 - 4
src/main/webapp/mobile/js/app/main.js

@@ -297,11 +297,15 @@ var mobMainObj = {
297
 			const key = { brandId:fn_make_user_info.get('brandId'), storeId:fn_make_user_info.get('storeId') };
297
 			const key = { brandId:fn_make_user_info.get('brandId'), storeId:fn_make_user_info.get('storeId') };
298
 			var param = $.param(key);
298
 			var param = $.param(key);
299
 			fn_ajax_call(MAIN_CHART_SFT_STCK_CHART, param, function(result) {
299
 			fn_ajax_call(MAIN_CHART_SFT_STCK_CHART, param, function(result) {
300
-
301
-				var data = google.visualization.arrayToDataTable( eval(result.chartData) );
302
-
300
+				var list=[], idx=0, res=eval(result.chartData);
301
+				for(var c of res) {
302
+					if(idx>5) break;
303
+					list.push(res[idx++]);
304
+				}
305
+				var data = google.visualization.arrayToDataTable( list );
303
 				var options = {
306
 				var options = {
304
-					title: '',
307
+					title: '', 
308
+					pointSize: 4,		
305
 					width: chartWidth + 100,
309
 					width: chartWidth + 100,
306
 					legend: { position: 'top' }
310
 					legend: { position: 'top' }
307
 				};
311
 				};