Browse Source

입금관리 선결제/충전

marseyes 2 years ago
parent
commit
9fd65d3d82

+ 2 - 0
src/main/webapp/app/loanmng/LOANMNG02010.html

@@ -4,6 +4,7 @@
4
 			<div class="itp_det_head fix">
4
 			<div class="itp_det_head fix">
5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>입금관리</strong></h2>
5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>입금관리</strong></h2>
6
 				<div class="pull-right itp_cicon">
6
 				<div class="pull-right itp_cicon">
7
+					<button type="button" id="ITP_BTN_LOANMNG02010_CHARGE" class="btn btn-primary btn-sm SAB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;선결제/충전&nbsp;&nbsp;</button>
7
 					<button type="button" id="ITP_BTN_LOANMNG02010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8
 					<button type="button" id="ITP_BTN_LOANMNG02010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8
 					<button type="button" id="ITP_BTN_LOANMNG02010_AGREE" class="btn btn-success btn-sm AGR" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;승인&nbsp;&nbsp;</button>
9
 					<button type="button" id="ITP_BTN_LOANMNG02010_AGREE" class="btn btn-success btn-sm AGR" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;승인&nbsp;&nbsp;</button>
9
 					<button type="button" id="ITP_BTN_LOANMNG02010_REJECT" class="btn btn-success btn-sm RJT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;반려&nbsp;&nbsp;</button>
10
 					<button type="button" id="ITP_BTN_LOANMNG02010_REJECT" class="btn btn-success btn-sm RJT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;반려&nbsp;&nbsp;</button>
@@ -21,6 +22,7 @@
21
 								<form id="ITP_FORM_LOANMNG02010_SEARCH" class="form-horizontal">
22
 								<form id="ITP_FORM_LOANMNG02010_SEARCH" class="form-horizontal">
22
 									<input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
23
 									<input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
23
 									<input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_ID" name="sstoreId" value="">
24
 									<input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_ID" name="sstoreId" value="">
25
+									<input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN" value="">	<!-- 매장 정산타입 -->
24
 								
26
 								
25
 									<div class="form-group">
27
 									<div class="form-group">
26
 										<div class="col-xs-2 itp_ip itp_noMar">
28
 										<div class="col-xs-2 itp_ip itp_noMar">

