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

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

@@ -20,11 +20,15 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_LOANMNG01010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_LOANMNG01010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_LOANMNG01010_STORE_ERASE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_LOANMNG01010_SEARCH_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="sloanDvsn">
@@ -60,8 +64,7 @@
 								<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">여신정보</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip">
@@ -124,15 +127,16 @@
 										<div class="col-xs-12">
 											<form id="ITP_FORM_LOANMNG01010_VIEW_SEARCH" class="form-horizontal">
 												<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_SEARCH_LOAN_MGNT_UNQ_NO" name="sloanMgntUnqNo" value="">
-											
-												<div class="col-xs-1 itp_ip itp_noMar" style="top:2px">
-													<label class="itp_in">거래일자</label>
+												<div class="col-xs-1 itp_ip itp_noMar" style="left:15px">
+													<select id="ITP_AJAX_LOANMNG01010_VIEW_SEARCH" class="form-control itp_input" name="servicePchReqDt">
+														<option value="A">거래일자</option>											
+													</select>
 												</div>
-												<div class="col-xs-2 itp_ip itp_noMar">
+												<div class="col-xs-4 itp_ip itp_noMar">
 													<div class="input-daterange input-group date">
-														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="">
+														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="" readonly>
 														<span class="input-group-addon itp_date_to">~</span>
-														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_TO" class="form-control itp_input" name="toDt" value="">
+														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_TO" class="form-control itp_input" name="toDt" value="" readonly>
 													</div>
 												</div>
 												<div class="col-xs-2 itp_in itp_noMar">

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

@@ -26,21 +26,27 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" value="" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" value="" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_LOANMNG02010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_LOANMNG02010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_LOANMNG02010_STORE_ERASE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
-										<div class="col-xs-3 itp_ip itp_noMar">
-											<div class="col-xs-3 itp_ip itp_noMar" style="top:2px">
-												<label>입금일자</label>
+										<div class="col-xs-5 itp_ip itp_noMar">
+											<div class="col-xs-3 itp_ip itp_noMar">
+												<select id="ITP_FORM_LOANMNG02010_SEARCH_" class="form-control itp_input" >
+													<option value="">입금상태</option>
+												</select>	
 											</div>
 											<div class="col-xs-8 itp_ip itp_noMar">
 												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 													<span class="input-group-addon itp_date_to">~</span>
-													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 												</div>
 											</div>
 										</div>
@@ -72,8 +78,7 @@
 								<input type="hidden" id="ITP_FORM_LOANMNG02010_DETAIL_STORE_ID" name="storeId" value="">
 					
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">입금정보</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 												<div class="col-xs-4 itp_ip">
@@ -95,7 +100,7 @@
 											</div>
 											<label class="col-xs-2 itp_lb">입금일자</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-4 itp_in">
+												<div class="col-xs-7 itp_in">
 													<div class="input-group date">
 													<input type="text" id="ITP_FORM_LOANMNG02010_DETAIL_DPST_DT" class="form-control itp_input" name="dpstDt" readonly="readonly">
 													<span class="input-group-addon itp_input itp_date_to">
@@ -105,7 +110,7 @@
 												</div>
 											</div>
 										</div>
-										<div class="form-group border">
+										<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">
@@ -114,7 +119,7 @@
 											</div>
 											<label class="col-xs-2 itp_lb">입금은행</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
+												<div class="col-xs-7 itp_in">
 													<select id="ITP_FORM_LOANMNG02010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="dpstBnkCd">
 														<option value="">입금은행</option>
 													</select>												
@@ -125,10 +130,15 @@
 									<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-4 itp_in">
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
 													<input type="text" id="ITP_FORM_LOANMNG02010_DETAIL_RCV_ACCT_NO" class="form-control itp_input" name="rcvAcctNo">
 												</div>
+											</div>	
+											<label class="col-xs-2 itp_lb"></label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-4 itp_in">
+												</div>
 											</div>											
 										</div>
 									</div>
@@ -149,8 +159,7 @@
 								<input type="hidden" id="ITP_FORM_LOANMNG02010_VIEW_DPST_ST_CD" name="dpstStCd" value="">								
 								
 								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">입금정보</h4>
-									<div class="itp_form_in">
+									<div class="itp_form_in border-top">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip">
@@ -182,7 +191,9 @@
 									<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 fnRcvAcctNo"></div>											
+											<div class="col-xs-4 itp_ip fnRcvAcctNo"></div>		
+											<label class="col-xs-2 itp_lb"></label>
+											<div class="col-xs-4 itp_ip "></div>										
 										</div>
 									</div>
 								</section>								

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

@@ -20,21 +20,27 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
+											<div class="input-group">
+												<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
+												<span class="input-group-btn">
+													<button id="ITP_BTN_LOANMNG03010_STORE_ERASE" class="btn btn-default btn-sm itp_btn UPB" type="button"><i class="glyphicon glyphicon-remove"></i></button>
+												</span>
+											</div>
 										</div>
 										<div class="col-xs-1 itp_ip itp_noMar">
 											<button type="button" id="ITP_BTN_LOANMNG03010_STORE_SEARCH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_LOANMNG03010_STORE_ERASE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 										</div>
