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

src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -61,7 +61,7 @@
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STORE_ID" name="storeId" value="">
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_RCPT_YN" value="">
-				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT" value="">
+				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" value="">
 				    
 				                <section class="itp_form_sec">
 				                    <h4 class="itp_form_tit">정산 상세정보</h4>
@@ -76,6 +76,16 @@
 				                                <div class="col-xs-8 itp_in fnStoreNm"></div>
 				                            </div>
 				                        </div>
+				                        <div class="form-group">
+				                            <label class="col-xs-2 itp_lb">매장 계좌잔액</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnAcctBal"></div>
+				                            </div>
+				                            <label class="col-xs-2 itp_lb">매장 사용가능한도금액</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnUseAmtTotal"></div>
+				                            </div>
+				                        </div>
 				                        <div class="form-group">
 				                            <label class="col-xs-2 itp_lb">정산요청일자</label>
 				                            <div class="col-xs-4 itp_ip">
@@ -91,13 +101,13 @@
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-8 itp_in fnSttlReqAmt"></div>
 				                            </div>
-				                            <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 fnUseAmtTotal"></div>
+				                                <div class="col-xs-8 itp_in fnUnpaidAmt"></div>
 				                            </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-5 itp_in fnSttlDt"></div>
 				                            </div>

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

@@ -5,7 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>정산현황</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_SETTMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
-					<button type="button" id="ITP_BTN_SETTMNG03010_STTL_END" class="btn btn-primary btn-sm REQ" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;정산완료&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_SETTMNG03010_STTL_END" class="btn btn-primary btn-sm REQ" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;정산확정&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_SETTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
 			</div>
@@ -98,6 +98,16 @@
 												</div>
 											</div>
 										</div>
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">매장 정산타입</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnLoanDvsnNm"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">매장 계좌잔액</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnAcctBal"></div>
+											</div>											
+										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">정산상태</label>
 											<div class="col-xs-4 itp_ip">
@@ -119,23 +129,23 @@
 											</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 fnSttlDt"></div>
 											</div>
-											<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-10 itp_in fnSttlAmt"></div>
 											</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 fnRcptYn"></div>
+												<div class="col-xs-8 itp_in fnRcptYnDate"></div>
 											</div>
-											<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-10 itp_in fnRcptDt"></div>
+												<div class="col-xs-10 itp_in fnUnpaidAmt"></div>
 											</div>
 										</div>
 										<div class="form-group">

src/main/webapp/easypay/oqpo/mobile_order_res_submit.jsp

@@ -66,6 +66,7 @@ request.setCharacterEncoding("utf-8");
                           
        if( "<%=request.getParameter("sp_res_cd") %>" == "0000" )
         {
+    	   	// alert('TODO 결제승인처리');
             frm_pay.target = "_self";
             frm_pay.action = "../easypay_request.jsp";
             frm_pay.submit();

src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -101,10 +101,17 @@ const gridColModel = {
 		},
 		{
 			index: 'STTL_DT', name: 'sttlDt',
-			label: "정산확인일", 
+			label: "정산확정일", 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},	
+		{
+			index: 'UNPAId_AMT', name: 'unpaidAmt',
+			label: '미납금액', 
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false, 
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},		
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
 			label: '사용가능한도', 
@@ -474,7 +481,7 @@ let viewObj = {
 				'brandId': $('#ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(), 
 				'storeId': $('#ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(), 
 				'sttlMgntUnqNo': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
-				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val() };
+				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val() }; 
 			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 		}
 	}, 
@@ -488,7 +495,7 @@ let viewObj = {
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(result.storeId);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_RCPT_YN').val(result.rcptYn);
-		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val(result.sttlReqAmt);
+		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val(result.unpaidAmt);
 		
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnStoreNm').text(result.storeNm);
@@ -499,6 +506,8 @@ let viewObj = {
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSysRegNm').text(result.sysRegNm + ' (' + result.sysRegDttm + ')');
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnUseAmtTotal').text(itp_fn_number_comma(result.useAmtTotal));
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnUnpaidAmt').text(itp_fn_number_comma(result.unpaidAmt));
 		
 		if(result.rcptYn == 'Y') { // 수납여부
 			$('#ITP_BTN_LOANMNG03010_PAYMENT').hide();

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -378,6 +378,7 @@ let listObj = {
 
 						const rowKey = $(ORDMNG03010_GRID_ID).getGridParam('selrow');
 						if (!rowKey) {
+							alert("납품서를 선택해주세요 (대표 납품서번호)") ;
 							return;
 						}
 						
@@ -394,15 +395,18 @@ let listObj = {
 							selRowData = $(ORDMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
 						}
 						console.log(selRowData);
-						const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.selRowData};
-						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', key, 'S');
+						const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.dlvSttmtUnqNo};
+						console.log(key);
+						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE',null, key, 'S');
+						console.log(fn_call_popup);
+						// fn_call_popup(type, popnm, container,  popFn, args, returnType)
 					}
 			}
 			
 	},
 //	callback: {
 //		deliPrt: function(rowDataPop) {
