소스 재 반영

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

@@ -60,6 +60,8 @@
 				                <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="">
+				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT" value="">
 				    
 				                <section class="itp_form_sec">
 				                    <h4 class="itp_form_tit">정산 상세정보</h4>
@@ -89,17 +91,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/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -0,0 +1,331 @@
+<div id="ITP_BIZPOP_PO_PAYMENT" 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">
+					수발주 <b><span id="ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM"></span></b>을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여 PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.
+					<br>
+					<br>
+					</div>
+				</div>
+				
+				<div class="itp_form itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_PO_PAYMENT_POPUP">
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_PAY_TP_CD" name="payTpCd" value="" />
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_BRAND_ID" name="brandId" value="" />
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_STORE_ID" name="storeId" value="" />
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="" />
+							
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">주문번호</label>
+									<div class="col-xs-10 itp_ip fnPoOrdNo"></div>									
+								</div>
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">구매자명</label>
+									<div class="col-xs-10 itp_ip fnOrdNm"></div>									
+								</div>
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">상품명</label>
+									<div class="col-xs-10 itp_ip fnGoodsNm"></div>									
+								</div>
+								<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_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" />
+									</div>									
+								</div>
+								<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_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" placeholder="010-0000-0000" />
+									</div>									
+								</div>
+								<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_PO_PAYMENT_POPUP_ORD_EMAIL" class="form-control itp_input" name="ordEmail" />
+									</div>									
+								</div>								
+							</form>
+
+							<form id="ITP_FORM_PO_PAYMENT_EASYPAY" method="post" action="">
+								<!-- WEB -->
+
+								<!--------------------------->
+								<!-- ::: 공통 인증 요청 값 -->
+								<!--------------------------->
+
+								<input type="hidden" id="EP_mall_nm" name="EP_mall_nm" value=""> 			<!-- 가맹점명-->
+								<input type="hidden" id="EP_currency" name="EP_currency" value="00"> 		<!-- 통화코드 // 00 : 원화-->
+								<input type="hidden" id="EP_return_url" name="EP_return_url" value=""> 		<!-- 가맹점 CALLBACK URL // -->
+								<input type="hidden" id="EP_ci_url" name="EP_ci_url" value=""> 				<!-- CI LOGO URL // -->
+								<input type="hidden" id="EP_lang_flag" name="EP_lang_flag" value=""> 		<!-- 언어 // -->
+								<input type="hidden" id="EP_charset" name="EP_charset" value="UTF-8"> 		<!-- 가맹점 CharSet // EUC-KR,UTF-8 사용시 대문자 이용-->
+								<input type="hidden" id="EP_user_id" name="EP_user_id" value=""> 			<!-- 가맹점 고객ID // -->
+								<input type="hidden" id="EP_memb_user_no" name="EP_memb_user_no" value=""> 	<!-- 가맹점 고객일련번호 // -->
+								<input type="hidden" id="EP_user_nm" name="EP_user_nm" value=""> 			<!-- 가맹점 고객명 // -->
+								<input type="hidden" id="EP_user_mail" name="EP_user_mail" value=""> 		<!-- 가맹점 고객 E-mail // -->
+								<input type="hidden" id="EP_user_phone1" name="EP_user_phone1" value=""> 	<!-- 가맹점 고객 연락처1 // -->
+								<input type="hidden" id="EP_user_phone2" name="EP_user_phone2" value=""> 	<!-- 가맹점 고객 연락처2 // -->
+								<input type="hidden" id="EP_user_addr" name="EP_user_addr" value=""> 		<!-- 가맹점 고객 주소 // -->
+								<input type="hidden" id="EP_user_define1" name="EP_user_define1" value=""> 	<!-- 가맹점 필드1 // -->
+								<input type="hidden" id="EP_user_define2" name="EP_user_define2" value=""> 	<!-- 가맹점 필드2 // -->
+								<input type="hidden" id="EP_user_define3" name="EP_user_define3" value=""> 	<!-- 가맹점 필드3 // -->
+								<input type="hidden" id="EP_user_define4" name="EP_user_define4" value=""> 	<!-- 가맹점 필드4 // -->
+								<input type="hidden" id="EP_user_define5" name="EP_user_define5" value=""> 	<!-- 가맹점 필드5 // -->
+								<input type="hidden" id="EP_user_define6" name="EP_user_define6" value=""> 	<!-- 가맹점 필드6 // -->
+								<input type="hidden" id="EP_product_type" name="EP_product_type" value="">	<!-- 상품정보구분 // -->
+								<input type="hidden" id="EP_product_expr" name="EP_product_expr" value=""> 	<!-- 서비스 기간 // (YYYYMMDD) -->
+								<input type="hidden" id="EP_disp_cash_yn" name="EP_disp_cash_yn" value=""> 	<!-- 현금영수증 화면표시여부 //미표시 : "N", 그외: DB조회 -->
+
+								<!--------------------------->
+								<!-- ::: 카드 인증 요청 값 -->
+								<!--------------------------->
+
+								<input type="hidden" id="EP_usedcard_code" name="EP_usedcard_code" value=""> 	<!-- 사용가능한 카드 LIST // FORMAT->카드코드:카드코드: ... :카드코드 EXAMPLE->029:027:031 // 빈값 : DB조회-->
+								<input type="hidden" id="EP_quota" name="EP_quota" value=""> 					<!-- 할부개월 (카드코드-할부개월) -->
+								<input type="hidden" id="EP_os_cert_flag" name="EP_os_cert_flag" value="2"> 	<!-- 해외안심클릭 사용여부(변경불가) // -->
+								<input type="hidden" id="EP_noinst_flag" name="EP_noinst_flag" value=""> 		<!-- 무이자 여부 (Y/N) // -->
+								<input type="hidden" id="EP_noinst_term" name="EP_noinst_term" value="">		<!-- 무이자 기간 (카드코드-더할할부개월) // -->
+								<input type="hidden" id="EP_set_point_card_yn" name="EP_set_point_card_yn" value=""> 	<!-- 카드사포인트 사용여부 (Y/N) // -->
+								<input type="hidden" id="EP_point_card" name="EP_point_card" value=""> 			<!-- 포인트카드 LIST  // -->
+								<input type="hidden" id="EP_join_cd" name="EP_join_cd" value=""> 				<!-- 조인코드 // -->
+								<input type="hidden" id="EP_kmotion_useyn" name="EP_kmotion_useyn" value="Y"> 	<!-- 국민앱카드 사용유무 (Y/N)// -->
+
+								<!------------------------------->
+								<!-- ::: 가상계좌 인증 요청 값 -->
+								<!------------------------------->
+
+								<input type="hidden" id="EP_vacct_bank" name="EP_vacct_bank" value=""> 			<!-- 가상계좌 사용가능한 은행 LIST // -->
+								<input type="hidden" id="EP_vacct_end_date" name="EP_vacct_end_date" value=""> 	<!-- 입금 만료 날짜 // -->
+								<input type="hidden" id="EP_vacct_end_time" name="EP_vacct_end_time" value=""> 	<!-- 입금 만료 시간 // -->
+
+								<!------------------------------->
+								<!-- ::: 선불카드 인증 요청 값 -->
+								<!------------------------------->
+
+								<input type="hidden" id="EP_prepaid_cp" name="EP_prepaid_cp" value=""> 		<!-- 선불카드 CP // FORMAT->코드:코드: ... :코드 EXAMPLE->CCB:ECB // 빈값 : DB조회-->
+
+								<!--------------------------------->
+								<!-- ::: 인증응답용 인증 요청 값 -->
+								<!--------------------------------->
+
+								<input type="hidden" id="EP_res_cd" name="EP_res_cd" value=""> 			<!--  응답코드 // -->
+								<input type="hidden" id="EP_res_msg" name="EP_res_msg" value=""> 		<!--  응답메세지 // -->
+								<input type="hidden" id="EP_tr_cd" name="EP_tr_cd" value=""> 					<!--  결제창 요청구분 // -->
+								<input type="hidden" id="EP_ret_pay_type" name="EP_ret_pay_type" value=""> 		<!--  결제수단 // -->
+								<input type="hidden" id="EP_ret_complex_yn" name="EP_ret_complex_yn" value=""> 	<!--  복합결제 여부 (Y/N) // -->
+								<input type="hidden" id="EP_card_code" name="EP_card_code" value=""> 			<!--  카드코드 (ISP:KVP카드코드 MPI:카드코드) // -->
+								<input type="hidden" id="EP_eci_code" name="EP_eci_code" value=""> 				<!--  MPI인 경우 ECI코드 // -->
+								<input type="hidden" id="EP_card_req_type" name="EP_card_req_type" value=""> 	<!--  거래구분 // -->
+								<input type="hidden" id="EP_save_useyn" name="EP_save_useyn" value=""> 			<!--  카드사 세이브 여부 (Y/N) // -->
+								<input type="hidden" id="EP_trace_no" name="EP_trace_no" value=""> 				<!--  추적번호 // -->
+								<input type="hidden" id="EP_sessionkey" name="EP_sessionkey" value=""> 			<!--  세션키 // -->
+								<input type="hidden" id="EP_encrypt_data" name="EP_encrypt_data" value=""> 		<!--  암호화전문 // -->
+								<input type="hidden" id="EP_spay_cp" name="EP_spay_cp" value=""> 				<!--  간편결제 CP 코드 // -->
+								<input type="hidden" id="EP_card_prefix" name="EP_card_prefix" value=""> 		<!--  신용카드prefix // -->
+								<input type="hidden" id="EP_card_no_7" name="EP_card_no_7" value=""> 			<!--  신용카드번호 앞7자리 // -->
+
+								<!--------------------------------->
+								<!-- ::: 가맹점 정보 -->
+								<!--------------------------------->
+
+								<input type="hidden" id="EP_mall_id" name="EP_mall_id" value=""> <!--  가맹점ID // -->
+
+								<!--------------------------------->
+								<!-- ::: 결제 정보 -->
+								<!--------------------------------->
+
+								<input type="hidden" id="EP_pay_type" name="EP_pay_type" value="11"> 				<!--  결제수단(신용카드 고정) // -->
+								<input type="hidden" id="EP_window_type" name="EP_window_type" value="iframe"> 		<!--  윈도우타입 (iframe[default], popup) // -->
+								<input type="hidden" id="EP_cert_type" name="EP_cert_type" value=""> 				<!--  인증타입 (일반-"", 인증-"21", 비인증-"22") // -->
+
+								<!--------------------------------->
+								<!-- ::: 주문 정보 -->
+								<!--------------------------------->
+
+								<input type="hidden" id="EP_order_no" name="EP_order_no" value=""> 			<!--  주문번호 // -->
+								<input type="hidden" id="EP_product_nm" name="EP_product_nm" value=""> 		<!--  상품명 // -->
+								<input type="hidden" id="EP_product_amt" name="EP_product_amt" value=""> 	<!--  상품금액 // -->
+
+								<!-- // WEB END -->
+
+								<!-- MOBILE -->
+								<!-- [START] 인증요청 필드 -->
+								<!--  <table>내에도 일부 파라미터 존재합니다.-->
+
+								<!--------------------------->
+								<!-- ::: 공통 인증 요청 값 -->
+								<!--------------------------->
+								<input type="hidden" id="sp_mall_nm" name="sp_mall_nm" value="" /> 			<!--[선택]가맹점명 -->
+								<input type="hidden" id="sp_order_no" name="sp_order_no" value="" /> 		<!--[필수]가맹점 주문번호(인증응답) -->
+								<input type="hidden" id="sp_currency" name="sp_currency" value="00" /> 		<!--[필수]통화코드(수정불가) -->
+								<input type="hidden" id="sp_return_url" name="sp_return_url" value="" /> 	<!--[필수]가맹점 return URL -->
+								<input type="hidden" id="sp_lang_flag" name="sp_lang_flag" value="" /> 		<!--[선택]언어 -->
+								<input type="hidden" id="sp_charset" name="sp_charset" value="UTF-8" /> 	<!--[선택]가맹점 charset -->
+								<input type="hidden" id="sp_user_id" name="sp_user_id" value="" /> 			<!--[선택]가맹점 고객ID -->
+								<input type="hidden" id="sp_memb_user_no" name="sp_memb_user_no" value="" /> 	<!--[선택]가맹점 고객일련번호 -->
+								<input type="hidden" id="sp_user_nm" name="sp_user_nm" value="" /> 			<!--[선택]가맹점 고객명 -->
+								<input type="hidden" id="sp_user_mail" name="sp_user_mail" value="" /> 		<!--[선택]가맹점 고객 E-mail -->
+								<input type="hidden" id="sp_user_phone1" name="sp_user_phone1" value="" /> 	<!--[선택]가맹점 고객 연락처1 -->
+								<input type="hidden" id="sp_user_phone2" name="sp_user_phone2" value="" /> 	<!--[선택]가맹점 고객 연락처2 -->
+								<input type="hidden" id="sp_user_addr" name="sp_user_addr" value="" /> 		<!--[선택]가맹점 고객 주소 -->
+								<input type="hidden" id="sp_user_define1" name="sp_user_define1" value="" /> 	<!--[선택]가맹점 필드1 -->
+								<input type="hidden" id="sp_user_define2" name="sp_user_define2" value="" /> 	<!--[선택]가맹점 필드2 -->
+								<input type="hidden" id="sp_user_define3" name="sp_user_define3" value="" /> 	<!--[선택]가맹점 필드3 -->
+								<input type="hidden" id="sp_user_define4" name="sp_user_define4" value="" /> 	<!--[선택]가맹점 필드4 -->
+								<input type="hidden" id="sp_user_define5" name="sp_user_define5" value="" /> 	<!--[선택]가맹점 필드5 -->
+								<input type="hidden" id="sp_user_define6" name="sp_user_define6" value="" /> 	<!--[선택]가맹점 필드6 -->
+								<input type="hidden" id="sp_product_type" name="sp_product_type" value="" /> 	<!--[선택]상품정보구분 -->
+								<input type="hidden" id="sp_product_expr" name="sp_product_expr" value="" /> 	<!--[선택]서비스 기간 -->
+								<input type="hidden" id="sp_app_scheme" name="sp_app_scheme" value="" /> 	<!--[선택]가맹점 APP scheme -->
+
+								<input type="hidden" id="sp_mall_id" name="sp_mall_id" value="" /> 			<!--[필수]가맹점 ID -->
+								<input type="hidden" id="sp_pay_type" name="sp_pay_type" value="11" /> 		<!--[필수]결제수단 -->
+								<input type="hidden" id="sp_cert_type" name="sp_cert_type" value="" /> 		<!--[선택]인증타입 -->
+								<input type="hidden" id="sp_product_nm" name="sp_product_nm" value="" /> 	<!--[필수]상품명 -->
+								<input type="hidden" id="sp_product_amt" name="sp_product_amt" value="" /> 	<!--[필수]상품금액 -->
+								<input type="hidden" id="sp_window_type" name="sp_window_type" value="" /> 	<!--[선택]윈도우타입 -->
+								<input type="hidden" id="sp_disp_cash_yn" name="sp_disp_cash_yn" value="" /> 	<!--[선택]현금영수증 화면표시여부 -->
+								<input type="hidden" id="sp_kmotion_useyn" name="sp_kmotion_useyn" value="" /> 	<!--[선택]국민앱카드 사용유무 -->
+
+								<!--신용카드-->
+								<input type="hidden" id="sp_usedcard_code"
+									name="sp_usedcard_code" value="" />
+								<!--[선택]사용가능카드 LIST -->
+								<input type="hidden" id="sp_quota" name="sp_quota" value="" />
+								<!--[선택]할부개월 -->
+								<input type="hidden" id="sp_os_cert_flag" name="sp_os_cert_flag"
+									value="2" />
+								<!--[선택]해외안심클릭 사용여부-->
+								<input type="hidden" id="sp_noinst_flag" name="sp_noinst_flag"
+									value="" />
+								<!--[선택]무이자 여부(Y/N)-->
+								<input type="hidden" id="sp_noinst_term" name="sp_noinst_term"
+									value="" />
+								<!--[선택]무이자 기간 -->
+								<input type="hidden" id="sp_set_point_card_yn"
+									name="sp_set_point_card_yn" value="" />
+								<!--[선택]카드사포인트 사용여부(Y/N)-->
+								<input type="hidden" id="sp_point_card" name="sp_point_card"
+									value="" />
+								<!--[선택]포인트카드 LIST(카드코드-더할 할부개월) -->
+								<input type="hidden" id="sp_join_cd" name="sp_join_cd" value="" />
+								<!--[선택]조인코드 -->
+
+								<!--가상계좌-->
+								<input type="hidden" id="sp_vacct_bank" name="sp_vacct_bank"
+									value="" />
+								<!--[선택]가상계좌 사용가능한 은행 LIST -->
+								<input type="hidden" id="sp_vacct_end_date"
+									name="sp_vacct_end_date" value="" />
+								<!--[선택]입금 만료 날짜 -->
+								<input type="hidden" id="sp_vacct_end_time"
+									name="sp_vacct_end_time" value="" />
+								<!--[선택]입금 만료 시간 -->
+
+								<!--선불카드-->
+								<input type="hidden" id="sp_prepaid_cp" name="sp_prepaid_cp"
+									value="" />
+								<!--[선택]선불카드 CP -->
+
+								<!-- [END] 인증요청 필드  -->
+
+								<!-- [START] 인증응답 필드 -->
+
+								<!--------------------------->
+								<!-- ::: 공통 응답 값 -->
+								<!--------------------------->
+								<input type="hidden" id="sp_res_cd" name="sp_res_cd" value="" />
+								<!-- [필수]응답코드        -->
+								<input type="hidden" id="sp_res_msg" name="sp_res_msg" value="" />
+								<!-- [필수]응답메시지      -->
+								<input type="hidden" id="sp_tr_cd" name="sp_tr_cd" value="" />
+								<!-- [필수]결제창 요청구분 -->
+								<input type="hidden" id="sp_ret_pay_type" name="sp_ret_pay_type"
+									value="" />
+								<!-- [필수]결제수단        -->
+								<input type="hidden" id="sp_trace_no" name="sp_trace_no"
+									value="" />
+								<!-- [선택]추적번호        -->
+								<!-- 가맹점 주문번호 인증요청 필드에 존재.                                                                [필수]가맹점 주문번호 -->
+								<input type="hidden" id="sp_sessionkey" name="sp_sessionkey"
+									value="" />
+								<!-- [필수]세션키          -->
+								<input type="hidden" id="sp_encrypt_data" name="sp_encrypt_data"
+									value="" />
+								<!-- [필수]암호화전문      -->
+								<!-- 가맹점 ID  인증요청 필드에 존재.                                                                 [필수]가맹점 ID       -->
+								<input type="hidden" id="sp_mobilereserved1"
+									name="sp_mobilereserved1" value="" />
+								<!-- [선택]여유필드        -->
+								<input type="hidden" id="sp_mobilereserved2"
+									name="sp_mobilereserved2" value="" />
+								<!-- [선택]여유필드        -->
+								<input type="hidden" id="sp_reserved1" name="sp_reserved1"
+									value="" />
+								<!-- [선택]여유필드        -->
+								<input type="hidden" id="sp_reserved2" name="sp_reserved2"
+									value="" />
+								<!-- [선택]여유필드        -->
+								<input type="hidden" id="sp_reserved3" name="sp_reserved3"
+									value="" />
+								<!-- [선택]여유필드        -->
+								<input type="hidden" id="sp_reserved4" name="sp_reserved4"
+									value="" />
+								<!-- [선택]여유필드        -->
+
+								<!--신용카드-->
+								<input type="hidden" id="sp_card_code" name="sp_card_code"
+									value="" />
+								<!-- [필수]카드코드               -->
+								<input type="hidden" id="sp_eci_code" name="sp_eci_code"
+									value="" />
+								<!-- [선택]ECI코드(MPI인 경우)    -->
+								<input type="hidden" id="sp_card_req_type"
+									name="sp_card_req_type" value="" />
+								<!-- [필수]거래구분               -->
+								<input type="hidden" id="sp_save_useyn" name="sp_save_useyn"
+									value="" />
+								<!-- [선택]카드사 세이브 여부     -->
+								<input type="hidden" id="sp_card_prefix" name="sp_card_prefix"
+									value="" />
+								<!-- [선택]신용카드 Prefix        -->
+								<input type="hidden" id="sp_card_no_7" name="sp_card_no_7"
+									value="" />
+								<!-- [선택]신용카드번호 앞7자리   -->
+
+								<!--간편결제-->
+								<input type="hidden" id="sp_spay_cp" name="sp_spay_cp" value="" />
+								<!-- [선택]간편결제 CP코드 -->
+
+								<!--선불카드-->
+								<input type="hidden" id="sp_prepaid_cp" name="sp_prepaid_cp"
+									value="" />
+								<!-- [선택]선불카드 CP코드 -->
+
+								<!-- [END] 인증응답 필드  -->
+								<!-- // MOBILE END -->
+							</form>
+
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" id="ITP_BTN_PO_PAYMENT_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				<button type="button" id="ITP_BTN_PO_PAYMENT_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/popup/biz/BIZPOP_STORE_SPPLY.html