-										<div class="col-xs-3 itp_ip itp_noMar">
-											<div class="col-xs-3 itp_ip itp_noMar" style="top:2px">
-												<label>정산요청일</label>
+										<div class="col-xs-6 itp_ip itp_noMar">
+											<div class="col-xs-3 itp_ip itp_noMar">
+												<select id="ITP_FORM_LOANMNG03010_SEARCH_" class="form-control itp_input" >
+													<option value="">정산요청일</option>
+												</select>	
 											</div>
 											<div class="col-xs-8 itp_ip itp_noMar">
 												<div class="input-daterange input-group date">
-													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
 													<span class="input-group-addon itp_date_to">~</span>
-													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
+													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
 												</div>
 											</div>
 										</div>										
@@ -64,8 +70,7 @@
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" value="">
 				    
 				                <section class="itp_form_sec">
-				                    <h4 class="itp_form_tit">정산 상세정보</h4>
-				                    <div class="itp_form_in">
+				                    <div class="itp_form_in border-top">
 				                        <div class="form-group">
 				                            <label class="col-xs-2 itp_lb">브랜드</label>
 				                                <div class="col-xs-4 itp_ip">
@@ -120,11 +125,10 @@
 				        </div>
 				    </div>
 				    <div class="itp_table fix">
-					    <div class="itp_table_head fix" style="background:#f5f5f5;">
+					    <div class="itp_table_head fix" style="background:#fff;">
 					        <h4 class="itp_table_tit">정산 대상 내역</h4>
 					    </div>
 					    <div id="ITP_LOANMNG03010_VIEW_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_LOANMNG03010_VIEW_jqGridView" class="itp_views fix"></div>
 					        <table id="ITP_LOANMNG03010_VIEW_jqGrid"></table>
 					        <div id="ITP_LOANMNG03010_VIEW_jqGridPager"></div>
 					        <div id="ITP_LOANMNG03010_VIEW_jqGridEmpty" class="itp_no_data"></div>

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

@@ -12,7 +12,7 @@
 							<form id="ITP_FORM_PO_REJECT_REASON_POPUP">
 								<div class="form-group">
 									<label class="col-xs-2 itp_lb">반려사유</label>
-									<div class="col-xs-10 itp_ip">
+									<div class="col-xs-9 itp_ip">
 									<input type="text" id="ITP_FORM_PO_REJECT_REASON_POPUP_DSPT_RJCT_RSN" class="form-control itp_input" name="dsptRjctRsn" />
 									</div>									
 								</div>								

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

@@ -57,12 +57,13 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'LOAN_MGNT_UNQ_NO', name: 'loanMgntUnqNo',
 			label: "여신관리번호", 
+			minwidth: 120,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -75,28 +76,28 @@ const gridColModel = {
 		{
 			index: 'LIMIT_AMT', name: 'limitAmt',
 			label: "한도금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'ACCT_BAL', name: 'acctBal',
 			label: "입금금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},		
 		{
 			index: 'POSB_LIMIT_AMT', name: 'posbLimitAmt',
 			label: "사용가능금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
 			label: '사용한금액', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -141,21 +142,21 @@ const gridColModel = {
 		{
 			index: 'DPST_AMT', name: 'dpstAmt',
 			label: "입금",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PAYM_AMT', name: 'paymAmt',
 			label: "지급",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'TRSC_AF_BAL', name: 'trscAfBal',
 			label: "잔액",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},

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

@@ -66,7 +66,7 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '12', fixed: false, align: 'center',
+			width: '12', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -84,7 +84,7 @@ const gridColModel = {
 		{
 			index: 'DPST_AMT', name: 'dpstAmt',
 			label: "입금금액", 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -104,6 +104,7 @@ const gridColModel = {
 			index: 'DPST_ST_NM', name: 'dpstStNm',
 			label: "입금상태", 
 			width: '6', fixed: false, align: 'center',
+			minwidth: 80,
 			sortable: false, hidden: false
 		},
 		{
@@ -115,24 +116,28 @@ const gridColModel = {
 		{
 			index: 'RCV_ACCT_NO', name: 'rcvAcctNo',
 			label: "입금계좌번호", 
+			minwidth: 140,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'REQ_DT', name: 'reqDt',
 			label: "요청일", 
+			minwidth: 120,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DPST_AUTH_DT', name: 'dpstAuthDt',
 			label: "승인일", 
+			minwidth: 120,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'DSPT_RJCT_DT', name: 'dsptRjctDt',
 			label: "반려일", 
+			minwidth: 120,
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},

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

@@ -65,7 +65,7 @@ const gridColModel = {
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -95,7 +95,7 @@ const gridColModel = {
 		{
 			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
 			label: '정산요청금액', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -106,7 +106,7 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},	
 		{
-			index: 'UNPAId_AMT', name: 'unpaidAmt',
+			index: 'UNPAId_AMT', name: 'right',
 			label: '미납금액', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, 
@@ -115,7 +115,7 @@ const gridColModel = {
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
 			label: '사용가능한도', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		}