정산검수현황

src/main/webapp/app/popup/biz/BIZPOP_STTL_REJECT_REASON.html

@@ -0,0 +1,32 @@
+<div id="ITP_BIZPOP_STTL_REJECT_REASON" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h5 class="modal-title">정산반려</h5>
+			</div>
+			<div class="modal-body">
+				<div class="itp_form itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_STTL_REJECT_REASON_POPUP">
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">반려사유</label>
+									<div class="col-xs-10 itp_ip">
+									<input type="text" id="ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN" class="form-control itp_input" name="sttlRjctRsn" />
+									</div>									
+								</div>								
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" id="ITP_BTN_STTL_REJECT_REASON_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				<button type="button" id="ITP_BTN_STTL_REJECT_REASON_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
+			</div>
+		</div>
+	</div>
+
+	<div id="ITP_POPUP_JS"></div>
+</div>

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

@@ -83,32 +83,35 @@
 											</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-5 itp_in">
-													<div class="input-group date">
-													<input type="text" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_DT" class="form-control itp_input" name="sttlDt" readonly="readonly">
-													<span class="input-group-addon itp_input itp_date_to">
-														<i class="glyphicon glyphicon-calendar"></i>
-													</span>
-													</div>
-												</div>
-											</div>
 											<label class="col-xs-2 itp_lb">정산상태</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in fnSttlStNm"></div>
 											</div>
+											<label class="col-xs-2 itp_lb">반려사유</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnSttlRjctRsn"></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-10 itp_in fnSttlAmt"></div>
+												<div class="col-xs-8 itp_in fnSttlReqDt"></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 fnSttlReqAmt"></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 class="col-xs-8 itp_in fnSttlDt"></div>
 											</div>
-										</div>
+											<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>
 											<div class="col-xs-4 itp_ip">
@@ -120,20 +123,12 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_in">
-										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">반려사유</label>
-											<div class="col-xs-10 itp_ip">
-												<div class="col-xs-10 itp_in"></div>
-											</div>
-										</div>
-									</div>
 								</section>							
 							</form>
 						</div>
 					</div>
 					<div class="itp_table fix">
-						<h4 class="itp_form_tit" style="background:#eee; padding:18px 18px; margin:0; border-left:none;"></h4>
+						<h4 class="itp_form_tit" style="background:#eee; padding:18px 18px; margin:0; border-left:none;">정산 대상 내역</h4>
 						<div id="ITP_SETTMNG02010_DETAIL_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_SETTMNG02010_DETAIL_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_SETTMNG02010_DETAIL_jqGrid"></table>

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

@@ -0,0 +1,53 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+var popPageObj = {
+	init: function () {
+		this.button();
+		this.change();
+	},
+	parentPopFn: null,
+	args: null,
+	returnType: null,
+	button: function() {
+		$('#ITP_BTN_STTL_REJECT_REASON_CLOSE_POP').on('click', function () {
+			$('#ITP_BIZPOP_STTL_REJECT_REASON').modal('hide'); // 팝업닫기
+		});
+		$('#ITP_BTN_STTL_REJECT_REASON_CONFIRM_POP').on('click', function () {
+			popPageObj.fnRjctRsnConfirm();
+		});
+	}, 
+	change: function() {
+	}, 	
+	fnRjctRsnConfirm: function() {
+		const formId = '#ITP_FORM_STTL_REJECT_REASON_POPUP';
+		itp_fn_form_clear_validate(null, formId);
+		
+		var vali_sttlRjctRsn = itp_fn_form_validate(formId, formId + '_STTL_RJCT_RSN', ['empty'], undefined);
+		
+		if (vali_sttlRjctRsn) {		
+			var sttlRjctRsn = $('#ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN').val();	
+			
+			popPageObj.parentPopFn(sttlRjctRsn);
+			$('#ITP_BIZPOP_STTL_REJECT_REASON').modal('hide'); // 팝업닫기
+		}
+	} 
+};
+
+function itp_fn_BIZPOP_STTL_REJECT_REASON(parentPopFn, args, returnType) {
+	$('#ITP_BIZPOP_STTL_REJECT_REASON').one('shown.bs.modal', function(e) {
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_STTL_REJECT_REASON').remove();
+	}).modal('show');
+
+	popPageObj.parentPopFn = parentPopFn;
+	popPageObj.args = args;
+	popPageObj.returnType = returnType;
+	popPageObj.init();
+}

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

@@ -25,9 +25,9 @@ let SETTMNG02010_DETAIL_GRID_LAST_ROW_ID;
 
 /*API URL*/
 let STTL_STATE_DETAIL_GRID_LIST = '/api/sttl/state/detail-grid-list';
+let STTL_INSPECT_STATE_STTL_CONFIRM = '/api/sttl/inspect/state/sttl-confirm';
+let STTL_INSPECT_STATE_STTL_REJECT = '/api/sttl/inspect/state/sttl-reject';
 
