Explorar el Código

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

yhl88 hace 2 años
padre
commit
7b0b90759b

+ 14 - 10
src/main/webapp/app/loanmng/LOANMNG01010.html

@@ -20,11 +20,15 @@
20 20
 								
21 21
 									<div class="form-group">
22 22
 										<div class="col-xs-2 itp_ip itp_noMar">
23
-											<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" />
23
+											<div class="input-group">
24
+												<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" />
25
+												<span class="input-group-btn">
26
+													<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>
27
+												</span>
28
+											</div>
24 29
 										</div>
25 30
 										<div class="col-xs-1 itp_ip itp_noMar">
26 31
 											<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>
27
-											<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>
28 32
 										</div>
29 33
 										<div class="col-xs-2 itp_ip itp_noMar">
30 34
 											<select id="ITP_FORM_LOANMNG01010_SEARCH_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="sloanDvsn">
@@ -60,8 +64,7 @@
60 64
 								<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
61 65
 					
62 66
 								<section class="itp_form_sec">
63
-									<h4 class="itp_form_tit">여신정보</h4>
64
-									<div class="itp_form_in">
67
+									<div class="itp_form_in border-top">
65 68
 										<div class="form-group">
66 69
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
67 70
 												<div class="col-xs-4 itp_ip">
@@ -124,15 +127,16 @@
124 127
 										<div class="col-xs-12">
125 128
 											<form id="ITP_FORM_LOANMNG01010_VIEW_SEARCH" class="form-horizontal">
126 129
 												<input type="hidden" id="ITP_FORM_LOANMNG01010_VIEW_SEARCH_LOAN_MGNT_UNQ_NO" name="sloanMgntUnqNo" value="">
127
-											
128
-												<div class="col-xs-1 itp_ip itp_noMar" style="top:2px">
129
-													<label class="itp_in">거래일자</label>
130
+												<div class="col-xs-1 itp_ip itp_noMar" style="left:15px">
131
+													<select id="ITP_AJAX_LOANMNG01010_VIEW_SEARCH" class="form-control itp_input" name="servicePchReqDt">
132
+														<option value="A">거래일자</option>											
133
+													</select>
130 134
 												</div>
131
-												<div class="col-xs-2 itp_ip itp_noMar">
135
+												<div class="col-xs-4 itp_ip itp_noMar">
132 136
 													<div class="input-daterange input-group date">
133
-														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="">
137
+														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_FROM" class="form-control itp_input" name="fromDt" value="" readonly>
134 138
 														<span class="input-group-addon itp_date_to">~</span>
135
-														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_TO" class="form-control itp_input" name="toDt" value="">
139
+														<input type="text" id="ITP_FORM_LOANMNG01010_SEARCH_TO" class="form-control itp_input" name="toDt" value="" readonly>
136 140
 													</div>
137 141
 												</div>
138 142
 												<div class="col-xs-2 itp_in itp_noMar">

+ 28 - 17
src/main/webapp/app/loanmng/LOANMNG02010.html

@@ -26,21 +26,27 @@
26 26
 								
27 27
 									<div class="form-group">
28 28
 										<div class="col-xs-2 itp_ip itp_noMar">
29
-											<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" value="" />
29
+											<div class="input-group">
30
+												<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_NM" class="form-control itp_input" placeholder="매장선택" readonly="readonly" value="" />
31
+												<span class="input-group-btn">
32
+													<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>
33
+												</span>
34
+											</div>
30 35
 										</div>
31 36
 										<div class="col-xs-1 itp_ip itp_noMar">
32 37
 											<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>
33
-											<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>
34 38
 										</div>
35
-										<div class="col-xs-3 itp_ip itp_noMar">
36
-											<div class="col-xs-3 itp_ip itp_noMar" style="top:2px">
37
-												<label>입금일자</label>
39
+										<div class="col-xs-5 itp_ip itp_noMar">
40
+											<div class="col-xs-3 itp_ip itp_noMar">
41
+												<select id="ITP_FORM_LOANMNG02010_SEARCH_" class="form-control itp_input" >
42
+													<option value="">입금상태</option>
43
+												</select>	
38 44
 											</div>
39 45
 											<div class="col-xs-8 itp_ip itp_noMar">
40 46
 												<div class="input-daterange input-group date">
41
-													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
47
+													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
42 48
 													<span class="input-group-addon itp_date_to">~</span>
43
-													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
49
+													<input type="text" id="ITP_FORM_LOANMNG02010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
44 50
 												</div>
45 51
 											</div>
46 52
 										</div>
@@ -72,8 +78,7 @@
72 78
 								<input type="hidden" id="ITP_FORM_LOANMNG02010_DETAIL_STORE_ID" name="storeId" value="">
73 79
 					
