Explorar el Código

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

whakdo963 hace 2 años
padre
commit
8449219952

+ 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();

+ 40 - 47
src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -18,35 +18,16 @@ require(['config'], function() {
18 18
  *******************************************************/
19 19
 
20 20
 /*화면 변수*/
21
-/*
22
-const POMNG01010_GRID_ID = '#ITP_POMNG01010_jqGrid';
23
-const POMNG01010_GRID_LIST = '#ITP_POMNG01010_jqGrid_list';
24
-const POMNG01010_GRID_PAGER = '#ITP_POMNG01010_jqGridPager';
25
-const POMNG01010_GRID_EMPTY = '#ITP_POMNG01010_jqGridEmpty';
26
-
27
-const POMNG01010_VIEW_GRID_ID = '#ITP_POMNG01010_VIEW_jqGrid';
28
-const POMNG01010_VIEW_GRID_LIST = '#ITP_POMNG01010_VIEW_jqGrid_list';
29
-const POMNG01010_VIEW_GRID_PAGER = '#ITP_POMNG01010_VIEW_jqGridPager';
30
-const POMNG01010_VIEW_GRID_EMPTY = '#ITP_POMNG01010_VIEW_jqGridEmpty';
31
-*/
32 21
 const POMNG01010_DETAIL_GRID_ID = '#ITP_POMNG01010_DETAIL_jqGrid';
33 22
 const POMNG01010_DETAIL_GRID_LIST = '#ITP_POMNG01010_DETAIL_jqGrid_list';
34 23
 const POMNG01010_DETAIL_GRID_PAGER = '#ITP_POMNG01010_DETAIL_jqGridPager';
35 24
 const POMNG01010_DETAIL_GRID_EMPTY = '#ITP_POMNG01010_DETAIL_jqGridEmpty';  // ==>dwkim html확인필요
36 25
 
37
-/*
38
-let ITP_FORM_POMNG01010_DETAIL_IS_DUPLICATE = false;
39
-let ITP_FORM_POMNG01010_DETAIL_IS_WRITING = false;
40
-*/
26
+let POMNG01010_DETAIL_GRID_LAST_ROW_ID;
41 27
 
42 28
 /*API URL*/
43 29
 let API_DETAIL_INIT_INFO = '/api/pomng/init-pchReq'
44
-//let API_DETAIL_GRID_LIST = '/api/affl/detail-grid-list';
45
-//let API_DETAIL_INFO = '/api/affl/info-affl';
46
-//let COMPANY_INFO_COMPANY = '/api/affl/info-affl';
47 30
 let API_DETAIL_SAVE = '/api/pomng/save-pchReq';
48
-//let API_CHECK_DUPLICATE = '/api/affl/check-duplicate';
49
-//let API_INTI_USERPW = '/api/user/inti-userpw';
50 31
 
51 32
 /*화면 Grid ColModel   ==>선택박스 항목 추가 부분  */
52 33
 const gridColModel = {
@@ -81,20 +62,23 @@ const gridColModel = {
81 62
 			index: 'UNIT_AMT', name: 'unitAmt',
82 63
 			label: ITP_MSG_LOCALE.label.unitAmt,
83 64
 			width: '10', fixed: false, align: 'center',
84
-			sortable: false, editable: false, edittype: 'text', hidden: false
65
+			sortable: false, editable: false, edittype: 'text', hidden: false, 
66
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
85 67
 		},
86 68
 		{
87 69
 			index: 'PCH_REQ_QTY', name: 'pchReqQty',
88 70
 			label: ITP_MSG_LOCALE.label.pchReqQty, //수량
89 71
 			width: '10', fixed: false, align: 'right',
90
-			sortable: true, editable: true, edittype: 'text',
91
-			editrules: { number:true}
72
+			sortable: false, editable: true, edittype: 'text',
73
+			editrules: { number:true }, 
74
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
92 75
 		},
93 76
 		{
94 77
 			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
95 78
 			label: ITP_MSG_LOCALE.label.pchReqAmt,
96 79
 			width: '10', fixed: false, align: 'right',
97
-			sortable: false, editable: false, edittype: 'text', hidden: false
80
+			sortable: false, editable: false, edittype: 'text', hidden: false, 
81
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
98 82
 		},
99 83
 
100 84
 		{
@@ -184,8 +168,6 @@ let pageObj = {
184 168
 			$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
185 169
 			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
186 170
 			
187
-			
188
-			
189 171
 			//납품장소 필드 readonly
190 172
 			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').attr('readonly', true);
191 173
 			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').attr('readonly', true);
@@ -217,9 +199,15 @@ let pageObj = {
217 199
 					}
218 200
 				});
219 201
 			});
220
-
202
+			
221 203
 			$('body').on('click', function(e) {
222
-				// afflUserObj.grid.resetGrid(e);
204
+				var gridId = POMNG01010_DETAIL_GRID_ID.replace('#', '');
205
+				var rids = $(POMNG01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
206
+				var last_row_id = rids[rids.length - 1];
207
+				
208
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'POMNG01010_DETAIL');	
209
+				
210
+				pageObj.grid.recal();			
223 211
 			});
224 212
 
225 213
 		}