@@ -5,7 +5,7 @@
 				<input type="hidden" id="ITP_FORM_BIZPOP_STORE_SPPLY_BRAND_ID" name="sbrandId" value="">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-					<h5 class="modal-title">품목 검색</h5>
+					<h5 class="modal-title">공급사 검색</h5>
 				</div>
 				<div class="modal-body">
 					<div class="itp_form fix">

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

@@ -5,7 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>정산현황</strong></h2>
 				<div class="pull-right itp_cicon">
 					<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>
-					<button type="button" id="ITP_BTN_SETTMNG03010_NEWREG" class="btn btn-primary btn-sm RJT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;요청&nbsp;&nbsp;</button>
+					<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>
 					<button type="button" id="ITP_BTN_SETTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
 			</div>
@@ -99,30 +99,43 @@
 											</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>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnSttlReqDt"></div>
+											</div>
+											<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 fnSttlDt"></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>
-											<label class="col-xs-2 itp_lb">잔금</label>
+										</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-8 itp_in fnAcctBal"></div>
+												<div class="col-xs-10 itp_in fnRcptDt"></div>
 											</div>
 										</div>
 										<div class="form-group">
@@ -136,14 +149,6 @@
 											</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>

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

@@ -301,11 +301,17 @@ let listObj = {
 			$(LOANMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 		},
 		popupStore: function() { // 매장선택 팝업
-			
+			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
+				// alert(JSON.stringify(result));
+				$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_ID').val(result[0].storeId);
+				$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_NM').val(result[0].storeNm);				
+				listObj.button.search();
+			}, null, 'S');
 		}, 
 		eraseStore: function() { // 매장선택 삭제
 			$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_ID').val('');
 			$('#ITP_FORM_LOANMNG01010_SEARCH_STORE_NM').val('');
+			listObj.button.search();
 		}
 	},
 	empty: {

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

@@ -604,11 +604,17 @@ let createObj = {
 			}
 		}, 
 		popupStore: function() { // 매장선택 팝업
-			
+			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
+				// alert(JSON.stringify(result));
+				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val(result[0].storeId);
+				$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_NM').val(result[0].storeNm);				
+				listObj.button.search();
+			}, null, 'S');
 		}, 
 		eraseStore: function() { // 매장선택 삭제
-			$('#ITP_FORM_LOANMNG02010_DETAIL_STORE_ID').val('');
-			$('#ITP_FORM_LOANMNG02010_DETAIL_STORE_NM').val('');
+			$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val('');
+			$('#ITP_FORM_LOANMNG02010_SEARCH_STORE_NM').val('');
+			listObj.button.search();
 		}
 	}
 };

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: ',' }
@@ -293,6 +286,8 @@ let pageObj = {
 						case 'ITP_BTN_LOANMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_LOANMNG03010_CANCELLIST'		: viewObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_LOANMNG03010_PAYMENT'			: viewObj.button.payment();	break;	// 결제 버튼
+						case 'ITP_BTN_LOANMNG03010_STORE_SEARCH'	: listObj.button.storePop();	break;	// 매장검색 팝업
+						case 'ITP_BTN_LOANMNG03010_STORE_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
 				});
 			});
