Explorar el Código

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

dwkim hace 2 años
padre
commit
b65e4d8941

+ 14 - 4
src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -61,7 +61,7 @@
61 61
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STORE_ID" name="storeId" value="">
62 62
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
63 63
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_RCPT_YN" value="">
64
-				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT" value="">
64
+				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" value="">
65 65
 				    
66 66
 				                <section class="itp_form_sec">
67 67
 				                    <h4 class="itp_form_tit">정산 상세정보</h4>
@@ -76,6 +76,16 @@
76 76
 				                                <div class="col-xs-8 itp_in fnStoreNm"></div>
77 77
 				                            </div>
78 78
 				                        </div>
79
+				                        <div class="form-group">
80
+				                            <label class="col-xs-2 itp_lb">매장 계좌잔액</label>
81
+				                            <div class="col-xs-4 itp_ip">
82
+				                                <div class="col-xs-8 itp_in fnAcctBal"></div>
83
+				                            </div>
84
+				                            <label class="col-xs-2 itp_lb">매장 사용가능한도금액</label>
85
+				                            <div class="col-xs-4 itp_ip">
86
+				                                <div class="col-xs-8 itp_in fnUseAmtTotal"></div>
87
+				                            </div>
88
+				                        </div>
79 89
 				                        <div class="form-group">
80 90
 				                            <label class="col-xs-2 itp_lb">정산요청일자</label>
81 91
 				                            <div class="col-xs-4 itp_ip">
@@ -91,13 +101,13 @@
91 101
 				                            <div class="col-xs-4 itp_ip">
92 102
 				                                <div class="col-xs-8 itp_in fnSttlReqAmt"></div>
93 103
 				                            </div>
94
-				                            <label class="col-xs-2 itp_lb">사용가능한도금액</label>
104
+				                            <label class="col-xs-2 itp_lb">미납금액</label>
95 105
 				                            <div class="col-xs-4 itp_ip">
96
-				                                <div class="col-xs-8 itp_in fnUseAmtTotal"></div>
106
+				                                <div class="col-xs-8 itp_in fnUnpaidAmt"></div>
97 107
 				                            </div>
98 108
 				                        </div>
99 109
 				                        <div class="form-group">
100
-				                            <label class="col-xs-2 itp_lb">정산확일자</label>
110
+				                            <label class="col-xs-2 itp_lb">정산확일자</label>
101 111
 				                            <div class="col-xs-4 itp_ip">
102 112
 				                                <div class="col-xs-5 itp_in fnSttlDt"></div>
103 113
 				                            </div>

+ 17 - 7
src/main/webapp/app/settmng/SETTMNG03010.html

@@ -5,7 +5,7 @@
5 5
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>정산현황</strong></h2>
6 6
 				<div class="pull-right itp_cicon">
7 7
 					<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>
8
-					<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>
8
+					<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>
9 9
 					<button type="button" id="ITP_BTN_SETTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
10 10
 				</div>
11 11
 			</div>
@@ -98,6 +98,16 @@
98 98
 												</div>
99 99
 											</div>
100 100
 										</div>
101
+										<div class="form-group">
102
+											<label class="col-xs-2 itp_lb">매장 정산타입</label>
103
+											<div class="col-xs-4 itp_ip">
104
+												<div class="col-xs-8 itp_in fnLoanDvsnNm"></div>
105
+											</div>
106
+											<label class="col-xs-2 itp_lb">매장 계좌잔액</label>
107
+											<div class="col-xs-4 itp_ip">
108
+												<div class="col-xs-8 itp_in fnAcctBal"></div>
109
+											</div>											
110
+										</div>
101 111
 										<div class="form-group">
102 112
 											<label class="col-xs-2 itp_lb">정산상태</label>
103 113
 											<div class="col-xs-4 itp_ip">
@@ -119,23 +129,23 @@
119 129
 											</div>											
120 130
 										</div>
121 131
 										<div class="form-group">