74 80
 								<section class="itp_form_sec">
75
-									<h4 class="itp_form_tit">입금정보</h4>
76
-									<div class="itp_form_in">
81
+									<div class="itp_form_in border-top">
77 82
 										<div class="form-group">
78 83
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
79 84
 												<div class="col-xs-4 itp_ip">
@@ -95,7 +100,7 @@
95 100
 											</div>
96 101
 											<label class="col-xs-2 itp_lb">입금일자</label>
97 102
 											<div class="col-xs-4 itp_ip">
98
-												<div class="col-xs-4 itp_in">
103
+												<div class="col-xs-7 itp_in">
99 104
 													<div class="input-group date">
100 105
 													<input type="text" id="ITP_FORM_LOANMNG02010_DETAIL_DPST_DT" class="form-control itp_input" name="dpstDt" readonly="readonly">
101 106
 													<span class="input-group-addon itp_input itp_date_to">
@@ -105,7 +110,7 @@
105 110
 												</div>
106 111
 											</div>
107 112
 										</div>
108
-										<div class="form-group border">
113
+										<div class="form-group">
109 114
 											<label class="col-xs-2 itp_lb">입금자명</label>
110 115
 											<div class="col-xs-4 itp_ip">
111 116
 												<div class="col-xs-8 itp_in">
@@ -114,7 +119,7 @@
114 119
 											</div>
115 120
 											<label class="col-xs-2 itp_lb">입금은행</label>
116 121
 											<div class="col-xs-4 itp_ip">
117
-												<div class="col-xs-8 itp_in">
122
+												<div class="col-xs-7 itp_in">
118 123
 													<select id="ITP_FORM_LOANMNG02010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="dpstBnkCd">
119 124
 														<option value="">입금은행</option>
120 125
 													</select>												
@@ -125,10 +130,15 @@
125 130
 									<div class="itp_form_in">
126 131
 										<div class="form-group border">
127 132
 											<label class="col-xs-2 itp_lb">입금계좌번호</label>
128
-											<div class="col-xs-10 itp_ip">
129
-												<div class="col-xs-4 itp_in">
133
+											<div class="col-xs-4 itp_ip">
134
+												<div class="col-xs-8 itp_in">
130 135
 													<input type="text" id="ITP_FORM_LOANMNG02010_DETAIL_RCV_ACCT_NO" class="form-control itp_input" name="rcvAcctNo">
131 136
 												</div>
137
+											</div>	
138
+											<label class="col-xs-2 itp_lb"></label>
139
+											<div class="col-xs-4 itp_ip">
140
+												<div class="col-xs-4 itp_in">
141
+												</div>
132 142
 											</div>											
133 143
 										</div>
134 144
 									</div>
@@ -149,8 +159,7 @@
149 159
 								<input type="hidden" id="ITP_FORM_LOANMNG02010_VIEW_DPST_ST_CD" name="dpstStCd" value="">								
150 160
 								
151 161
 								<section class="itp_form_sec">
152
-									<h4 class="itp_form_tit">입금정보</h4>
153
-									<div class="itp_form_in">
162
+									<div class="itp_form_in border-top">
154 163
 										<div class="form-group">
155 164
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
156 165
 											<div class="col-xs-4 itp_ip">
@@ -182,7 +191,9 @@
182 191
 									<div class="itp_form_in">
183 192
 										<div class="form-group border">
184 193
 											<label class="col-xs-2 itp_lb">입금계좌번호</label>
185
-											<div class="col-xs-10 itp_ip fnRcvAcctNo"></div>											
194
+											<div class="col-xs-4 itp_ip fnRcvAcctNo"></div>		
195
+											<label class="col-xs-2 itp_lb"></label>
196
+											<div class="col-xs-4 itp_ip "></div>										
186 197
 										</div>
187 198
 									</div>
188 199
 								</section>								

+ 15 - 11
src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -20,21 +20,27 @@
20 20
 								
21 21
 									<div class="form-group">
22 22
 										<div class="col-xs-2 itp_ip itp_noMar">
23
-											<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
23
+											<div class="input-group">
24
+												<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장선택" readonly="readonly" value="" />
25
+												<span class="input-group-btn">
26
+													<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>
27
+												</span>
28
+											</div>
24 29
 										</div>
25 30
 										<div class="col-xs-1 itp_ip itp_noMar">
26 31
 											<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>
27
-											<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>
28 32
 										</div>
29
-										<div class="col-xs-3 itp_ip itp_noMar">
30
-											<div class="col-xs-3 itp_ip itp_noMar" style="top:2px">
31
-												<label>정산요청일</label>
33
+										<div class="col-xs-6 itp_ip itp_noMar">
34
+											<div class="col-xs-3 itp_ip itp_noMar">
35
+												<select id="ITP_FORM_LOANMNG03010_SEARCH_" class="form-control itp_input" >
36
+													<option value="">정산요청일</option>
37
+												</select>	
32 38
 											</div>