@@ -362,6 +357,19 @@ let listObj = {
 			itp_fn_form_clear_validate(null, '#ITP_FORM_LOANMNG03010_DETAIL');						
 			// 로케이션 리스트 조회
 			createObj.init();
+		}, 
+		storePop: function() {
+			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
+				// alert(JSON.stringify(result));
+				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val(result[0].storeId);
+				$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_NM').val(result[0].storeNm);				
+				listObj.button.search();
+			}, null, 'S');
+		}, 
+		storeErase: function() {
+			$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_ID').val('');
+			$('#ITP_FORM_LOANMNG03010_SEARCH_STORE_NM').val('');
+			listObj.button.search();
 		}
 	},
 	empty: {
@@ -411,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'};
@@ -424,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) {
@@ -455,12 +463,18 @@ let viewObj = {
 			listObj.grid.search();
 		},
 		payment: function() {
-			var confirmFn= {
-				callBack: function() {
-					// TODO PG결제 진행	
-				}
-			};
-			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.form.procData, confirmFn, null);
+			// 결제 팝업 결과
+			var popFn = function(rowDataPop) {
+				console.log(JSON.stringify(rowDataPop));
+			};			
+			// 결제 팝업
+			// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))			
+			var args = {'payTpCd': '20', 
+				'brandId': $('#ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(), 
+				'storeId': $('#ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(), 
+				'sttlMgntUnqNo': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
+				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val() };
+			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 		}
 	}, 
 	load: function(param) {
@@ -472,15 +486,24 @@ 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 #ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val(result.sttlReqAmt);
 		
 		$('#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/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -0,0 +1,102 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+let EASYPAY_PAYMENT_CREATE = '/api/easypay/payment/create'; // 이지페이 결제 생성
+let KICC_JAVASCRIPT_URL;
+let KICC_ACTION_WEB_URL;
+let PG_ID;
+let PG_KEY;
+let PG_AFFL_ID;
+
+var popPageObj = {
+	init: function () {
+		this.button();
+		this.change();
+		this.view();
+	},
+	parentPopFn: null,
+	args: null,
+	returnType: null,
+	button: function() {
+		$('#ITP_BTN_PO_PAYMENT_CLOSE_POP').on('click', function () {
+			$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
+		});
+		$('#ITP_BTN_PO_PAYMENT_CONFIRM_POP').on('click', function () {
+			popPageObj.fnPaymentReq();
+		});
+	}, 
+	change: function() {
+	}, 	
+	view: function() {
+		$('#ITP_FORM_PO_PAYMENT_POPUP_PAY_TP_CD').val(popPageObj.args.payTpCd);
+		$('#ITP_FORM_PO_PAYMENT_POPUP_BRAND_ID').val(popPageObj.args.brandId);
+		$('#ITP_FORM_PO_PAYMENT_POPUP_STORE_ID').val(popPageObj.args.storeId);
+		
+		// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
+		if(popPageObj.args.payTpCd == '10') {  
+			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('선불(충전)');
+		} else if(popPageObj.args.payTpCd == '20') {  
+			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('후불(결제)');
+			$('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val(popPageObj.args.sttlMgntUnqNo); // 정산관리고유번호
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val(popPageObj.args.goodsAmt); // 결제금액
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');			
+		} else if(popPageObj.args.payTpCd == '30') {  
+			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('후불(선결제)');
+		}			
+		// 이지페이 결제 생성
+		let param = $('#ITP_FORM_PO_PAYMENT_POPUP').serializeObject();	
+		param.goodsAmt = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val() == '' ? 0 : $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();	
+		fn_ajax_call(EASYPAY_PAYMENT_CREATE, JSON.stringify(param), function(result) {
+			// console.log(JSON.stringify(result));
+			$('#ITP_FORM_PO_PAYMENT_POPUP .fnPoOrdNo').text(result.poOrdNo); // 주문번호
+			$('#ITP_FORM_PO_PAYMENT_POPUP .fnOrdNm').text(result.ordNm); // 구매자명
+			$('#ITP_FORM_PO_PAYMENT_POPUP .fnGoodsNm').text(result.goodsNm); // 상품명
+			$('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val(result.ordTel); // 휴대전화번호
+			$('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val(result.ordEmail); // 이메일
+			
+			KICC_JAVASCRIPT_URL = result.kicc_javascript_url;
+			KICC_ACTION_WEB_URL = result.kicc_action_web_url;
+			PG_ID = result.pgId;
+			PG_KEY = result.pgKey;
+			PG_AFFL_ID = result.pgAfflId;
+			
+			console.log('KICC_JAVASCRIPT_URL : ' + KICC_JAVASCRIPT_URL);
+			console.log('KICC_ACTION_WEB_URL : ' + KICC_ACTION_WEB_URL);
+			console.log('PG_ID : ' + PG_ID);
+			console.log('PG_KEY : ' + PG_KEY);
+			console.log('PG_AFFL_ID : ' + PG_AFFL_ID);
+			
+		}, 'POST');
+	}, 
+	fnPaymentReq: function() {
+		const formId = '#ITP_FORM_PO_PAYMENT_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_PO_PAYMENT_POPUP_STTL_RJCT_RSN').val();	
+			
+			// popPageObj.parentPopFn(sttlRjctRsn);
+			// $('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
+		}
+	} 
+};
+
+function itp_fn_BIZPOP_PO_PAYMENT(parentPopFn, args, returnType) {
+	$('#ITP_BIZPOP_PO_PAYMENT').one('shown.bs.modal', function(e) {
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_PO_PAYMENT').remove();
+	}).modal('show');
+
+	popPageObj.parentPopFn = parentPopFn;
+	popPageObj.args = args;
+	popPageObj.returnType = returnType;
+	popPageObj.init();
+}

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

@@ -353,6 +353,8 @@ let pageObj = {
 						case 'ITP_BTN_SETTMNG01010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_SETTMNG01010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
 						case 'ITP_BTN_SETTMNG01010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
+						case 'ITP_BTN_SETTMNG01010_STORE_SEARCH'	: listObj.button.storePop();	break;	// 매장검색 팝업
+						case 'ITP_BTN_SETTMNG01010_STORE_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
 				});
 			});
@@ -476,6 +478,19 @@ let listObj = {
 			// itp_fn_form_clear_validate(null, '#ITP_FORM_SETTMNG01010_DETAIL');						
 			// 로케이션 리스트 조회
 			// createObj.init();
+		}, 
+		storePop: function() {
+			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
+				// alert(JSON.stringify(result));
+				$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_ID').val(result[0].storeId);
+				$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_NM').val(result[0].storeNm);				
+				listObj.button.search();
+			}, null, 'S');
+		}, 
+		storeErase: function() {
+			$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_ID').val('');
+			$('#ITP_FORM_SETTMNG01010_SEARCH_STORE_NM').val('');
+			listObj.button.search();
 		}
 	},
 	empty: {

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

@@ -293,6 +293,8 @@ let pageObj = {
 						case 'ITP_BTN_SETTMNG02010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
 						case 'ITP_BTN_SETTMNG02010_CONFIRM'			: modifyObj.button.confirmSttl();	break;	// 정산확정 버튼
 						case 'ITP_BTN_SETTMNG02010_REJECT'			: modifyObj.button.rejectSttl();	break;	// 정산반려 버튼
+						case 'ITP_BTN_SETTMNG02010_SEARCH_SPPLY_POP'	: listObj.button.spplyPop();	break;	// 
+						case 'ITP_BTN_SETTMNG02010_SEARCH_ERASE'		: listObj.button.spplyErase();	break;	// 
 					}
 				});
 			});