122
-											<label class="col-xs-2 itp_lb">정산일자</label>
132
+											<label class="col-xs-2 itp_lb">정산확정일자</label>
123 133
 											<div class="col-xs-4 itp_ip">
124 134
 												<div class="col-xs-8 itp_in fnSttlDt"></div>
125 135
 											</div>
126
-											<label class="col-xs-2 itp_lb">정산금액</label>
136
+											<label class="col-xs-2 itp_lb">정산확정금액</label>
127 137
 											<div class="col-xs-4 itp_ip">
128 138
 												<div class="col-xs-10 itp_in fnSttlAmt"></div>
129 139
 											</div>
130 140
 										</div>
131 141
 										<div class="form-group">
132
-											<label class="col-xs-2 itp_lb">수납여부(후불)</label>
142
+											<label class="col-xs-2 itp_lb">수납여부(수납일자)</label>
133 143
 											<div class="col-xs-4 itp_ip">
134
-												<div class="col-xs-8 itp_in fnRcptYn"></div>
144
+												<div class="col-xs-8 itp_in fnRcptYnDate"></div>
135 145
 											</div>
136
-											<label class="col-xs-2 itp_lb">수납일자(후불)</label>
146
+											<label class="col-xs-2 itp_lb">미납금액</label>
137 147
 											<div class="col-xs-4 itp_ip">
138
-												<div class="col-xs-10 itp_in fnRcptDt"></div>
148
+												<div class="col-xs-10 itp_in fnUnpaidAmt"></div>
139 149
 											</div>
140 150
 										</div>
141 151
 										<div class="form-group">

+ 1 - 0
src/main/webapp/easypay/oqpo/mobile_order_res_submit.jsp

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

+ 12 - 3
src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -101,10 +101,17 @@ const gridColModel = {
101 101
 		},
102 102
 		{
103 103
 			index: 'STTL_DT', name: 'sttlDt',
104
-			label: "정산확일", 
104
+			label: "정산확일", 
105 105
 			width: '10', fixed: false, align: 'center',
106 106
 			sortable: false, hidden: false
107 107
 		},	
108
+		{
109
+			index: 'UNPAId_AMT', name: 'unpaidAmt',
110
+			label: '미납금액', 
111
+			width: '10', fixed: false, align: 'center',
112
+			sortable: false, hidden: false, 
113
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
114
+		},		
108 115
 		{
109 116
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
110 117
 			label: '사용가능한도', 
@@ -474,7 +481,7 @@ let viewObj = {
474 481
 				'brandId': $('#ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(), 
475 482
 				'storeId': $('#ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(), 
476 483
 				'sttlMgntUnqNo': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
477
-				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val() };
484
+				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val() }; 
478 485
 			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
479 486
 		}
480 487
 	}, 
@@ -488,7 +495,7 @@ let viewObj = {
488 495
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(result.storeId);
489 496
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
490 497
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_RCPT_YN').val(result.rcptYn);
491
-		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val(result.sttlReqAmt);
498
+		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val(result.unpaidAmt);
492 499
 		
493 500
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnBrandNm').text(result.brandNm);
494 501
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnStoreNm').text(result.storeNm);
@@ -499,6 +506,8 @@ let viewObj = {
499 506
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSysRegNm').text(result.sysRegNm + ' (' + result.sysRegDttm + ')');
500 507
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
501 508
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnUseAmtTotal').text(itp_fn_number_comma(result.useAmtTotal));
509
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
510
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnUnpaidAmt').text(itp_fn_number_comma(result.unpaidAmt));
502 511
 		
503 512
 		if(result.rcptYn == 'Y') { // 수납여부
504 513
 			$('#ITP_BTN_LOANMNG03010_PAYMENT').hide();

+ 7 - 3
src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -378,6 +378,7 @@ let listObj = {
378 378
 
379 379
 						const rowKey = $(ORDMNG03010_GRID_ID).getGridParam('selrow');
380 380
 						if (!rowKey) {
381
+							alert("납품서를 선택해주세요 (대표 납품서번호)") ;
381 382
 							return;
382 383
 						}
383 384
 						
@@ -394,15 +395,18 @@ let listObj = {
394 395
 							selRowData = $(ORDMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
395 396
 						}
396 397
 						console.log(selRowData);
397
-						const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.selRowData};
398
-						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', key, 'S');
398
+						const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.dlvSttmtUnqNo};
399
+						console.log(key);
400
+						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE',null, key, 'S');
401
+						console.log(fn_call_popup);
402
+						// fn_call_popup(type, popnm, container,  popFn, args, returnType)
399 403
 					}
400 404
 			}
401 405
 			
402 406
 	},
