미납금관리 개발중

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

@@ -60,6 +60,7 @@
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_BRAND_ID" name="brandId" value="">
 				                <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="">
 				    
 				                <section class="itp_form_sec">
 				                    <h4 class="itp_form_tit">정산 상세정보</h4>
@@ -89,17 +90,17 @@
 				                            <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 fnAcctBal"></div>
+				                                <div class="col-xs-8 itp_in fnUseAmtTotal"></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 fnSysRegDttm"></div>
+				                                <div class="col-xs-5 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 fnSysRegNm"></div>
 				                        </div>
 				                    </div>

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

@@ -118,8 +118,6 @@
 												<div class="col-xs-10 itp_in fnSttlReqAmt"></div>
 											</div>											
 										</div>
-										
-										
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">정산일자</label>
 											<div class="col-xs-4 itp_ip">
@@ -130,6 +128,16 @@
 												<div class="col-xs-10 itp_in fnSttlAmt"></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 fnRcptYn"></div>
+											</div>
+											<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>
+										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">등록일</label>
 											<div class="col-xs-4 itp_ip">

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

@@ -44,12 +44,6 @@ let LOGIN_AUTH_TYPE_CD;
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
-		{
-			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
-			label: "정산관리고유번호", 
-			width: '0', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
 		{
 			index: 'BRAND_ID', name: 'brandId',
 			label: "브랜드ID", 
@@ -80,6 +74,12 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},		
+		{
+			index: 'STTL_MGNT_UNQ_NO', name: 'sttlMgntUnqNo',
+			label: "정산번호", 
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},		
 		{
 			index: 'STTL_ST_NM', name: 'sttlStNm',
 			label: "상태", 
@@ -101,20 +101,13 @@ const gridColModel = {
 		},
 		{
 			index: 'STTL_DT', name: 'sttlDt',
-			label: "정산일", 
+			label: "정산확인일", 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},	
 		{
-			index: 'STTL_AMT', name: 'sttlAmt',
-			label: '정산금액', 
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false, 
-			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
-		},
-		{
-			index: 'ACCT_BAL', name: 'acctBal',
-			label: '잔액', 
+			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
+			label: '사용가능한도', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -426,7 +419,7 @@ let listObj = {
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					var cm = $(this).jqGrid('getGridParam', 'colModel');
 					var colNm = cm[cellIdx].name;
-					if (colNm == 'sttlReqDt') {
+					if (colNm == 'sttlMgntUnqNo') {
 						const sttlMgntUnqNoVal = $(this).jqGrid('getCell', rowId, 'sttlMgntUnqNo');
 						
 						const key = {sttlMgntUnqNo: sttlMgntUnqNoVal, viewCd: 'R'};
@@ -439,7 +432,7 @@ let listObj = {
 					itp_fn_grid_load_complete(data, LOANMNG03010_GRID_ID, true, 'number', 'LOANMNG03010', listObj.itp_LOANMNG03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(LOANMNG03010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {
-						$(LOANMNG03010_GRID_ID).jqGrid('setCell', rowId, 'sttlReqDt', '', ITP_GRID_COL_STYLE.link);
+						$(LOANMNG03010_GRID_ID).jqGrid('setCell', rowId, 'sttlMgntUnqNo', '', ITP_GRID_COL_STYLE.link);
 					});
 				},
 				onPaging: function(action) {
@@ -487,15 +480,23 @@ let viewObj = {
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(result.brandId);
 		$('#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 .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnStoreNm').text(result.storeNm);
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSttlReqDt').text(result.sttlReqDt);
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnSttlDt').text(result.sttlDt == null ? '' : result.sttlDt);
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSttlStNm').text(result.sttlStNm);
-		$('#ITP_FORM_LOANMNG03010_VIEW .fnSysRegDttm').text(result.sysRegDttm);
-		$('#ITP_FORM_LOANMNG03010_VIEW .fnSysRegNm').text(result.sysRegNm);
+		// $('#ITP_FORM_LOANMNG03010_VIEW .fnSysRegDttm').text(result.sysRegDttm);
+		$('#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 .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnUseAmtTotal').text(itp_fn_number_comma(result.useAmtTotal));
+		
+		if(result.rcptYn == 'Y') { // 수납여부
+			$('#ITP_BTN_LOANMNG03010_PAYMENT').hide();
+		} else {
+			$('#ITP_BTN_LOANMNG03010_PAYMENT').show();
+		}
 
 		// 리스트 조회
 		viewObj.grid.init();

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

@@ -519,6 +519,9 @@ 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 .fnSysRegDttm').text(result.sysRegDttm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegNm').text(result.sysRegNm);