@@ -269,22 +257,18 @@ let pageObj = {
269 257
 				colModel: gridColModel.detail,
270 258
 				data: gridData,
271 259
 				multiselect: true,
272
-				cellEdit: true,
260
+				// cellEdit: true,
261
+				onCellSelect: function(rowId, cellIdx, cellValue) {
262
+					POMNG01010_DETAIL_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, POMNG01010_DETAIL_GRID_LAST_ROW_ID, POMNG01010_DETAIL_GRID_ID, ['pchReqQty']);
263
+		   		},
273 264
 				loadComplete: function(data) {
274 265
 					_this.clearData();
275
-				},
276
-				afterSaveCell: function(rowid,name,val,iRow,iCol) {
277
-					// 구매요청금액 계산 (기존금액과 )
278
-					var unitAmt = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell',rowid,iCol-1);
279
-					jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('setRowData',rowid,{pchReqAmt: parseInt(val)*parseInt(unitAmt)});
280
-					// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
281
-					_this.recal();
282 266
 				}
283 267
 			};
284 268
 			itp_fn_grid_make_local(option);
285 269
 		},
286 270
 		clearData: function() {
287
-			console.log(this.gridId);
271
+			// console.log(this.gridId);
288 272
 			$(POMNG01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
289 273
 			$(POMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
290 274
 			$(POMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
@@ -292,19 +276,28 @@ let pageObj = {
292 276
 			$(POMNG01010_DETAIL_GRID_EMPTY).show();
293 277
 		},
294 278
 		recal: function() {
295
-			//PCH_REQ_AMT
296
-			console.log("==========================================");
279
+			
280
+			var ids = $(POMNG01010_DETAIL_GRID_ID).getDataIDs();
281
+			$.each(ids, function(idx, rowId) {
282
+				
283
+				var viewCd = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'viewCd');
284
+				var unitAmt = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'unitAmt');
285
+				var pchReqQty = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'pchReqQty');
286
+				
287
+				if(viewCd != 'D' && unitAmt != null && unitAmt != '' && pchReqQty != null && pchReqQty != '') {		
288
+					jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('setRowData',rowId,{pchReqAmt: parseInt(unitAmt)*parseInt(pchReqQty)});
289
+				}
290
+			});
291
+			
297 292
 			const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
298
-			console.log("####################################");
299 293
 			var pchReqAmt = 0 ;
300 294
 			$.each(rowData, function(key, value) {
301
-				 console.log(rowData);
295
+				// console.log(JSON.stringify(rowData));
302 296
 				if (value.pchReqAmt != null && value.pchReqAmt != "" && value.viewCd != "D") {
303 297
 					pchReqAmt = pchReqAmt + parseInt(value.pchReqAmt) ;
304
-				}
305
-				
298
+				}				
306 299
 			});
307
-			$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(pchReqAmt);
300
+			$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(itp_fn_number_comma(pchReqAmt));
308 301
 		},
309 302
 		unload: function() {
310 303
 			$.jgrid.gridUnload(this.gridId);
@@ -336,6 +329,8 @@ let createObj = {
336 329
 	},
337 330
 	button: {
338 331
 		save: function(arg) {
332
+			$('body').trigger('click');
333
+			
339 334
 			const formId = '#ITP_FORM_POMNG01010_DETAIL';
340 335
 			itp_fn_form_clear_validate(null, formId);
341 336
 			$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
@@ -414,7 +409,6 @@ let createObj = {
414 409
 		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
415 410
 	},
416 411
 	callback: function(result) {
417
-		console.log(result);
418 412
 
419 413
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_VIEW_CD').val('C');
420 414
 
@@ -432,8 +426,7 @@ let createObj = {
432 426
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
433 427
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
434 428
 		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
435
-		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);
436
-		
429
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);		
437 430
 
438 431
 		pageObj.grid.init();
439 432
 	}

+ 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);

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

@@ -642,6 +642,8 @@ let createObj = {
642 642
 			listObj.grid.search();
643 643
 		},
644 644
 		save: function() {
645
+			$('body').trigger('click');
646
+			
645 647
 			var detailViewCd = $('#ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD').val();
646 648
 			const formId = '#ITP_FORM_STOCKMNG04010_DETAIL';
647 649
 			itp_fn_form_clear_validate(null, formId);