403 407
 //	callback: {
404 408
 //		deliPrt: function(rowDataPop) {
405
-//			console.log(1);
409
+//			console.log(rowDataPop);
406 410
 //		}
407 411
 //	},
408 412
 	empty: {

+ 74 - 76
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';	// 상세
14 14
 function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
15 15
 	// 공통코드
16 16
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
17
-	data: [];
18 17
 	let itp_BIZPOP_DLV_STTMT_PRN_param = args;
19 18
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
20 19
 
21 20
 	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
22 21
 	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
23 22
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
24
-	console.log(args);
25 23
 
26
-	let viewObj = {
27
-		init: function (param) {
28
-			this.load(param);
29
-		},
30
-		load: function(param) {
31
-			fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'POST');
32
-		},
33
-		callback: function (result) {
34
-			console.log(result);
35
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
36
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
37
-			
38
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
39
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
40
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
41
-			
42
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);
43
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvNm').text(result.dlvNm);
44
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvOwnerNm').text(result.dlvOwnerNm);
45
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
46
-			
47
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoBsnsRegno').text(result.poBsnsRegno);
48
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
49
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
50
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
51
-			
52
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvQty').text(result.dlvQty);
53
-			
54
-		},	
55
-	};
56
-//	var infoParam = {'brandId':fn_make_user_info.get('brandId'), 'dlvSttmtUnqNo': args.dlvSttmtUnqNo};
57
-	var infoParam = {'brandId':fn_make_user_info.get('brandId'), 'dlvSttmtUnqNo': '2211020000002001'};
58
-	console.log(infoParam);
59
-	viewObj.init(infoParam);
60
-	
61
-//	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
62
-//	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
63
-	
24
+//	var infoParam = args;
25
+//	viewObj.init(infoParam);
64 26
 	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
65
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val(fn_make_user_info.get('dlvSttmtUnqNo'));
66
-	
27
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val(args.dlvSttmtUnqNo);
67 28
 	if(args) {
68 29
 		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
69 30
 		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
70 31
 		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
71 32
 	}
33
+	let pageObj = {
34
+		switchScreen: function(mode) {
35
+			if(mode == 'VIEW') { // 보기
36
+				$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').show();
37
+			}
38
+		},
39
+	}
40
+	let viewObj = {
41
+			init: function (param) {
42
+				this.load(param);
43
+				this.infoParam;
44
+			},
45
+			load: function(param) {
46
+				fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'POST');
47
+			},
48
+			callback: function (result) {
49
+				console.log(result);
50
+				
51
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
52
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
53
+				
54
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
55
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
56
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
57
+				
58
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);
59
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvNm').text(result.dlvNm);
60
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvOwnerNm').text(result.dlvOwnerNm);
61
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
62
+				
63
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoBsnsRegno').text(result.poBsnsRegno);
64
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
65
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
66
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
67
+				
68
+				$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvQty').text(result.dlvQty);
69
+				
70
+			},	
71
+			
72
+	};
72 73
 	
73 74
 	$('#ITP_BIZPOP_DLV_STTMT_PRN').one('shown.bs.modal', function(e) {
74 75
 		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) {
77 78
 		$('#ITP_BIZPOP_DLV_STTMT_PRN').remove();
78 79
 	}).modal('show');
79 80
 
80
-	$('#ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH').on('click', function() {
81
-		itp_BIZPOP_DLV_STTMT_PRN_search = true;
82
-		let param = $(THIS_FORM_ID).serializeObject();
83
-		param.gridSize = 10;
84
-		param.gridPage = $.jgrid.defaults.page;
85
-		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
86
-	});
81
+	
82
+	
87 83
 	