-//			console.log(1);
+//			console.log(rowDataPop);
 //		}
 //	},
 	empty: {

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_DLV_STTMT_PRN.js

@@ -14,61 +14,62 @@ let ITP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
 function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
-	data: [];
 	let itp_BIZPOP_DLV_STTMT_PRN_param = args;
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
 
 	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
 	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
-	console.log(args);
 
-	let viewObj = {
-		init: function (param) {
-			this.load(param);
-		},
-		load: function(param) {
-			fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'POST');
-		},
-		callback: function (result) {
-			console.log(result);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
-			
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
-			
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvNm').text(result.dlvNm);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvOwnerNm').text(result.dlvOwnerNm);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
-			
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoBsnsRegno').text(result.poBsnsRegno);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
-			
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvQty').text(result.dlvQty);
-			
-		},	
-	};
-//	var infoParam = {'brandId':fn_make_user_info.get('brandId'), 'dlvSttmtUnqNo': args.dlvSttmtUnqNo};
-	var infoParam = {'brandId':fn_make_user_info.get('brandId'), 'dlvSttmtUnqNo': '2211020000002001'};
-	console.log(infoParam);
-	viewObj.init(infoParam);
-	
-//	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
-//	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
-	
+//	var infoParam = args;
+//	viewObj.init(infoParam);
 	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val(fn_make_user_info.get('dlvSttmtUnqNo'));
-	
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val(args.dlvSttmtUnqNo);
 	if(args) {
 		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
 		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
 		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
 	}
+	let pageObj = {
+		switchScreen: function(mode) {
+			if(mode == 'VIEW') { // 보기
+				$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').show();
+			}
+		},
+	}
+	let viewObj = {
+			init: function (param) {
+				this.load(param);
+				this.infoParam;
+			},
+			load: function(param) {
+				fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'POST');
+			},
+			callback: function (result) {
+				console.log(result);
+				
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
+				
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
+				
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvNm').text(result.dlvNm);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvOwnerNm').text(result.dlvOwnerNm);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+				
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoBsnsRegno').text(result.poBsnsRegno);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
+				
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvQty').text(result.dlvQty);
+				
+			},	
+			
+	};
 	
 	$('#ITP_BIZPOP_DLV_STTMT_PRN').one('shown.bs.modal', function(e) {
 		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list', '');
@@ -77,56 +78,47 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 		$('#ITP_BIZPOP_DLV_STTMT_PRN').remove();
 	}).modal('show');
 
-	$('#ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH').on('click', function() {
-		itp_BIZPOP_DLV_STTMT_PRN_search = true;
-		let param = $(THIS_FORM_ID).serializeObject();
-		param.gridSize = 10;
-		param.gridPage = $.jgrid.defaults.page;
-		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
-	});
+	
+	
 	
 	$('#ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT').on('click', function() {		
-		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
-	    if (!rowKey) {
-	    	return;
-	    }
-
-		var list = [];
-	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
-
-		if(selectedIds.length > 1) { // 1개만 선택
-			// return;
-		} 
-		
-	    for (var i=selectedIds.length-1; i>=0; i--) {
-			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
-		}
-		parentPopFn(list);
 		$('#ITP_BIZPOP_DLV_STTMT_PRN').modal('hide'); // 팝업닫기
 	});
 
 	$('#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty').on('click', function() {
 		itp_fn_BIZPOP_DLV_STTMT_PRN_empty.back();
-		itp_BIZPOP_DLV_STTMT_PRN_param.gridSize = 10;
+//		itp_BIZPOP_DLV_STTMT_PRN_param.gridSize = 10;
 		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_DLV_STTMT_PRN_param)}).trigger('reloadGrid');
 	});
 
 	var itp_fn_BIZPOP_DLV_STTMT_PRN_empty = {
 		push: function() {
-			let param = $(THIS_FORM_ID).serializeObject();
+			let param = {
+							dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val() ,
+							brandId: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val()
+						};			
 			itp_BIZPOP_DLV_STTMT_PRN_param = param;
+			console.log(param);
 		},
 		back: function() {
-			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyCd);
-			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyNm);
-			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyTypeCd);
+//			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyCd);
+//			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyNm);
+//			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyTypeCd);
 		}
 	};
 
 	itp_fn_BIZPOP_DLV_STTMT_PRN_empty.push();