33 39
 											<div class="col-xs-8 itp_ip itp_noMar">
34 40
 												<div class="input-daterange input-group date">
35
-													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
41
+													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="" readonly>
36 42
 													<span class="input-group-addon itp_date_to">~</span>
37
-													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
43
+													<input type="text" id="ITP_FORM_LOANMNG03010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="" readonly>
38 44
 												</div>
39 45
 											</div>
40 46
 										</div>										
@@ -64,8 +70,7 @@
64 70
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" value="">
65 71
 				    
66 72
 				                <section class="itp_form_sec">
67
-				                    <h4 class="itp_form_tit">정산 상세정보</h4>
68
-				                    <div class="itp_form_in">
73
+				                    <div class="itp_form_in border-top">
69 74
 				                        <div class="form-group">
70 75
 				                            <label class="col-xs-2 itp_lb">브랜드</label>
71 76
 				                                <div class="col-xs-4 itp_ip">
@@ -120,11 +125,10 @@
120 125
 				        </div>
121 126
 				    </div>
122 127
 				    <div class="itp_table fix">
123
-					    <div class="itp_table_head fix" style="background:#f5f5f5;">
128
+					    <div class="itp_table_head fix" style="background:#fff;">
124 129
 					        <h4 class="itp_table_tit">정산 대상 내역</h4>
125 130
 					    </div>
126 131
 					    <div id="ITP_LOANMNG03010_VIEW_jqGrid_list" class="itp_tb_list">
127
-					        <div id="ITP_LOANMNG03010_VIEW_jqGridView" class="itp_views fix"></div>
128 132
 					        <table id="ITP_LOANMNG03010_VIEW_jqGrid"></table>
129 133
 					        <div id="ITP_LOANMNG03010_VIEW_jqGridPager"></div>
130 134
 					        <div id="ITP_LOANMNG03010_VIEW_jqGridEmpty" class="itp_no_data"></div>

+ 1 - 1
src/main/webapp/app/popup/biz/BIZPOP_PO_REJECT_REASON.html

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

+ 9 - 8
src/main/webapp/js/app/loanmng/ITP_LOANMNG01010.js