88 84
 	$('#ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT').on('click', function() {		
89
-		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
90
-	    if (!rowKey) {
91
-	    	return;
92
-	    }
93
-
94
-		var list = [];
95
-	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
96
-
97
-		if(selectedIds.length > 1) { // 1개만 선택
98
-			// return;
99
-		} 
100
-		
101
-	    for (var i=selectedIds.length-1; i>=0; i--) {
102
-			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
103
-		}
104
-		parentPopFn(list);
105 85
 		$('#ITP_BIZPOP_DLV_STTMT_PRN').modal('hide'); // 팝업닫기
106 86
 	});
107 87
 
108 88
 	$('#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty').on('click', function() {
109 89
 		itp_fn_BIZPOP_DLV_STTMT_PRN_empty.back();
110
-		itp_BIZPOP_DLV_STTMT_PRN_param.gridSize = 10;
90
+//		itp_BIZPOP_DLV_STTMT_PRN_param.gridSize = 10;
111 91
 		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_DLV_STTMT_PRN_param)}).trigger('reloadGrid');
112 92
 	});
113 93
 
114 94
 	var itp_fn_BIZPOP_DLV_STTMT_PRN_empty = {
115 95
 		push: function() {
116
-			let param = $(THIS_FORM_ID).serializeObject();
96
+			let param = {
97
+							dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val() ,
98
+							brandId: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val()
99
+						};			
117 100
 			itp_BIZPOP_DLV_STTMT_PRN_param = param;
101
+			console.log(param);
118 102
 		},
119 103
 		back: function() {
120
-			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyCd);
121
-			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyNm);
122
-			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyTypeCd);
104
+//			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyCd);
105
+//			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyNm);
106
+//			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyTypeCd);
123 107
 		}
124 108
 	};
125 109
 
126 110
 	itp_fn_BIZPOP_DLV_STTMT_PRN_empty.push();