-	let param = $('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').serializeObject();
-	param.gridSize = 10;
-
+	let param = {
+			dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val() ,
+			brandId: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val()
+			};
+	
+//	let param = $('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').serializeObject();
+	console.log(param);
+//	param.gridSize = 10;
+	$('#ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM').on('click', function() {
+		_this.popup('SW');
+	});
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{
@@ -172,11 +164,17 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 		postData: JSON.stringify(param),
 		url: DOMAIN + ITP_POP_GRID_LIST,
 		pager: THIS_GIRD_PAGER,
-		
+		multiselect: false,
+		rownumbers: false,
 		loadComplete: function(data) {
 			//여기 데이터 
-			itp_fn_grid_load_complete(colModel,THIS_GIRD_ID.jqGrid,data, THIS_GIRD_ID, true, undefined, 'BIZPOP_DLV_STTMT_PRN', itp_BIZPOP_DLV_STTMT_PRN_search, itp_fn_BIZPOP_DLV_STTMT_PRN_empty, true, data.invDtlInfoList, false);
-	    },
+			data:[];
+			console.log(data);
+			itp_fn_grid_load_complete(data.invDtlInfoList,THIS_GIRD_ID,true, undefined, 'BIZPOP_DLV_STTMT_PRN',false ,false, true, data.invDtlInfoList, false);
+//			itp_fn_grid_load_complete(data, gridId, paging, rn, menuId, isSrh, emptyFn, isView, totCnt, totPage, emptyMsg, helpMsg, excelDownloadId, excelUploadId)
+			
+			console.log(data.invDtlInfoList);
+		},
 	    loadError: function(jqXHR, textStatus, errorThrown) {
 	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
 	    },

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -191,6 +191,8 @@ var popPageObj = {
 			frm_pay.EP_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액			
 			frm_pay.EP_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
 			frm_pay.EP_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
+			
+			frm_pay.sp_pay_type.value       = $('#ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD').val();  	// 결제방법
 			frm_pay.sp_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액			
 			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
 			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
@@ -198,8 +200,8 @@ var popPageObj = {
 			if (isMobile() || window.innerWidth < 1201 ) {
 				f_mobile_cert();
 			} else {
-			    // f_cert();
-				f_mobile_cert();
+			    f_cert();
+				// f_mobile_cert();
 			}
 		}
 	} 

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

@@ -53,6 +53,12 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
+		{
+			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
+			label: "정산타입", 
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
 		{
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: "공급사명",
@@ -92,20 +98,20 @@ const gridColModel = {
 		}, 
 		{
 			index: 'STTL_DT', name: 'sttlDt',
-			label: "정산일",
+			label: "정산확정일",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
-			label: "정산금액",
+			label: "정산확정금액",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
-			index: 'ACCT_BAL', name: 'acctBal',
-			label: "잔금",
+			index: 'UNPAID_AMT', name: 'unpaidAmt',
+			label: "미납금액",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -290,7 +296,7 @@ let pageObj = {
 					switch (id) {
 						case 'ITP_BTN_SETTMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_SETTMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
-						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산완료 버튼
+						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산확정 버튼
 						case 'ITP_BTN_SETTMNG03010_SEARCH_STORE_POP'	: listObj.button.storePop();	break;	// 매장검색 팝업
 						case 'ITP_BTN_SETTMNG03010_SEARCH_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
@@ -484,7 +490,7 @@ let modifyObj = {
 			listObj.grid.search();
 		}, 
 		endSttl: function() {
-			// 정산완료
+			// 정산확정
 			const formId = '#ITP_FORM_SETTMNG03010_DETAIL';
 			let param = $(formId).serializeObject();
 			var confirmFn= {
@@ -495,7 +501,7 @@ let modifyObj = {
 					fn_ajax_call(STTL_STATE_STTL_END, JSON.stringify(param), searhFn, 'POST'); 	
 				}
 			};
-			itp_fn_modal_confirm('정산 완료하시겠습니까?', confirmFn, null);
+			itp_fn_modal_confirm('정산 확정하시겠습니까?', confirmFn, null);
 		}
 	}, 
 	load: function(param) {
@@ -510,6 +516,8 @@ let modifyObj = {
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : result.sttlRjctRsn);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
@@ -519,8 +527,17 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlDt').text(result.sttlDt == null ? '' : result.sttlDt);  // 정산요청일자
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlAmt').text(itp_fn_number_comma(result.sttlAmt));
 		
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYn').text(result.rcptYn == null ? '' : result.rcptYn);
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptDt').text(result.rcptDt == null ? '' : result.rcptDt);
+		// $('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYn').text(result.rcptYn == null ? '' : result.rcptYn);
+		// $('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptDt').text(result.rcptDt == null ? '' : result.rcptDt);
+		
+		if(result.rcptYn == null) {
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('');	
+		} else if(result.rcptYn == 'N') {
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('N');
+		} else if(result.rcptYn == 'Y') {
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('Y (' + result.rcptDt + ')');
+		}
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnUnpaidAmt').text(itp_fn_number_comma(result.unpaidAmt));
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegNm').text(result.sysRegNm);