+ 25 - 0
src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -209,6 +209,7 @@ let pageObj = {
209
 				var id = $(this).attr('id');
209
 				var id = $(this).attr('id');
210
 				$(this).on('click', function() {
210
 				$(this).on('click', function() {
211
 					switch (id) {
211
 					switch (id) {
212
+						case 'ITP_BTN_LOANMNG02010_CHARGE'			: listObj.button.charge();		break;	// 선결제/충전 버튼 클릭
212
 						case 'ITP_BTN_LOANMNG02010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
213
 						case 'ITP_BTN_LOANMNG02010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
213
 						case 'ITP_BTN_LOANMNG02010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
214
 						case 'ITP_BTN_LOANMNG02010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
214
 						case 'ITP_BTN_LOANMNG02010_CANCELLIST'		: createObj.button.cancel(); 	break;	// 취소/목록 버튼
215
 						case 'ITP_BTN_LOANMNG02010_CANCELLIST'		: createObj.button.cancel(); 	break;	// 취소/목록 버튼
@@ -247,6 +248,7 @@ let pageObj = {
247
 				fn_show_btn_auth('#ITP_BTN_LOANMNG02010_AGREE');			
248
 				fn_show_btn_auth('#ITP_BTN_LOANMNG02010_AGREE');			
248
 				fn_show_btn_auth('#ITP_BTN_LOANMNG02010_REJECT');
249
 				fn_show_btn_auth('#ITP_BTN_LOANMNG02010_REJECT');
249
 			}			
250
 			}			
251
+			fn_show_btn_auth('#ITP_BTN_LOANMNG02010_CHARGE');
250
 			fn_show_btn_auth('#ITP_BTN_LOANMNG02010_SRH');
252
 			fn_show_btn_auth('#ITP_BTN_LOANMNG02010_SRH');
251
 			fn_show_btn_auth('#ITP_BTN_LOANMNG02010_NEWREG');			
253
 			fn_show_btn_auth('#ITP_BTN_LOANMNG02010_NEWREG');			
252
 
254
 
@@ -256,6 +258,7 @@ let pageObj = {
256
 		} else if(mode == 'ADD') { // 등록
258
 		} else if(mode == 'ADD') { // 등록
257
 			ITP_FORM_LOANMNG02010_DETAIL_IS_DUPLICATE = true;
259
 			ITP_FORM_LOANMNG02010_DETAIL_IS_DUPLICATE = true;
258
 
260
 
261
+			$('#ITP_BTN_LOANMNG02010_CHARGE').hide();
259
 			$('#ITP_BTN_LOANMNG02010_SRH').hide();
262
 			$('#ITP_BTN_LOANMNG02010_SRH').hide();
260
 			$('#ITP_BTN_LOANMNG02010_MODIFY').hide();
263
 			$('#ITP_BTN_LOANMNG02010_MODIFY').hide();
261
 			$('#ITP_BTN_LOANMNG02010_NEWREG').hide();
264
 			$('#ITP_BTN_LOANMNG02010_NEWREG').hide();
@@ -283,6 +286,7 @@ let pageObj = {
283
 			$('#ITP_FORM_LOANMNG02010_DETAIL_RCV_ACCT_NO').val('');			
286
 			$('#ITP_FORM_LOANMNG02010_DETAIL_RCV_ACCT_NO').val('');			
284
 
287
 
285
 		} else if(mode == 'VIEW') { // 보기
288
 		} else if(mode == 'VIEW') { // 보기
289
+			$('#ITP_BTN_LOANMNG02010_CHARGE').hide();
286
 			$('#ITP_BTN_LOANMNG02010_SRH').hide();
290
 			$('#ITP_BTN_LOANMNG02010_SRH').hide();
287
 			$('#ITP_BTN_LOANMNG02010_NEWREG').hide();
291
 			$('#ITP_BTN_LOANMNG02010_NEWREG').hide();
288
 			$('#ITP_BTN_LOANMNG02010_SAVE').hide();
292
 			$('#ITP_BTN_LOANMNG02010_SAVE').hide();
@@ -322,6 +326,26 @@ let listObj = {
322
 			itp_fn_form_clear_validate(null, '#ITP_FORM_LOANMNG02010_DETAIL');						
326
 			itp_fn_form_clear_validate(null, '#ITP_FORM_LOANMNG02010_DETAIL');						
323
 			createObj.init();
327
 			createObj.init();
324
 		}, 
328
 		}, 
329
+		charge: function() {
330
+			// 매장선택 체크
331
+			if($('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val() == '') {
332
+				itp_fn_modal_alert_ajax('신규입금 처리를 위한 매장을 선택하세요.');
333
+				return;
334
+			}
335
+			// 결제 팝업 결과
336
+			var popFn = function(rowDataPop) {
337
+				console.log(JSON.stringify(rowDataPop));
338
+				listObj.grid.search();
339
+			};			
340
+			// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
341
+			// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
342
+			var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
343
+				
344
+			var args = {'payTpCd': loanDvsn == 'LD01' ? '10' : '30', 
345
+				'brandId': $('#ITP_FORM_LOANMNG02010_SEARCH_BRAND_ID').val(), 
346
+				'storeId': $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val() }; 
347
+			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
348
+		}, 
325
 		agree: function() {
349
 		agree: function() {
326
 			if(SCREEN_MODE == 'LIST') {
350
 			if(SCREEN_MODE == 'LIST') {
327
 				// 그리드에서 최소1개는 선택해야 함
351
 				// 그리드에서 최소1개는 선택해야 함
@@ -608,6 +632,7 @@ let createObj = {
608
 				// alert(JSON.stringify(result));
632
 				// alert(JSON.stringify(result));
609
 				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val(result[0].storeId);
633
 				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val(result[0].storeId);
610
 				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_NM').val(result[0].storeNm);				
634
 				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_NM').val(result[0].storeNm);				
635
+				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val(result[0].loanDvsn);				
611
 				listObj.button.search();
636
 				listObj.button.search();
612
 			}, null, 'S');
637
 			}, null, 'S');
613
 		}, 
638
 		}, 

+ 6 - 0
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_BRAND_STORE.js

@@ -108,6 +108,12 @@ function itp_fn_BIZPOP_BRAND_STORE(parentPopFn, args, returnType) {
108
 				label: '상태', //
108
 				label: '상태', //
109
 				width: '20', fixed: false, align: 'center',
109
 				width: '20', fixed: false, align: 'center',
110
 				sortable: false, hidden: false
110
 				sortable: false, hidden: false
111
+			}, 
112
+			{
113
+				index: 'LOAN_DVSN', name: 'loanDvsn',
114
+				label: "정산타입", 
115
+				width: '10', fixed: false, align: 'center',
116
+				sortable: false, hidden: true
111
 			}
117
 			}
112
 		],
118
 		],
113
 		loadBeforeSend: function(jqXHR) {
119
 		loadBeforeSend: function(jqXHR) {

+ 8 - 7
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -174,7 +174,7 @@ var popPageObj = {
174
 		const formId = '#ITP_FORM_PO_PAYMENT_POPUP';
174
 		const formId = '#ITP_FORM_PO_PAYMENT_POPUP';
175
 		itp_fn_form_clear_validate(null, formId);
175
 		itp_fn_form_clear_validate(null, formId);
176
 		
176
 		
177
-		var vali_goodsAmt = itp_fn_form_validate(formId, formId + '_GOODS_AMT', ['empty'], undefined);
177
+		var vali_goodsAmt = itp_fn_form_validate(formId, formId + '_GOODS_AMT', ['empty','number'], undefined);
178
 		var vali_ordTel = itp_fn_form_validate(formId, formId + '_ORD_TEL', ['empty'], undefined);
178
 		var vali_ordTel = itp_fn_form_validate(formId, formId + '_ORD_TEL', ['empty'], undefined);
179
 		var vali_ordEmail = itp_fn_form_validate(formId, formId + '_ORD_EMAIL', ['email'], undefined);
179
 		var vali_ordEmail = itp_fn_form_validate(formId, formId + '_ORD_EMAIL', ['email'], undefined);
180
 		
180
 		
@@ -198,12 +198,13 @@ var popPageObj = {
198
 			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
198
 			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
199
 			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
199
 			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
200
 			
200
 			
201
-			if (isMobile() || window.innerWidth < 1201 ) {
202
-				f_mobile_cert();
203
-			} else {
204
-			    f_cert();
205
-				// f_mobile_cert();
206
-			}
201
+			f_cert();
202
+			
203
+			// if (isMobile() || window.innerWidth < 1201 ) {
204
+			// f_mobile_cert();
205
+			// } else {
206
+			// f_cert();
207
+			// }
207
 		}
208
 		}
208
 	} 
209
 	} 
209
 };
210
 };