127
-	let param = $('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').serializeObject();
128
-	param.gridSize = 10;
129
-
111
+	let param = {
112
+			dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val() ,
113
+			brandId: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val()
114
+			};
115
+	
116
+//	let param = $('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').serializeObject();
117
+	console.log(param);
118
+//	param.gridSize = 10;
119
+	$('#ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM').on('click', function() {
120
+		_this.popup('SW');
121
+	});
130 122
 	$(THIS_GIRD_ID).jqGrid({
131 123
 		colModel: [
132 124
 			{
@@ -172,11 +164,17 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
172 164
 		postData: JSON.stringify(param),
173 165
 		url: DOMAIN + ITP_POP_GRID_LIST,
174 166
 		pager: THIS_GIRD_PAGER,
175
-		
167
+		multiselect: false,
168
+		rownumbers: false,
176 169
 		loadComplete: function(data) {
177 170
 			//여기 데이터 
178
-			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);
179
-	    },
171
+			data:[];
172
+			console.log(data);
173
+			itp_fn_grid_load_complete(data.invDtlInfoList,THIS_GIRD_ID,true, undefined, 'BIZPOP_DLV_STTMT_PRN',false ,false, true, data.invDtlInfoList, false);
174
+//			itp_fn_grid_load_complete(data, gridId, paging, rn, menuId, isSrh, emptyFn, isView, totCnt, totPage, emptyMsg, helpMsg, excelDownloadId, excelUploadId)
175
+			
176
+			console.log(data.invDtlInfoList);
177
+		},
180 178
 	    loadError: function(jqXHR, textStatus, errorThrown) {
181 179
 	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
182 180
 	    },

+ 4 - 2
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

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

+ 26 - 9
src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -53,6 +53,12 @@ const gridColModel = {
53 53
 			width: '10', fixed: false, align: 'center',
54 54
 			sortable: false, hidden: false
55 55
 		},
56
+		{
57
+			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
58
+			label: "정산타입", 
59
+			width: '8', fixed: false, align: 'center',
60
+			sortable: false, hidden: false
61
+		},
56 62
 		{
57 63
 			index: 'SPPLY_NM', name: 'spplyNm',
58 64
 			label: "공급사명",
@@ -92,20 +98,20 @@ const gridColModel = {
92 98
 		}, 
93 99
 		{
94 100
 			index: 'STTL_DT', name: 'sttlDt',
95
-			label: "정산일",
101
+			label: "정산확정일",
96 102
 			width: '10', fixed: false, align: 'center',
97 103
 			sortable: false, editable: false, edittype: 'text'
98 104
 		},
99 105
 		{
100 106
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
101
-			label: "정산금액",
107
+			label: "정산확정금액",
102 108
 			width: '10', fixed: false, align: 'center',
103 109
 			sortable: false, editable: false, edittype: 'text', 
104 110
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
105 111
 		},
106 112
 		{
107
-			index: 'ACCT_BAL', name: 'acctBal',
108
-			label: "잔금",
113
+			index: 'UNPAID_AMT', name: 'unpaidAmt',
114
+			label: "미납금액",
109 115
 			width: '10', fixed: false, align: 'center',
110 116
 			sortable: false, editable: false, edittype: 'text', 
111 117
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -290,7 +296,7 @@ let pageObj = {
290 296
 					switch (id) {
291 297
 						case 'ITP_BTN_SETTMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
292 298
 						case 'ITP_BTN_SETTMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
293
-						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산완료 버튼
299
+						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산확정 버튼
294 300
 						case 'ITP_BTN_SETTMNG03010_SEARCH_STORE_POP'	: listObj.button.storePop();	break;	// 매장검색 팝업
295 301
 						case 'ITP_BTN_SETTMNG03010_SEARCH_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
296 302
 					}
@@ -484,7 +490,7 @@ let modifyObj = {
484 490
 			listObj.grid.search();
485 491
 		}, 
486 492
 		endSttl: function() {
487
-			// 정산완료
493
+			// 정산확정
488 494
 			const formId = '#ITP_FORM_SETTMNG03010_DETAIL';
489 495
 			let param = $(formId).serializeObject();
490 496
 			var confirmFn= {
@@ -495,7 +501,7 @@ let modifyObj = {
495 501
 					fn_ajax_call(STTL_STATE_STTL_END, JSON.stringify(param), searhFn, 'POST'); 	
496 502
 				}
497 503
 			};
498
-			itp_fn_modal_confirm('정산 완료하시겠습니까?', confirmFn, null);
504
+			itp_fn_modal_confirm('정산 확정하시겠습니까?', confirmFn, null);
499 505
 		}
500 506
 	}, 
501 507
 	load: function(param) {
@@ -510,6 +516,8 @@ let modifyObj = {
510 516
 		
511 517
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
512 518
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
519
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
520
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
513 521
 		
514 522
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : result.sttlRjctRsn);
515 523
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
@@ -519,8 +527,17 @@ let modifyObj = {
519 527
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlDt').text(result.sttlDt == null ? '' : result.sttlDt);  // 정산요청일자
520 528
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlAmt').text(itp_fn_number_comma(result.sttlAmt));
521 529
 		
522
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYn').text(result.rcptYn == null ? '' : result.rcptYn);
523
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptDt').text(result.rcptDt == null ? '' : result.rcptDt);
530
+		// $('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYn').text(result.rcptYn == null ? '' : result.rcptYn);
531
+		// $('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptDt').text(result.rcptDt == null ? '' : result.rcptDt);
532
+		
533
+		if(result.rcptYn == null) {
534
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('');	
535
+		} else if(result.rcptYn == 'N') {
536
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('N');
537
+		} else if(result.rcptYn == 'Y') {
538
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('Y (' + result.rcptDt + ')');
539
+		}
540
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnUnpaidAmt').text(itp_fn_number_comma(result.unpaidAmt));
524 541
 		
525 542
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
526 543
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegNm').text(result.sysRegNm);