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