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

src/main/webapp/app/settmng/SETTMNG03010.html

@@ -82,6 +82,8 @@
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STORE_ID" name="storeId" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_SPPLY_ID" name="spplyId" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL" name="acctBal" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT" name="sttlReqAmt" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">정산 상세정보</h4>
@@ -139,7 +141,7 @@
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">수납여부(수납일자)</label>
+											<label class="col-xs-2 itp_lb">수납완료여부(수납완료일자)</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in fnRcptYnDate"></div>
 											</div>

src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -501,7 +501,18 @@ let modifyObj = {
 					fn_ajax_call(STTL_STATE_STTL_END, JSON.stringify(param), searhFn, 'POST'); 	
 				}
 			};
-			itp_fn_modal_confirm('정산 확정하시겠습니까?', confirmFn, null);
+			var sttlReqAmt =  parseInt($('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT').val());
+			var acctBal =  parseInt($('#ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL').val());
+			
+			if(acctBal > 0) {
+				if(acctBal >= sttlReqAmt) {
+					itp_fn_modal_confirm('계좌잔액에서 지급처리가 진행됩니다.\n정산 확정하시겠습니까?', confirmFn, null);						
+				} else {
+					itp_fn_modal_confirm('일부금액이 계좌잔액에서 지급처리가 진행됩니다.\n정산 확정하시겠습니까?', confirmFn, null);	
+				}					
+			} else {
+				itp_fn_modal_confirm('정산 확정하시겠습니까?', confirmFn, null);
+			}
 		}
 	}, 
 	load: function(param) {
@@ -513,6 +524,8 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG03010_DETAIL_BRAND_ID').val(result.brandId);
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STORE_ID').val(result.storeId);
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
+		$('#ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL').val(result.acctBal); // 계좌잔액
+		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT').val(result.sttlReqAmt); // 정산요청금액
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);