@@ -57,12 +57,13 @@ const gridColModel = {
57 57
 		{
58 58
 			index: 'STORE_NM', name: 'storeNm',
59 59
 			label: "매장명", 
60
-			width: '13', fixed: false, align: 'center',
60
+			width: '13', fixed: false, align: 'left',
61 61
 			sortable: false, hidden: false
62 62
 		},
63 63
 		{
64 64
 			index: 'LOAN_MGNT_UNQ_NO', name: 'loanMgntUnqNo',
65 65
 			label: "여신관리번호", 
66
+			minwidth: 120,
66 67
 			width: '10', fixed: false, align: 'center',
67 68
 			sortable: false, hidden: false
68 69
 		},
@@ -75,28 +76,28 @@ const gridColModel = {
75 76
 		{
76 77
 			index: 'LIMIT_AMT', name: 'limitAmt',
77 78
 			label: "한도금액", 
78
-			width: '10', fixed: false, align: 'center',
79
+			width: '10', fixed: false, align: 'right',
79 80
 			sortable: false, hidden: false, 
80 81
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
81 82
 		},
82 83
 		{
83 84
 			index: 'ACCT_BAL', name: 'acctBal',
84 85
 			label: "입금금액", 
85
-			width: '10', fixed: false, align: 'center',
86
+			width: '10', fixed: false, align: 'right',
86 87
 			sortable: false, hidden: false, 
87 88
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
88 89
 		},		
89 90
 		{
90 91
 			index: 'POSB_LIMIT_AMT', name: 'posbLimitAmt',
91 92
 			label: "사용가능금액", 
92
-			width: '10', fixed: false, align: 'center',
93
+			width: '10', fixed: false, align: 'right',
93 94
 			sortable: false, hidden: false, 
94 95
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
95 96
 		},
96 97
 		{
97 98
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
98 99
 			label: '사용한금액', 
99
-			width: '10', fixed: false, align: 'center',
100
+			width: '10', fixed: false, align: 'right',
100 101
 			sortable: false, hidden: false, 
101 102
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
102 103
 		},
@@ -141,21 +142,21 @@ const gridColModel = {
141 142
 		{
142 143
 			index: 'DPST_AMT', name: 'dpstAmt',
143 144
 			label: "입금",
144
-			width: '10', fixed: false, align: 'center',
145
+			width: '10', fixed: false, align: 'right',
145 146
 			sortable: false, editable: false, edittype: 'text', 
146 147
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
147 148
 		},
148 149
 		{
149 150
 			index: 'PAYM_AMT', name: 'paymAmt',
150 151
 			label: "지급",
151
-			width: '10', fixed: false, align: 'center',
152
+			width: '10', fixed: false, align: 'right',
152 153
 			sortable: false, editable: false, edittype: 'text', 
153 154
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
154 155
 		},
155 156
 		{
156 157
 			index: 'TRSC_AF_BAL', name: 'trscAfBal',
157 158
 			label: "잔액",
158
-			width: '10', fixed: false, align: 'center',
159
+			width: '10', fixed: false, align: 'right',
159 160
 			sortable: false, editable: false, edittype: 'text', 
160 161
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
161 162
 		},

+ 7 - 2
src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -66,7 +66,7 @@ const gridColModel = {
66 66
 		{
67 67
 			index: 'STORE_NM', name: 'storeNm',
68 68
 			label: "매장명", 
69
-			width: '12', fixed: false, align: 'center',
69
+			width: '12', fixed: false, align: 'left',
70 70
 			sortable: false, hidden: false
71 71
 		},
72 72
 		{
@@ -84,7 +84,7 @@ const gridColModel = {
84 84
 		{
85 85
 			index: 'DPST_AMT', name: 'dpstAmt',
86 86
 			label: "입금금액", 
87
-			width: '10', fixed: false, align: 'center',
87
+			width: '10', fixed: false, align: 'right',
88 88
 			sortable: false, hidden: false, 
89 89
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
90 90
 		},
@@ -104,6 +104,7 @@ const gridColModel = {
104 104
 			index: 'DPST_ST_NM', name: 'dpstStNm',
105 105
 			label: "입금상태", 
106 106
 			width: '6', fixed: false, align: 'center',
107
+			minwidth: 80,
107 108
 			sortable: false, hidden: false
108 109
 		},
109 110
 		{
@@ -115,24 +116,28 @@ const gridColModel = {
115 116
 		{
116 117
 			index: 'RCV_ACCT_NO', name: 'rcvAcctNo',
117 118
 			label: "입금계좌번호", 
119
+			minwidth: 140,
118 120
 			width: '10', fixed: false, align: 'center',
119 121
 			sortable: false, hidden: false
120 122
 		},
121 123
 		{
122 124
 			index: 'REQ_DT', name: 'reqDt',
123 125
 			label: "요청일", 
126
+			minwidth: 120,
124 127
 			width: '8', fixed: false, align: 'center',
125 128
 			sortable: false, hidden: false
126 129
 		},
127 130
 		{
128 131
 			index: 'DPST_AUTH_DT', name: 'dpstAuthDt',
129 132
 			label: "승인일", 
133
+			minwidth: 120,
130 134
 			width: '8', fixed: false, align: 'center',
131 135
 			sortable: false, hidden: false
132 136
 		},
133 137
 		{
134 138
 			index: 'DSPT_RJCT_DT', name: 'dsptRjctDt',
135 139
 			label: "반려일", 
140
+			minwidth: 120,
136 141
 			width: '8', fixed: false, align: 'center',
137 142
 			sortable: false, hidden: false
138 143
 		},

+ 4 - 4
src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -65,7 +65,7 @@ const gridColModel = {
65 65
 		{
66 66
 			index: 'STORE_NM', name: 'storeNm',
67 67
 			label: "매장명", 
68
-			width: '13', fixed: false, align: 'center',
68
+			width: '13', fixed: false, align: 'left',
69 69
 			sortable: false, hidden: false
70 70
 		},
71 71
 		{
@@ -95,7 +95,7 @@ const gridColModel = {
95 95
 		{
96 96
 			index: 'STTL_REQ_AMT', name: 'sttlReqAmt',
97 97
 			label: '정산요청금액', 
98
-			width: '10', fixed: false, align: 'center',
98
+			width: '10', fixed: false, align: 'right',
99 99
 			sortable: false, hidden: false, 
100 100
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
101 101
 		},
@@ -106,7 +106,7 @@ const gridColModel = {
106 106
 			sortable: false, hidden: false
107 107
 		},	
108 108
 		{
109
-			index: 'UNPAId_AMT', name: 'unpaidAmt',
109
+			index: 'UNPAId_AMT', name: 'right',
110 110
 			label: '미납금액', 
111 111
 			width: '10', fixed: false, align: 'center',
112 112
 			sortable: false, hidden: false, 
@@ -115,7 +115,7 @@ const gridColModel = {
115 115
 		{
116 116
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
117 117
 			label: '사용가능한도', 
118
-			width: '10', fixed: false, align: 'center',
118
+			width: '10', fixed: false, align: 'right',
119 119
 			sortable: false, hidden: false, 
120 120
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
121 121
 		}