-let STTL_REQ_REQUEST_STTL = '/api/sttl/req/request-sttl';
-let STTL_REQ_REQUEST_STTL_PROC = '/api/sttl/req/request-sttl-proc';
 let STTL_REQ_INFO_STTL = '/api/sttl/req/info-sttl';
 let STTL_REQ_STL_GRID_LIST = '/api/sttl/req/stl-grid-list';
 
@@ -291,8 +291,8 @@ let pageObj = {
 					switch (id) {
 						case 'ITP_BTN_SETTMNG02010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_SETTMNG02010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
-						// case 'ITP_BTN_SETTMNG02010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
-						// case 'ITP_BTN_SETTMNG02010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
+						case 'ITP_BTN_SETTMNG02010_CONFIRM'			: modifyObj.button.confirmSttl();	break;	// 정산확정 버튼
+						case 'ITP_BTN_SETTMNG02010_REJECT'			: modifyObj.button.rejectSttl();	break;	// 정산반려 버튼
 					}
 				});
 			});
@@ -335,6 +335,8 @@ let pageObj = {
 			$('#ITP_BTN_SETTMNG02010_CANCELLIST').hide();
 			$('#ITP_BTN_SETTMNG02010_DELETE').hide();
 			$('#ITP_BTN_SETTMNG02010_REQUEST').hide();
+			$('#ITP_BTN_SETTMNG02010_CONFIRM').hide();
+			$('#ITP_BTN_SETTMNG02010_REJECT').hide();
 			
 			if(LOGIN_AUTH_TYPE_CD == '60') { // 공급사
 				$('#ITP_BTN_SETTMNG02010_SEARCH_SPPLY_POP').hide();
@@ -357,6 +359,8 @@ let pageObj = {
 			
 			fn_show_btn_auth('#ITP_BTN_SETTMNG02010_REQUEST');
 			fn_show_btn_auth('#ITP_BTN_SETTMNG02010_CANCELLIST');
+			fn_show_btn_auth('#ITP_BTN_SETTMNG02010_CONFIRM');
+			fn_show_btn_auth('#ITP_BTN_SETTMNG02010_REJECT');
 
 			$('#ITP_AJAX_SETTMNG02010_LIST_CONTAINER').hide();
 			$('#ITP_AJAX_SETTMNG02010_DETAIL_CONTAINER').show();
@@ -469,6 +473,36 @@ let modifyObj = {
 	button: {
 		cancel: function() {
 			listObj.grid.search();
+		}, 
+		confirmSttl: function() {
+			// 정산확정
+			const formId = '#ITP_FORM_SETTMNG02010_DETAIL';
+			let param = $(formId).serializeObject();
+			
+			// console.log(JSON.stringify(param));
+			var confirmFn= {
+				callBack: function() {
+					//
+					var searhFn = function() {
+						listObj.grid.search();
+					};
+					fn_ajax_call(STTL_INSPECT_STATE_STTL_CONFIRM, JSON.stringify(param), searhFn, 'POST'); 	
+				}
+			};
+			itp_fn_modal_confirm('정산 확정하시겠습니까?', confirmFn, null);
+		}, 
+		rejectSttl: function() {
+			// 정산반려
+			fn_call_popup('biz', 'BIZPOP_STTL_REJECT_REASON', '#ITP_ASIDE', function(result) {
+				// API 호출
+				let param = {};
+				param.sttlMgntUnqNo = $('#ITP_FORM_SETTMNG02010_DETAIL_STTL_MGNT_UNQ_NO').val();
+				param.sttlRjctRsn = result;
+				
+				fn_ajax_call(STTL_INSPECT_STATE_STTL_REJECT, JSON.stringify(param), function() {
+					listObj.grid.search();						
+				}, 'POST');				
+			}, null, 'S');
 		}
 	}, 
 	load: function(param) {
@@ -482,13 +516,27 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG02010_DETAIL_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
 		
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnBrandNm').text(result.brandNm);
-		$('#ITP_FORM_SETTMNG02010_DETAIL .fnStoreNm').text(result.storeNm);
-		$('#ITP_FORM_SETTMNG02010_DETAIL_STTL_DT').val(result.sttlDt);  // 정산일자
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSupplyNm').text(result.spplyNm);
+		
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn);
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlStNm').text(result.sttlStNm);
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlReqDt').text(result.sttlReqDt);  // 정산일자
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlDt').text(result.sttlDt == null ? '' : result.sttlDt);  // 정산일자
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlAmt').text(itp_fn_number_comma(result.sttlAmt));
+		
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSysRegNm').text(result.sysRegNm);
+		
+		// 정산요청 상태
+		if(result.sttlStCd == 'ST10') {
+			$('#ITP_BTN_SETTMNG02010_CONFIRM').show();
+			$('#ITP_BTN_SETTMNG02010_REJECT').show();
+		} else {
+			$('#ITP_BTN_SETTMNG02010_CONFIRM').hide();
+			$('#ITP_BTN_SETTMNG02010_REJECT').hide();
+		}		
 
 		// 리스트 조회
 		modifyObj.grid.init();