@@ -381,6 +383,19 @@ let listObj = {
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.gridPage = $.jgrid.defaults.page;
 			$(SETTMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+		}, 
+		spplyPop: function() {
+			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', function(result) {
+				// alert(JSON.stringify(result));
+				$('#ITP_FORM_SETTMNG02010_SEARCH_SPPLY_ID').val(result.spplyId);
+				$('#ITP_FORM_SETTMNG02010_SEARCH_STORE_SPPLY_NM').val(result.spplyNm);				
+				listObj.button.search();
+			}, null, 'S');
+		}, 
+		spplyErase: function() {
+			$('#ITP_FORM_SETTMNG02010_SEARCH_SPPLY_ID').val('');
+			$('#ITP_FORM_SETTMNG02010_SEARCH_STORE_SPPLY_NM').val('');
+			listObj.button.search();
 		}
 	},
 	empty: {
@@ -518,7 +533,7 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSupplyNm').text(result.spplyNm);
 		
-		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn);
+		$('#ITP_FORM_SETTMNG02010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : 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));

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

@@ -25,9 +25,8 @@ let SETTMNG03010_DETAIL_GRID_LAST_ROW_ID;
 
 /*API URL*/
 let STTL_STATE_DETAIL_GRID_LIST = '/api/sttl/state/detail-grid-list';
+let STTL_STATE_STTL_END = '/api/sttl/state/sttl-end';
 
-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 +290,9 @@ let pageObj = {
 					switch (id) {
 						case 'ITP_BTN_SETTMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_SETTMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
-						// case 'ITP_BTN_SETTMNG03010_NEWREG'			: listObj.button.reqSttl();	break;	// 정산요청 버튼
-						// case 'ITP_BTN_SETTMNG03010_REQUEST'			: modifyObj.button.request();	break;	// 요청 버튼
+						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산완료 버튼
+						case 'ITP_BTN_SETTMNG03010_SEARCH_STORE_POP'	: listObj.button.storePop();	break;	// 매장검색 팝업
+						case 'ITP_BTN_SETTMNG03010_SEARCH_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
 				});
 			});
@@ -334,7 +334,7 @@ let pageObj = {
 			$('#ITP_BTN_SETTMNG03010_MODIFY').hide();
 			$('#ITP_BTN_SETTMNG03010_CANCELLIST').hide();
 			$('#ITP_BTN_SETTMNG03010_DELETE').hide();
-			$('#ITP_BTN_SETTMNG03010_REQUEST').hide();
+			$('#ITP_BTN_SETTMNG03010_STTL_END').hide();
 			
 			if(LOGIN_AUTH_TYPE_CD == '50') { // 매장관리자
 				$('#ITP_BTN_SETTMNG03010_SEARCH_STORE_POP').hide();
@@ -355,7 +355,7 @@ let pageObj = {
 			$('#ITP_BTN_SETTMNG03010_NEWREG').hide();
 			$('#ITP_BTN_SETTMNG03010_DELETE').hide();
 			
-			fn_show_btn_auth('#ITP_BTN_SETTMNG03010_REQUEST');
+			fn_show_btn_auth('#ITP_BTN_SETTMNG03010_STTL_END');
 			fn_show_btn_auth('#ITP_BTN_SETTMNG03010_CANCELLIST');
 
 			$('#ITP_AJAX_SETTMNG03010_LIST_CONTAINER').hide();
@@ -377,6 +377,19 @@ let listObj = {
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.gridPage = $.jgrid.defaults.page;
 			$(SETTMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+		}, 
+		storePop: function() {
+			fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', function(result) {
+				// alert(JSON.stringify(result));
+				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val(result[0].storeId);
+				$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').val(result[0].storeNm);				
+				listObj.button.search();
+			}, null, 'S');
+		}, 
+		storeErase: function() {
+			$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_ID').val('');
+			$('#ITP_FORM_SETTMNG03010_SEARCH_STORE_SPPLY_NM').val('');
+			listObj.button.search();
 		}
 	},
 	empty: {
@@ -469,6 +482,20 @@ let modifyObj = {
 	button: {
 		cancel: function() {
 			listObj.grid.search();
+		}, 
+		endSttl: function() {
+			// 정산완료
+			const formId = '#ITP_FORM_SETTMNG03010_DETAIL';
+			let param = $(formId).serializeObject();
+			var confirmFn= {
+				callBack: function() {
+					var searhFn = function() {
+						listObj.grid.search();
+					};
+					fn_ajax_call(STTL_STATE_STTL_END, JSON.stringify(param), searhFn, 'POST'); 	
+				}
+			};
+			itp_fn_modal_confirm('정산 완료하시겠습니까?', confirmFn, null);
 		}
 	}, 
 	load: function(param) {
@@ -483,12 +510,26 @@ let modifyObj = {
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
-		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_DT').val(result.sttlDt);  // 정산일자
+		
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : result.sttlRjctRsn);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlReqDt').text(result.sttlReqDt);  // 정산요청일자
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
+		// $('#ITP_FORM_SETTMNG03010_DETAIL_STTL_DT').val(result.sttlDt);  // 정산일자
+		$('#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 .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
+		
+		$('#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);
+		
+		if(result.sttlStCd == 'ST10') { // 정산요청
+			$('#ITP_BTN_SETTMNG03010_STTL_END').show();
+		} else {
+			$('#ITP_BTN_SETTMNG03010_STTL_END').hide();
+		}
 
 		// 리스트 조회
 		modifyObj.grid.init();