Quellcode durchsuchen

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

whakdo963 vor 2 Jahren
Ursprung
Commit
e92404bc22

+ 1 - 1
bin/src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -48,7 +48,7 @@
48 48
 											<div class="col-xs-4 itp_ip">
49 49
 												<div class="itp_form_change">
50 50
 													<div class="col-xs-7 itp_in">
51
-									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyid" value="" readonly="readonly">
51
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyId" value="" readonly="readonly">
52 52
 													</div>
53 53
 												</div>
54 54
 											</div>

+ 2 - 2
bin/src/main/webapp/app/vendinfo/VENDINFO03010.html

@@ -24,9 +24,9 @@
24 24
 										</div>
25 25
 										<div class="col-xs-3 itp_ip itp_noMar">
26 26
 											<div class="input-daterange input-group date">
27
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_STT_DT" class="form-control itp_input" name="fromDt" value="">
27
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_FROM_DT" class="form-control itp_input" name="fromDt" value="">
28 28
 												<span class="input-group-addon itp_date_to">~</span>
29
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_END_DT" class="form-control itp_input" name="toDt" value="">
29
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_TO_DT" class="form-control itp_input" name="toDt" value="">
30 30
 											</div>
31 31
 										</div>
32 32
 										<div class="col-xs-2 itp_ip itp_noMar">

+ 1 - 1
bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -278,7 +278,7 @@ let modifyObj = {
278 278
 			var vali_userPwConfirm = true;
279 279
 			*/
280 280
 			//if (vali_userId && vali_userStatCd && vali_userNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
281
-			if(modifyObj.isValid(formId)){
281
+			if(itp_fn_form_event.isValid(formId)){
282 282
 				let gridInsertData = [];
283 283
 				let gridUpdateData = [];
284 284
 				let gridDeleteData = [];

+ 6 - 2
bin/src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -112,14 +112,18 @@ let pageObj = {
112 112
 		view: function() {
113 113
 			// 버튼 권한설정
114 114
 			fn_proc_btn_auth('VENDINFO03010');
115
-				// 공통코드 표시
115
+			// 공통코드 표시
116 116
 			$('select').each(function() {
117 117
 				if($(this).data('select-code')) {
118 118
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
119 119
 				}
120 120
 			});
121
-				// 조회일자 지정
121
+			// 조회일자 지정	
122
+			var now = new Date();
122 123
 			$('#ITP_TAB_VENDINFO03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
124
+		
125
+			$('#ITP_FORM_VENDINFO03010_SEARCH_CONT_FROM_DT').datepicker('setDate', '2022.10.01');
126
+			$('#ITP_FORM_VENDINFO03010_SEARCH_CONT_TO_DT').datepicker('setDate', '2024.10.01');
123 127
 		},
124 128
 		grid: function() {
125 129
 			itp_fn_jqgrid_resize(VENDINFO03010_GRID_ID, VENDINFO03010_GRID_LIST, 'lg');

+ 1 - 0
src/main/webapp/app/stinfo/STINFO01010.html

@@ -18,6 +18,7 @@
18 18
 						<div class="itp_srh_border fix">
19 19
 							<div class="col-xs-12">
20 20
 								<form id="ITP_FORM_STINFO01010_SEARCH" class="form-horizontal">
21
+									<input type="hidden" id="ITP_FORM_STINFO01010_SEARCH_BRAND_ID" name="sbrandId" />
21 22
 									<div class="form-group">
22 23
 										<div class="col-xs-2 itp_ip itp_noMar">
23 24
 											<select id="ITP_FORM_STINFO01010_SERVICE_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="sbrandType">

+ 1 - 0
src/main/webapp/app/stinfo/STINFO01011.html

@@ -17,6 +17,7 @@
17 17
 						<div class="itp_srh_border fix">
18 18
 							<div class="col-xs-12">
19 19
 								<form id="ITP_FORM_STINFO01011_SEARCH" class="form-horizontal">
20
+									<input type="hidden" id="ITP_FORM_STINFO01011_SEARCH_BRAND_ID" name="sbrandId" />
20 21
 									<div class="form-group">
21 22
 										<div class="col-xs-2 itp_ip itp_noMar">
22 23
 											<select id="ITP_FORM_STINFO01011_SERVICE_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="sbrandType">

+ 33 - 24
src/main/webapp/app/stinfo/STINFO02010.html

@@ -17,6 +17,7 @@
17 17
 						<div class="itp_srh_border fix">
18 18
 							<div class="col-xs-12">
19 19
 								<form id="ITP_FORM_STINFO02010_SEARCH" class="form-horizontal">
20
+									<input type="hidden" id="ITP_FORM_STINFO02010_SEARCH_BRAND_ID" name="sbrandId" />
20 21
 									<div class="form-group">
21 22
 										<div class="col-xs-2 itp_ip itp_noMar">
22 23
 											<select id="ITP_FORM_STINFO02010_SERVICE_ST_DT" class="form-control itp_input" name="searchDateType">
@@ -87,7 +88,7 @@
87 88
 											<label class="col-xs-2 itp_lb">상태 *</label>
88 89
 											<div class="col-xs-4 itp_ip">
89 90
 												<div class="col-xs-7 itp_in">
90
-													<select id="ITP_FORM_STINFO02010_DETAIL_STORE_ST_CD" data-select-code="STORE_ST_CD" data-check-required="empty" class="form-control itp_input" name="stCd"></select>
91
+													<select id="ITP_FORM_STINFO02010_DETAIL_STORE_ST_CD" data-select-code="STORE_ST_CD" data-check-required="empty" class="form-control itp_input" name="storeStCd"></select>
91 92
 												</div>
92 93
 											</div>
93 94
 										</div>
@@ -97,9 +98,9 @@
97 98
 											<label class="col-xs-2 itp_lb">매장번호 *</label>
98 99
 											<div class="col-xs-4 itp_ip">
99 100
 												<div class="col-xs-7 itp_in fnStoreNm" style="top:4px;"></div>
100
-												<div class="col-xs-4 itp_in" style="margin-left:5px;">
101
+												<!--<div class="col-xs-4 itp_in" style="margin-left:5px;">
101 102
 													<button type="button" id="ITP_BTN_STINFO02010_RESET_PW" class="btn btn-danger btn-sm PWC" style="margin: -1px 0px 0px 3px; display:block;">비밀번호 초기화</button>
102
-												</div>
103
+												</div>-->
103 104
 											</div>
104 105
 											<label class="col-xs-2 itp_lb">매장구분 *</label>
105 106
 											<div class="col-xs-4 itp_ip">
@@ -130,7 +131,7 @@
130 131
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
131 132
 											<div class="col-xs-4 itp_ip">
132 133
 												<div class="col-xs-6 itp_in">
133
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_BSNS_REG_NO"  data-check-required="empty"class="form-control itp_input" name="bsnsRegNo" value="">
134
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_BSNS_REG_NO"  data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
134 135
 												</div>
135 136
 											</div>
136 137
 											<label class="col-xs-2 itp_lb">업종</label>
@@ -146,13 +147,13 @@
146 147
 											<label class="col-xs-2 itp_lb">법인번호</label>
147 148
 											<div class="col-xs-4 itp_ip">
148 149
 												<div class="col-xs-6 itp_in">
149
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="">
150
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="">
150 151
 												</div>
151 152
 											</div>
152 153
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
153 154
 											<div class="col-xs-4 itp_ip">
154 155
 												<div class="col-xs-7 itp_in">
155
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="telNo" value="">
156
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="">
156 157
 												</div>
157 158
 											</div>
158 159
 										</div>
@@ -168,7 +169,7 @@
168 169
 											<label class="col-xs-2 itp_lb">FAX</label>
169 170
 											<div class="col-xs-4 itp_ip">
170 171
 												<div class="col-xs-7 itp_in">
171
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_FAX_NO" class="form-control itp_input" name="faxNo" value="">
172
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_FAX_NO" data-key-up="tel" class="form-control itp_input" name="faxNo" value="">
172 173
 												</div>
173 174
 											</div>
174 175
 										</div>
@@ -178,7 +179,7 @@
178 179
 											<label class="col-xs-2 itp_lb">핸드폰</label>
179 180
 											<div class="col-xs-4 itp_ip">
180 181
 												<div class="col-xs-6 itp_in">
181
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_MBL_NO" class="form-control itp_input" name="mblNo" value="">
182
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_MBL_NO" data-key-up="tel" class="form-control itp_input" name="mblNo" value="">
182 183
 												</div>
183 184
 											</div>
184 185
 											<label class="col-xs-2 itp_lb">이메일 *</label>
@@ -213,13 +214,13 @@
213 214
 											<label class="col-xs-2 itp_lb">주소 *</label>
214 215
 											<div class="col-xs-10 itp_ip">
215 216
 												<div class="col-xs-1 itp_in">
216
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
217
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
217 218
 												</div>
218 219
 												<div class="col-xs-2 itp_in" style="width:10%;">
219 220
 													<button type="button" id="ITP_FORM_STINFO02010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
220 221
 												</div>
221 222
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
222
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ADRES" data-check-required="empty" class="form-control itp_input" name="addr1" value="" placeholder="기본주소">
223
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ADRES" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="addr1" value="" placeholder="기본주소">
223 224
 												</div>
224 225
 												<div class="col-xs-4 itp_in">
225 226
 													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ADRES_DTL" data-check-required="empty" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">
@@ -247,14 +248,14 @@
247 248
 												<label class="col-xs-2 itp_lb">매장계좌정보</label>
248 249
 												<div class="col-xs-12 itp_ip">
249 250
 													<div class="col-xs-2 itp_in">
250
-														<select id="ITP_FORM_STINFO02010_DETAIL_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
251
+														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
251 252
 														</select>
252 253
 													</div>
253 254
 													<div class="col-xs-4 itp_in">
254
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
255
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
255 256
 													</div>
256 257
 													<div class="col-xs-2 itp_in">
257
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
258
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
258 259
 													</div>
259 260
 												</div>
260 261
 											</div>
@@ -264,17 +265,17 @@
264 265
 												<label class="col-xs-2 itp_lb">정산타입*</label>
265 266
 												<div class="col-xs-4 itp_ip">
266 267
 													<div class="col-xs-7 itp_in">
267
-														<select id="ITP_FORM_STINFO02010_DETAIL_LOAN_DVSN" data-select-code="LOAN_DVSN" data-check-required="empty" class="form-control itp_input" name="loanDvsn">
268
+														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_LOAN_DVSN" data-select-code="LOAN_DVSN" data-check-required="empty" class="form-control itp_input" name="loanDvsn">
268 269
 														</select>
269 270
 													</div>
270 271
 													<div class="col-xs-4 itp_in">
271
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_LIMIT_AMT" class="form-control itp_input" name="limitAmt" placeholder="후불한도금액">
272
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREATE_LIMIT_AMT" class="form-control itp_input" name="limitAmt" placeholder="후불한도금액">
272 273
 													</div>
273 274
 												</div>
274 275
 												<label class="col-xs-2 itp_lb">창고사용여부</label>
275 276
 												<div class="col-xs-4 itp_ip">
276 277
 													<div class="col-xs-7 itp_in">
277
-														<select id="ITP_FORM_STINFO02010_DETAIL_WHS_USE_YN" data-select-code="WHS_USE_YN" class="form-control itp_input" name="whsUseYn">
278
+														<select id="ITP_FORM_STINFO02010_DETAIL_CREATE_WHS_USE_YN" data-select-code="WHS_USE_YN" class="form-control itp_input" name="whsUseYn">
278 279
 														</select>
279 280
 													</div>
280 281
 												</div>
@@ -287,11 +288,11 @@
287 288
 												<label class="col-xs-2 itp_lb">매장계좌정보</label>
288 289
 												<div class="col-xs-4 itp_ip" style="padding:0 0 0 15px;">
289 290
 													<div class="col-xs-4 itp_in">
290
-														<select id="ITP_FORM_STINFO02010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
291
+														<select id="ITP_FORM_STINFO02010_DETAIL_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
291 292
 														</select>
292 293
 													</div>
293 294
 													<div class="col-xs-5 itp_in" style="width:37%;">
294
-														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_RCV_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
295
+														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
295 296
 													</div>
296 297
 													<div class="col-xs-2 itp_in" style="width:22%; margin-right:0;">
297 298
 														<input type="text" id="ITP_FORM_STINFO02010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
@@ -315,10 +316,14 @@
315 316
 												<div class="col-xs-4 itp_ip">
316 317
 													<div class="col-xs-12 itp_in fnBrandAcctInfo"></div>
317 318
 												</div>
318
-												<label class="col-xs-2 itp_lb">가수금액</label>
319
+												<label class="col-xs-2 itp_lb"></label>
319 320
 												<div class="col-xs-4 itp_ip">
320
-													<div class="col-xs-12 itp_in fnAcctBal"></div>
321
+													<div class="col-xs-12 itp_in"></div>
321 322
 												</div>
323
+												<!--<label class="col-xs-2 itp_lb">가수금액</label>
324
+												<div class="col-xs-4 itp_ip">
325
+													<div class="col-xs-12 itp_in fnAcctBal"></div>
326
+												</div>-->
322 327
 											</div>
323 328
 										</div>
324 329
 										<div class="itp_form_in">
@@ -332,7 +337,7 @@
332 337
 												</div>
333 338
 												<label class="col-xs-2 itp_lb">현 잔여한도</label>
334 339
 												<div class="col-xs-4 itp_ip">
335
-													<div class="col-xs-12 itp_in fnTmpRcvAcctTotal"></div>
340
+													<div class="col-xs-12 itp_in fnAcctBal"></div>
336 341
 												</div>
337 342
 											</div>
338 343
 										</div>
@@ -514,10 +519,14 @@
514 519
 											<div class="col-xs-4 itp_ip">
515 520
 												<div class="col-xs-12 itp_in fnBrandAcctInfo"></div>
516 521
 											</div>
517
-											<label class="col-xs-2 itp_lb">가수금액</label>
522
+											<label class="col-xs-2 itp_lb"></label>
518 523
 											<div class="col-xs-4 itp_ip">
519
-												<div class="col-xs-12 itp_in fnAcctBal">(선입금일때 존재)</div>
524
+												<div class="col-xs-12 itp_in"></div>
520 525
 											</div>
526
+											<!--<label class="col-xs-2 itp_lb">가수금액</label>
527
+											<div class="col-xs-4 itp_ip">
528
+												<div class="col-xs-12 itp_in fnAcctBal">(선입금일때 존재)</div>
529
+											</div>-->
521 530
 										</div>
522 531
 									</div>
523 532
 									<div class="itp_form_in">
@@ -528,7 +537,7 @@
528 537
 											</div>
529 538
 											<label class="col-xs-2 itp_lb">현 잔여한도</label>
530 539
 											<div class="col-xs-4 itp_ip">
531
-												<div class="col-xs-7 itp_in fnLimitAmt"></div>
540
+												<div class="col-xs-7 itp_in fnAcctBal"></div>
532 541
 											</div>
533 542
 										</div>
534 543
 									</div>

+ 129 - 73
src/main/webapp/app/stinfo/STINFO02011.html

@@ -2,13 +2,13 @@
2 2
 	<div class="itp_cont">
3 3
 		<article class="itp_detail">
4 4
 			<div class="itp_det_head fix">
5
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>매장 정보</strong></h2>
5
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>매장 관리</strong></h2>
6 6
 				<div class="pull-right itp_cicon">
7 7
 					<button type="button" id="ITP_BTN_STINFO02011_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
8 8
 					<button type="button" id="ITP_BTN_STINFO02011_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
9 9
 					<button type="button" id="ITP_BTN_STINFO02011_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
10 10
 					<button type="button" id="ITP_BTN_STINFO02011_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon"></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
11
-					<button type="button" id="ITP_BTN_STINFO02011_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
11
+					<button type="button" id="ITP_BTN_STINFO02011_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
12 12
 				</div>
13 13
 			</div>
14 14
 			<div class="itp_det_in">
@@ -17,6 +17,7 @@
17 17
 						<div class="itp_srh_border fix">
18 18
 							<div class="col-xs-12">
19 19
 								<form id="ITP_FORM_STINFO02011_SEARCH" class="form-horizontal">
20
+									<input type="hidden" id="ITP_FORM_STINFO02011_SEARCH_BRAND_ID" name="sbrandId" />
20 21
 									<div class="form-group">
21 22
 										<div class="col-xs-2 itp_ip itp_noMar">
22 23
 											<select id="ITP_FORM_STINFO02011_SERVICE_ST_DT" class="form-control itp_input" name="searchDateType">
@@ -87,7 +88,7 @@
87 88
 											<label class="col-xs-2 itp_lb">상태 *</label>
88 89
 											<div class="col-xs-4 itp_ip">
89 90
 												<div class="col-xs-7 itp_in">
90
-													<select id="ITP_FORM_STINFO02011_DETAIL_STORE_ST_CD" data-select-code="STORE_ST_CD" data-check-required="empty" class="form-control itp_input" name="stCd"></select>
91
+													<select id="ITP_FORM_STINFO02011_DETAIL_STORE_ST_CD" data-select-code="STORE_ST_CD" data-check-required="empty" class="form-control itp_input" name="storeStCd"></select>
91 92
 												</div>
92 93
 											</div>
93 94
 										</div>
@@ -96,7 +97,10 @@
96 97
 										<div class="form-group">
97 98
 											<label class="col-xs-2 itp_lb">매장번호 *</label>
98 99
 											<div class="col-xs-4 itp_ip">
99
-												<div class="col-xs-10 itp_in fnStoreNm"></div>
100
+												<div class="col-xs-7 itp_in fnStoreNm" style="top:4px;"></div>
101
+												<!--<div class="col-xs-4 itp_in" style="margin-left:5px;">
102
+													<button type="button" id="ITP_BTN_STINFO02011_RESET_PW" class="btn btn-danger btn-sm PWC" style="margin: -1px 0px 0px 3px; display:block;">비밀번호 초기화</button>
103
+												</div>-->
100 104
 											</div>
101 105
 											<label class="col-xs-2 itp_lb">매장구분 *</label>
102 106
 											<div class="col-xs-4 itp_ip">
@@ -127,7 +131,7 @@
127 131
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
128 132
 											<div class="col-xs-4 itp_ip">
129 133
 												<div class="col-xs-6 itp_in">
130
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_BSNS_REG_NO"  data-check-required="empty"class="form-control itp_input" name="bsnsRegNo" value="">
134
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_BSNS_REG_NO"  data-check-required="empty" data-key-up="regNo" class="form-control itp_input" name="bsnsRegNo" value="">
131 135
 												</div>
132 136
 											</div>
133 137
 											<label class="col-xs-2 itp_lb">업종</label>
@@ -143,13 +147,13 @@
143 147
 											<label class="col-xs-2 itp_lb">법인번호</label>
144 148
 											<div class="col-xs-4 itp_ip">
145 149
 												<div class="col-xs-6 itp_in">
146
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CORP_REG_NO" class="form-control itp_input" name="corpRegNo" value="">
150
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CORP_REG_NO" data-key-up="corpNo" class="form-control itp_input" name="corpRegNo" value="">
147 151
 												</div>
148 152
 											</div>
149 153
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
150 154
 											<div class="col-xs-4 itp_ip">
151 155
 												<div class="col-xs-7 itp_in">
152
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="telNo" value="">
156
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="telNo" value="">
153 157
 												</div>
154 158
 											</div>
155 159
 										</div>
@@ -165,7 +169,7 @@
165 169
 											<label class="col-xs-2 itp_lb">FAX</label>
166 170
 											<div class="col-xs-4 itp_ip">
167 171
 												<div class="col-xs-7 itp_in">
168
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_FAX_NO" class="form-control itp_input" name="faxNo" value="">
172
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_FAX_NO" data-key-up="tel" class="form-control itp_input" name="faxNo" value="">
169 173
 												</div>
170 174
 											</div>
171 175
 										</div>
@@ -175,7 +179,7 @@
175 179
 											<label class="col-xs-2 itp_lb">핸드폰</label>
176 180
 											<div class="col-xs-4 itp_ip">
177 181
 												<div class="col-xs-6 itp_in">
178
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_MBL_NO" class="form-control itp_input" name="mblNo" value="">
182
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_MBL_NO" data-key-up="tel" class="form-control itp_input" name="mblNo" value="">
179 183
 												</div>
180 184
 											</div>
181 185
 											<label class="col-xs-2 itp_lb">이메일 *</label>
@@ -207,101 +211,149 @@
207 211
 									</div>
208 212
 									<div class="itp_form_in">
209 213
 										<div class="form-group">
210
-											<label class="col-xs-2 itp_lb">매장계좌정보</label>
211
-											<div class="col-xs-12 itp_ip">
212
-												<div class="col-xs-2 itp_in">
213
-													<select id="ITP_FORM_STINFO02011_DETAIL_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
214
-													</select>
214
+											<label class="col-xs-2 itp_lb">주소 *</label>
215
+											<div class="col-xs-10 itp_ip">
216
+												<div class="col-xs-1 itp_in">
217
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
215 218
 												</div>
216
-												<div class="col-xs-4 itp_in">
217
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
219
+												<div class="col-xs-2 itp_in" style="width:10%;">
220
+													<button type="button" id="ITP_FORM_STINFO02011_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
218 221
 												</div>
219
-												<div class="col-xs-2 itp_in">
220
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
222
+												<div class="col-xs-4 itp_in" style="margin:0 5px;">
223
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ADRES" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="addr1" value="" placeholder="기본주소">
224
+												</div>
225
+												<div class="col-xs-4 itp_in">
226
+													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ADRES_DTL" data-check-required="empty" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">
221 227
 												</div>
222 228
 											</div>
223 229
 										</div>
224 230
 									</div>
225 231
 									<div class="itp_form_in">
226
-										<div class="form-group">
227
-											<label class="col-xs-2 itp_lb">정산타입*</label>
228
-											<div class="col-xs-4 itp_ip">
229
-												<div class="col-xs-7 itp_in">
230
-													<select id="ITP_FORM_STINFO02011_DETAIL_LOAN_DVSN" data-select-code="LOAN_DVSN" data-check-required="empty" class="form-control itp_input" name="loanDvsn">
231
-													</select>
232
-												</div>
233
-												<div class="col-xs-4 itp_in">
234
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_LIMIT_AMT" data-check-required="empty" class="form-control itp_input" name="limitAmt" placeholder="후불한도금액">
232
+										<div class="form-group border">
233
+											<label class="col-xs-2 itp_lb"></label>
234
+											<div class="col-xs-10 itp_ip">
235
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_LOTS_ADDRESS" value="" />
236
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_STREET_ADDRESS" value="" />
237
+												<input type="hidden" name="latX" id="ITP_FORM_STINFO02011_DETAIL_LAT" value="" />
238
+												<input type="hidden" name="longY" id="ITP_FORM_STINFO02011_DETAIL_LNG" value="" />
239
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_HJ_DONG" value="" />
240
+												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_BJ_DONG" value="" />
241
+												<div id="ITP_FORM_STINFO02011_DETAIL_MAP" style="width:700px; height:400px;"></div>
242
+											</div>
243
+										</div>
244
+									</div>
245
+									<div class="itp_form_change">
246
+										<div class="itp_form_in">
247
+											<div class="form-group">
248
+												<label class="col-xs-2 itp_lb">매장계좌정보</label>
249
+												<div class="col-xs-12 itp_ip">
250
+													<div class="col-xs-2 itp_in">
251
+														<select id="ITP_FORM_STINFO02011_DETAIL_CREATE_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
252
+														</select>
253
+													</div>
254
+													<div class="col-xs-4 itp_in">
255
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
256
+													</div>
257
+													<div class="col-xs-2 itp_in">
258
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
259
+													</div>
235 260
 												</div>
236 261
 											</div>
237
-											<label class="col-xs-2 itp_lb">창고사용여부 *</label>
238
-											<div class="col-xs-4 itp_ip">
239
-												<div class="col-xs-7 itp_in">
240
-													<select id="ITP_FORM_STINFO02011_DETAIL_WHS_USE_YN" data-select-code="WHS_USE_YN" data-check-required="empty" class="form-control itp_input" name="whsUseYn">
241
-													</select>
262
+										</div>
263
+										<div class="itp_form_in">
264
+											<div class="form-group">
265
+												<label class="col-xs-2 itp_lb">정산타입*</label>
266
+												<div class="col-xs-4 itp_ip">
267
+													<div class="col-xs-7 itp_in">
268
+														<select id="ITP_FORM_STINFO02011_DETAIL_CREATE_LOAN_DVSN" data-select-code="LOAN_DVSN" data-check-required="empty" class="form-control itp_input" name="loanDvsn">
269
+														</select>
270
+													</div>
271
+													<div class="col-xs-4 itp_in">
272
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_CREATE_LIMIT_AMT" class="form-control itp_input" name="limitAmt" placeholder="후불한도금액">
273
+													</div>
274
+												</div>
275
+												<label class="col-xs-2 itp_lb">창고사용여부</label>
276
+												<div class="col-xs-4 itp_ip">
277
+													<div class="col-xs-7 itp_in">
278
+														<select id="ITP_FORM_STINFO02011_DETAIL_CREATE_WHS_USE_YN" data-select-code="WHS_USE_YN" class="form-control itp_input" name="whsUseYn">
279
+														</select>
280
+													</div>
242 281
 												</div>
243 282
 											</div>
244 283
 										</div>
245 284
 									</div>
246 285
 									<div class="itp_form_info">
286
+										<div class="itp_form_in">
287
+											<div class="form-group">
288
+												<label class="col-xs-2 itp_lb">매장계좌정보</label>
289
+												<div class="col-xs-4 itp_ip" style="padding:0 0 0 15px;">
290
+													<div class="col-xs-4 itp_in">
291
+														<select id="ITP_FORM_STINFO02011_DETAIL_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
292
+														</select>
293
+													</div>
294
+													<div class="col-xs-5 itp_in" style="width:37%;">
295
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
296
+													</div>
297
+													<div class="col-xs-2 itp_in" style="width:22%; margin-right:0;">
298
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
299
+													</div>
300
+												</div>
301
+												<label class="col-xs-2 itp_lb">정산타입*</label>
302
+												<div class="col-xs-4 itp_ip">
303
+													<div class="col-xs-7 itp_in">
304
+														<select id="ITP_FORM_STINFO02011_DETAIL_LOAN_DVSN" data-select-code="LOAN_DVSN" data-check-required="empty" class="form-control itp_input" name="loanDvsn">
305
+														</select>
306
+													</div>
307
+													<div class="col-xs-4 itp_in">
308
+														<input type="text" id="ITP_FORM_STINFO02011_DETAIL_LIMIT_AMT" class="form-control itp_input" name="limitAmt" placeholder="후불한도금액">
309
+													</div>
310
+												</div>
311
+											</div>
312
+										</div>
247 313
 										<div class="itp_form_in">
248 314
 											<div class="form-group">
249 315
 												<label class="col-xs-2 itp_lb">입금계좌정보</label>
250 316
 												<div class="col-xs-4 itp_ip">
251 317
 													<div class="col-xs-12 itp_in fnBrandAcctInfo"></div>
252 318
 												</div>
253
-												<label class="col-xs-2 itp_lb">가수금액</label>
319
+												<label class="col-xs-2 itp_lb"></label>
254 320
 												<div class="col-xs-4 itp_ip">
255
-													<div class="col-xs-12 itp_in fnAcctBal"></div>
321
+													<div class="col-xs-12 itp_in"></div>
256 322
 												</div>
323
+												<!--<label class="col-xs-2 itp_lb">가수금액</label>
324
+												<div class="col-xs-4 itp_ip">
325
+													<div class="col-xs-12 itp_in fnAcctBal"></div>
326
+												</div>-->
257 327
 											</div>
258 328
 										</div>
259 329
 										<div class="itp_form_in">
260 330
 											<div class="form-group">
261
-												<label class="col-xs-2 itp_lb">현 잔여한도</label>
331
+												<label class="col-xs-2 itp_lb">창고사용여부</label>
262 332
 												<div class="col-xs-4 itp_ip">
263
-													<div class="col-xs-12 itp_in fnTmpRcvAcctTotal"></div>
333
+													<div class="col-xs-7 itp_in">
334
+														<select id="ITP_FORM_STINFO02011_DETAIL_WHS_USE_YN" data-select-code="WHS_USE_YN" class="form-control itp_input" name="whsUseYn">
335
+														</select>
336
+													</div>
264 337
 												</div>
265
-												<label class="col-xs-2 itp_lb">수정일</label>
338
+												<label class="col-xs-2 itp_lb">현 잔여한도</label>
266 339
 												<div class="col-xs-4 itp_ip">
267
-													<div class="col-xs-12 itp_in fnSysChgDttm"></div>
340
+													<div class="col-xs-12 itp_in fnAcctBal"></div>
268 341
 												</div>
269 342
 											</div>
270 343
 										</div>
271
-									</div>
272
-									<div class="itp_form_in">
273
-										<div class="form-group">
274
-											<label class="col-xs-2 itp_lb">주소 *</label>
275
-											<div class="col-xs-10 itp_ip">
276
-												<div class="col-xs-1 itp_in">
277
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">
278
-												</div>
279
-												<div class="col-xs-2 itp_in" style="width:10%;">
280
-													<button type="button" id="ITP_FORM_STINFO02011_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
281
-												</div>
282
-												<div class="col-xs-4 itp_in" style="margin:0 5px;">
283
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ADRES" data-check-required="empty" class="form-control itp_input" name="addr1" value="" placeholder="기본주소">
344
+										<div class="itp_form_in">
345
+											<div class="form-group">
346
+												<label class="col-xs-2 itp_lb">수정일</label>
347
+												<div class="col-xs-4 itp_ip">
348
+													<div class="col-xs-12 itp_in fnSysChgDttm"></div>
284 349
 												</div>
285
-												<div class="col-xs-4 itp_in">
286
-													<input type="text" id="ITP_FORM_STINFO02011_DETAIL_ADRES_DTL" data-check-required="empty" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">
350
+												<label class="col-xs-2 itp_lb">폐점일</label>
351
+												<div class="col-xs-4 itp_ip">
352
+													<div class="col-xs-12 itp_in fnCloseDt"></div>
287 353
 												</div>
288 354
 											</div>
289 355
 										</div>
290 356
 									</div>
291
-									<div class="itp_form_in">
292
-										<div class="form-group border">
293
-											<label class="col-xs-2 itp_lb"></label>
294
-											<div class="col-xs-10 itp_ip">
295
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_LOTS_ADDRESS" value="" />
296
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_STREET_ADDRESS" value="" />
297
-												<input type="hidden" name="latX" id="ITP_FORM_STINFO02011_DETAIL_LAT" value="" />
298
-												<input type="hidden" name="longY" id="ITP_FORM_STINFO02011_DETAIL_LNG" value="" />
299
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_HJ_DONG" value="" />
300
-												<input type="hidden" id="ITP_FORM_STINFO02011_DETAIL_BJ_DONG" value="" />
301
-												<div id="ITP_FORM_STINFO02011_DETAIL_MAP" style="width:700px; height:400px;"></div>
302
-											</div>
303
-										</div>
304
-									</div>
305 357
 								</section>
306 358
 							</form>
307 359
 						</div>
@@ -429,9 +481,9 @@
429 481
 										<div class="form-group">
430 482
 											<label class="col-xs-2 itp_lb">주소 *</label>
431 483
 											<div class="col-xs-10 itp_ip">
432
-												<div class="col-xs-7 itp_in fnZipNo"></div>
433
-												<div class="col-xs-7 itp_in fnLoadAddr"></div>
434
-												<div class="col-xs-7 itp_in fnDtlAddr"></div>
484
+												<div class="col-xs-a itp_in fnZipNo"></div>
485
+												<div class="col-xs-a itp_in fnLoadAddr"></div>
486
+												<div class="col-xs-a itp_in fnDtlAddr"></div>
435 487
 											</div>
436 488
 										</div>
437 489
 									</div>
@@ -467,10 +519,14 @@
467 519
 											<div class="col-xs-4 itp_ip">
468 520
 												<div class="col-xs-12 itp_in fnBrandAcctInfo"></div>
469 521
 											</div>
470
-											<label class="col-xs-2 itp_lb">가수금액</label>
522
+											<label class="col-xs-2 itp_lb"></label>
523
+											<div class="col-xs-4 itp_ip">
524
+												<div class="col-xs-12 itp_in"></div>
525
+											</div>
526
+											<!--<label class="col-xs-2 itp_lb">가수금액</label>
471 527
 											<div class="col-xs-4 itp_ip">
472 528
 												<div class="col-xs-12 itp_in fnAcctBal">(선입금일때 존재)</div>
473
-											</div>
529
+											</div>-->
474 530
 										</div>
475 531
 									</div>
476 532
 									<div class="itp_form_in">
@@ -481,7 +537,7 @@
481 537
 											</div>
482 538
 											<label class="col-xs-2 itp_lb">현 잔여한도</label>
483 539
 											<div class="col-xs-4 itp_ip">
484
-												<div class="col-xs-7 itp_in fnLimitAmt"></div>
540
+												<div class="col-xs-7 itp_in fnAcctBal"></div>
485 541
 											</div>
486 542
 										</div>
487 543
 									</div>

+ 1 - 0
src/main/webapp/app/stinfo/STINFO03010.html

@@ -17,6 +17,7 @@
17 17
 						<div class="itp_srh_border fix">
18 18
 							<div class="col-xs-12">
19 19
 								<form id="ITP_FORM_STINFO03010_SEARCH" class="form-horizontal">
20
+									<input type="hidden" id="ITP_FORM_STINFO03010_SEARCH_BRAND_ID" name="sbrandId" />
20 21
 									<div class="form-group">
21 22
 										<div class="col-xs-2 itp_ip itp_noMar">
22 23
 											<select id="ITP_FORM_STINFO03010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sstCd">

+ 25 - 20
src/main/webapp/app/stinfo/STINFO04010.html

@@ -17,6 +17,7 @@
17 17
 						<div class="itp_srh_border fix">
18 18
 							<div class="col-xs-12">
19 19
 								<form id="ITP_FORM_STINFO04010_SEARCH" class="form-horizontal">
20
+									<input type="hidden" id="ITP_FORM_STINFO04010_SEARCH_BRAND_ID" name="sbrandId" />
20 21
 									<div class="form-group">
21 22
 										<div class="col-xs-2 itp_ip itp_noMar">
22 23
 											<select id="ITP_FORM_STINFO04010_SERVICE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sitemStCd">
@@ -100,7 +101,7 @@
100 101
 											<label class="col-xs-2 itp_lb">상태 *</label>
101 102
 											<div class="col-xs-3 itp_ip">
102 103
 												<div class="col-xs-9 itp_in">
103
-								               		<select id="ITP_FORM_STINFO04010_DETAIL_ST_CD" data-select-code="ST_CD" data-check-required="empty" class="form-control itp_input default_st_cd" name="itemStCd"></select>
104
+								               		<select id="ITP_FORM_STINFO04010_DETAIL_ST_CD" data-select-code="ITEM_ST_CD" data-check-required="empty" class="form-control itp_input default_st_cd" name="itemStCd"></select>
104 105
 												</div>
105 106
 											</div>
106 107
 										</div>
@@ -351,28 +352,33 @@
351 352
 										</div>
352 353
 									</div>
353 354
 									<div class="itp_form_in">
354
-										<div class="form-group border">
355
+										<div class="form-group colspan">
355 356
 											<label class="col-xs-2 itp_lb">품목이미지</label>
356
-											<div class="col-xs-12 itp_ip colspan">
357
-												<div class="col-xs-1 itp_in" style="width:auto;">
358
-													<img src="/oqpo-view/images/item-list.jpg" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:400px; " class="form-control itp_input" name="" >
357
+											<div class="col-xs-10 itp_ip colspan">
358
+												<div class="fileupload-wrapper">
359
+													<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
360
+													<div id="ITP_STINFO04010_DETAIL_UPLOAD" data-show-yn="Y"></div>
359 361
 												</div>
360
-												<div class="col-xs-6 itp_in" style="top:12px;">
361
-													<div class="fileupload-wrapper">
362
-														<!-- data-show-yn: 파일업로드를 할 수 있는 권한이 있는지 없는지.. -->
363
-														<div id="ITP_STINFO04010_DETAIL_UPLOAD" data-show-yn="Y"></div>
364
-													</div>
362
+											</div>
363
+										</div>
364
+										<!--<div class="form-group border">
365
+											<label class="col-xs-2 itp_lb">품목이미지</label>
366
+											<div class="col-xs-6 itp_in" style="top:12px;">
367
+												<div class="fileupload-wrapper">
368
+													<div id="ITP_STINFO04010_DETAIL_UPLOAD" data-show-yn="Y"></div>
365 369
 												</div>
366
-												<!--<div class="col-xs-4 itp_in" style="padding-right:5px;">
370
+											</div>
371
+											<div class="col-xs-12 itp_ip colspan">
372
+												<div class="col-xs-4 itp_in" style="padding-right:5px;">
367 373
 													<input type="text" id="ITP_FORM_STINFO04010_DETAIL_FILE_PATH" class="form-control itp_input" name="FilePath" value="">
368 374
 												</div>
369 375
 												<div class="col-xs-6 itp_in">
370 376
 													<div class="fileupload-wrapper">
371 377
 														<div id="ITP_STINFO04010_DETAIL_UPLOAD" data-show-yn="Y"></div>
372 378
 													</div>
373
-												</div>-->
379
+												</div>
374 380
 											</div>
375
-										</div>
381
+										</div>-->
376 382
 									</div>
377 383
 								</section>		
378 384
 							</form>
@@ -406,14 +412,14 @@
406 412
 									<div class="itp_form_in">
407 413
 										<div class="form-group">
408 414
 											<label class="col-xs-2 itp_lb">품목분류 *</label>
409
-											<div class="col-xs-10 itp_ip">
410
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass1" style="width:2%;">s</div>
415
+											<div class="col-xs-12 itp_ip">
416
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass1" style="width:auto;"></div>
411 417
 												<label class="col-xs-1 itp_in" style="width:2%;">></label>
412
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass2" style="width:2%;">s</div>
418
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass2" style="width:auto;"></div>
413 419
 												<label class="col-xs-1 itp_in" style="width:2%;">></label>
414
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass3" style="width:2%;">s</div>
420
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass3" style="width:auto;"></div>
415 421
 												<label class="col-xs-1 itp_in" style="width:2%;">></label>
416
-												<div class="col-xs-1 itp_in itp_noMar fnItemClass4" style="width:2%;">s</div>
422
+												<div class="col-xs-1 itp_in itp_noMar fnItemClass4" style="width:auto;"></div>
417 423
 											</div>
418 424
 										</div>
419 425
 									</div>
@@ -581,8 +587,7 @@
581 587
 										<div class="form-group border">
582 588
 											<label class="col-xs-2 itp_lb">품목이미지</label>
583 589
 											<div class="col-xs-12 itp_ip colspan">
584
-												<div class="col-xs-1 itp_in" style="width:auto;">
585
-													<img src="/oqpo-view/images/item-list.jpg" alt="로고 샘플" id="ITP_FORM_STINFO04010_DETAIL "style="top:12px; left:12px; height:150px; width:412px; " class="form-control itp_input" name="" >
590
+												<div class="col-xs-1 itp_in fnItemImageFile" style="width:auto;">
586 591
 												</div>
587 592
 											</div>
588 593
 										</div>

+ 4 - 3
src/main/webapp/app/stinfo/STINFO05010.html

@@ -17,6 +17,7 @@
17 17
 						<div class="itp_srh_border fix">
18 18
 							<div class="col-xs-12">
19 19
 								<form id="ITP_FORM_STINFO05010_SEARCH" class="form-horizontal">
20
+									<input type="hidden" id="ITP_FORM_STINFO05010_SEARCH_BRAND_ID" name="sbrandId" />
20 21
 									<div class="form-group">
21 22
 										<div class="col-xs-3 itp_ip itp_noMar">
22 23
 											<div class="input-daterange input-group date">
@@ -106,13 +107,13 @@
106 107
 												<label class="col-xs-2 itp_lb">품목번호 *</label>
107 108
 												<div class="col-xs-10 itp_ip">
108 109
 													<div class="col-xs-3 itp_in">
109
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_ITEM_ID" data-check-required="empty" data-check-required="empty" class="form-control itp_input" name="itemId" value="IT2022001" maxlength="100" readonly>
110
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_ITEM_ID" data-check-required="empty" class="form-control itp_input" name="itemId" value="" maxlength="100" readonly>
110 111
 									                </div>
111 112
 													<div class="col-xs-3 itp_in" style="padding-left: 5px;">
112
-														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_ITEM_NM" data-check-required="empty" class="form-control itp_input" name="itemNm" value="품목 A" maxlength="100" readonly>
113
+														<input type="text" id="ITP_FORM_STINFO05010_DETAIL_ITEM_NM" data-check-required="empty" class="form-control itp_input" name="itemNm" value="" maxlength="100" readonly>
113 114
 									                </div>
114 115
 													<div class="col-xs-2 itp_in" style="padding-left: 5px;">
115
-														<button type="button" id="ITP_BTN_STINFO05010_DETAILITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
116
+														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_ITEM_SRH_" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
116 117
 														<button type="button" id="ITP_BTN_STINFO05010_DETAIL_ITEM_DELETE" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
117 118
 									                </div>
118 119
 												</div>

+ 2 - 1
src/main/webapp/app/stinfo/STINFO06010.html

@@ -17,7 +17,8 @@
17 17
 							<div class="col-xs-12">
18 18
 								<form id="ITP_FORM_STINFO06010_SEARCH" class="form-horizontal">
19 19
 									<input type="hidden" id="ITP_FORM_STINFO06010_SEARCH_BRAND_ID" name="sbrandId" value="">
20
-									<div class="form-group">
20
+									<input type="hidden" id="ITP_FORM_STINFO06010_SEARCH_STORE_ID" name="sstoreId" value="">
21
+									<div id="ITP_FORM_STINFO06010_SEARCH_STORE" class="form-group">
21 22
 										<div class="col-xs-3 itp_ip itp_noMar">
22 23
 											<input type="text" id="ITP_FORM_STINFO06010_SEARCH_STORE_NM" class="form-control itp_input" name="sstoreNm" placeholder="매장명" />
23 24
 										</div>

+ 1 - 1
src/main/webapp/app/vendinfo/VENDINFO01010.html

@@ -48,7 +48,7 @@
48 48
 											<div class="col-xs-4 itp_ip">
49 49
 												<div class="itp_form_change">
50 50
 													<div class="col-xs-7 itp_in">
51
-									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyid" value="" readonly="readonly">
51
+									                	<input type="text" id="ITP_FORM_VENDINFO01010_DETAIL_SPPLY_ID" data-check-required="empty" class="form-control itp_input" name="spplyId" value="" readonly="readonly">
52 52
 													</div>
53 53
 												</div>
54 54
 											</div>

+ 2 - 2
src/main/webapp/app/vendinfo/VENDINFO03010.html

@@ -24,9 +24,9 @@
24 24
 										</div>
25 25
 										<div class="col-xs-3 itp_ip itp_noMar">
26 26
 											<div class="input-daterange input-group date">
27
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_STT_DT" class="form-control itp_input" name="fromDt" value="">
27
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_FROM_DT" class="form-control itp_input" name="fromDt" value="">
28 28
 												<span class="input-group-addon itp_date_to">~</span>
29
-												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_END_DT" class="form-control itp_input" name="toDt" value="">
29
+												<input type="text" id="ITP_FORM_VENDINFO03010_SEARCH_CONT_TO_DT" class="form-control itp_input" name="toDt" value="">
30 30
 											</div>
31 31
 										</div>
32 32
 										<div class="col-xs-2 itp_ip itp_noMar">

+ 1 - 0
src/main/webapp/js/app/locales/locale-ko.js

@@ -144,6 +144,7 @@ const ITP_MSG_LOCALE = (function() {
144 144
 			"itemNm": "품목명",
145 145
 			"itemTypeNm": "품목유형",
146 146
 			"itemClassNm": "품목분류",
147
+			"itemClassMgntNo": "품목분류관리번호",
147 148
 			"podrPssblDvsnNm": "발주여부",
148 149
 			"unit": "기본단위",
149 150
 			"pchItemYn": "구매품목여부",

+ 2 - 2
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -45,7 +45,7 @@ let API_DETAIL_INFO 		= '/api/user/info-user';
45 45
 let API_DETAIL_SAVE 		= '/api/user/save-user';
46 46
 let API_CHECK_DUPLICATE 	= '/api/user/check-duplicate';
47 47
 let API_INTI_USERPW 		= '/api/user/inti-userpw';
48
-let BRAND_POP_GRID_LIST 	= '/api/brand/pop-grid-list';
48
+let API_POP_GRID_LIST 		= '/api/brand/pop-grid-list';
49 49
 
50 50
 /*화면 Grid ColModel*/
51 51
 const gridColModel = {
@@ -206,7 +206,7 @@ let pageObj = {
206 206
 					var param = {
207 207
 						'afflShopId': _this.afflShopId
208 208
 					};
209
-					fn_ajax_call(BRAND_POP_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
209
+					fn_ajax_call(API_POP_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
210 210
 				} else {
211 211
 					var brandList = [{'brandId': _this.brandId, 'brandNm': _this.brandNm}];
212 212
 					this.setBrand(brandList);

+ 47 - 23
src/main/webapp/js/app/stinfo/ITP_STINFO02010.js

@@ -145,6 +145,7 @@ let pageObj = {
145 145
 	ui: {
146 146
 		init: function () {
147 147
 			this.view();
148
+			this.form();
148 149
 			this.grid();
149 150
 			this.ready();
150 151
 		},
@@ -164,6 +165,16 @@ let pageObj = {
164 165
 			$('#ITP_TAB_STINFO02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
165 166
 			$('#ITP_FORM_STINFO02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
166 167
 			$('#ITP_FORM_STINFO02010_SEARCH_TO_DT').datepicker('setDate', new Date());
168
+
169
+			// form alert message 주입
170
+			$('input[data-alert-required="ONLYCHK"]').each(function() {
171
+				if($(this).data('alert-msg') === 'addrses') {
172
+					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
173
+				}
174
+			});
175
+		},
176
+		form: function() {
177
+			itp_fn_form_event.onKeyup('#ITP_FORM_STINFO02010_DETAIL');
167 178
 		},
168 179
 		grid: function() {
169 180
 			itp_fn_jqgrid_resize(STINFO02010_GRID_ID, STINFO02010_GRID_LIST, 'lg');
@@ -207,6 +218,7 @@ let pageObj = {
207 218
 		if(mode == 'LIST') { // 목록
208 219
 			$('#ITP_AJAX_STINFO02010_LIST_CONTAINER').show();
209 220
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02010_SRH', '#ITP_BTN_STINFO02010_NEWREG']);
221
+			$('#ITP_FORM_STINFO02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
210 222
 		} else if(mode == 'ADD') { // 등록
211 223
 			$('#ITP_AJAX_STINFO02010_DETAIL_CONTAINER').show();
212 224
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02010_CANCELLIST', '#ITP_BTN_STINFO02010_SAVE']);
@@ -227,8 +239,16 @@ let pageObj = {
227 239
 			$('#ITP_FORM_STINFO02010_DETAIL .fnStoreNm').text('(자동부여)');
228 240
 			$('#ITP_FORM_STINFO02010_DETAIL_STORE_ID').removeAttr('readonly');
229 241
 			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_info').hide();
242
+			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_info').find('input, select').each(function(i, elem) {
243
+				if($(this).data('check-required')) $(this).data('check-required', '');
244
+				$(this).attr('disabled', true);
245
+			});
230 246
 			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_change').show();
231
-			$('#ITP_BTN_STINFO02010_RESET_PW').hide();
247
+			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_change').find('input, select').each(function(i, elem) {
248
+				if($(this).data('check-required')) $(this).data('check-required', 'empty');
249
+				$(this).attr('disabled', false);
250
+			});
251
+			// $('#ITP_BTN_STINFO02010_RESET_PW').hide();
232 252
 
233 253
 		} else if(mode == 'MODIFY') { // 수정
234 254
 			$('#ITP_AJAX_STINFO02010_DETAIL_CONTAINER').show();
@@ -239,9 +259,17 @@ let pageObj = {
239 259
 			$('#ITP_FORM_STINFO02010_DETAIL .fnBrandNm').text(fn_make_user_info.get('brandNm'));
240 260
 
241 261
 			$('#ITP_FORM_STINFO02010_DETAIL_STORE_ID').attr('readonly', true);
262
+			// $('#ITP_BTN_STINFO02010_RESET_PW').show();
242 263
 			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_info').show();
243
-			$('#ITP_BTN_STINFO02010_RESET_PW').show();
264
+			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_info').find('input, select').each(function(i, elem) {
265
+				if($(this).data('check-required')) $(this).data('check-required', 'empty');
266
+				$(this).attr('disabled', false);
267
+			});
244 268
 			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_change').hide();
269
+			$('#ITP_FORM_STINFO02010_DETAIL .itp_form_change').find('input, select').each(function(i, elem) {
270
+				if($(this).data('check-required')) $(this).data('check-required', '');
271
+				$(this).attr('disabled', true);
272
+			});
245 273
 
246 274
 		} else if(mode == 'VIEW') { // 보기
247 275
 			$('#ITP_AJAX_STINFO02010_VIEW_CONTAINER').show();
@@ -447,9 +475,9 @@ let modifyObj = {
447 475
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
448 476
 		kakaoMap.init('ITP_FORM_STINFO02010_DETAIL', cmpyAdres);
449 477
 
450
-		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_DPST_BNK_CD').text(result.storeBnkCd);
451
-		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_ACCT_NO').text(result.storeAcctNo);
452
-		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OWAC_NM').text(result.storeOwacNm);
478
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_BNK_CD').val(result.storeBnkCd);
479
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_ACCT_NO').val(result.storeAcctNo);
480
+		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_OWAC_NM').val(result.storeOwacNm);
453 481
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
454 482
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_LIMIT_AMT').val(result.limitAmt);
455 483
 		$('#ITP_FORM_STINFO02010_DETAIL #ITP_FORM_STINFO02010_DETAIL_WHS_USE_YN').val(result.whsUseYn);
@@ -477,26 +505,22 @@ let createObj = {
477 505
 			const formId = '#ITP_FORM_STINFO02010_DETAIL';
478 506
 			itp_fn_form_clear_validate(null, formId);
479 507
 
480
-			if (createObj.isValid(formId)) {
481
-				let param = $(formId).serializeObject();
482
-				console.log(JSON.stringify(param));
483
-				var searhFn = function() {
484
-					ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
485
-					listObj.grid.search();
508
+			// console.log($(formId).serializeObject());
509
+			if (itp_fn_form_event.isValid(formId)) {
510
+				var modalFn = {
511
+					callBack: (args) => {
512
+						itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
513
+						let param = $(formId).serializeObject();
514
+						console.log(JSON.stringify(param));
515
+						var searhFn = function () {
516
+							ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
517
+							listObj.grid.search();
518
+						}
519
+						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
520
+					}
486 521
 				};
487
-				fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
522
+				itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
488 523
 			}
489 524
 		}
490
-	},
491
-	isValid: function(formId) {
492
-		var isValid = false;
493
-		$(formId).find('input, select, checkbox, textarea').each(function(k) {
494
-			if($(this).data('check-required')) {
495
-				var arry = $(this).data('check-required').split(',');
496
-				isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
497
-				if(!isValid) return false;
498
-			}
499
-		});
500
-		return isValid;
501 525
 	}
502 526
 };

+ 34 - 15
src/main/webapp/js/app/stinfo/ITP_STINFO02011.js

@@ -145,6 +145,7 @@ let pageObj = {
145 145
 	ui: {
146 146
 		init: function () {
147 147
 			this.view();
148
+			this.form();
148 149
 			this.grid();
149 150
 			this.ready();
150 151
 		},
@@ -164,6 +165,16 @@ let pageObj = {
164 165
 			$('#ITP_TAB_STINFO02011 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
165 166
 			$('#ITP_FORM_STINFO02011_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
166 167
 			$('#ITP_FORM_STINFO02011_SEARCH_TO_DT').datepicker('setDate', new Date());
168
+
169
+			// form alert message 주입
170
+			$('input[data-alert-required="ONLYCHK"]').each(function() {
171
+				if($(this).data('alert-msg') === 'address') {
172
+					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
173
+				}
174
+			});
175
+		},
176
+		form: function() {
177
+			itp_fn_form_event.onKeyup('#ITP_FORM_STINFO02011_DETAIL');
167 178
 		},
168 179
 		grid: function() {
169 180
 			// itp_fn_jqgrid_resize(STINFO02011_GRID_ID, STINFO02011_GRID_LIST, 'lg');
@@ -224,6 +235,15 @@ let pageObj = {
224 235
 			$('#ITP_FORM_STINFO02011_DETAIL .fnStoreNm').text('(자동부여)');
225 236
 			$('#ITP_FORM_STINFO02011_DETAIL_STORE_ID').removeAttr('readonly');
226 237
 			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_info').hide();
238
+			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_info').find('input, select').each(function(i, elem) {
239
+				if($(this).data('check-required')) $(this).data('check-required', '');
240
+				$(this).attr('disabled', true);
241
+			});
242
+			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_change').show();
243
+			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_change').find('input, select').each(function(i, elem) {
244
+				if($(this).data('check-required')) $(this).data('check-required', 'empty');
245
+				$(this).attr('disabled', false);
246
+			});
227 247
 		} else if(mode == 'MODIFY') { // 수정
228 248
 			$('#ITP_AJAX_STINFO02011_DETAIL_CONTAINER').show();
229 249
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_CANCELLIST', '#ITP_BTN_STINFO02011_SAVE', '#ITP_BTN_STINFO02011_RESET_PW']);
@@ -234,6 +254,15 @@ let pageObj = {
234 254
 
235 255
 			$('#ITP_FORM_STINFO02011_DETAIL_STORE_ID').attr('readonly', true);
236 256
 			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_info').show();
257
+			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_info').find('input, select').each(function(i, elem) {
258
+				if($(this).data('check-required')) $(this).data('check-required', 'empty');
259
+				$(this).attr('disabled', false);
260
+			});
261
+			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_change').hide();
262
+			$('#ITP_FORM_STINFO02011_DETAIL .itp_form_change').find('input, select').each(function(i, elem) {
263
+				if($(this).data('check-required')) $(this).data('check-required', '');
264
+				$(this).attr('disabled', true);
265
+			});
237 266
 		} else if(mode == 'VIEW') { // 보기
238 267
 			$('#ITP_AJAX_STINFO02011_VIEW_CONTAINER').show();
239 268
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02011_MODIFY', '#ITP_BTN_STINFO02011_CANCELLIST']);
@@ -414,9 +443,10 @@ let modifyObj = {
414 443
 		},
415 444
 		save: function() {
416 445
 			const formId = '#ITP_FORM_STINFO02011_DETAIL';
446
+			itp_fn_form_event.removeChar('#ITP_FORM_OPER03010_DETAIL');
417 447
 			itp_fn_form_clear_validate(null, formId);
418 448
 
419
-			if (modifyObj.isValid(formId)) {
449
+			if (itp_fn_form_event.isValid(formId)) {
420 450
 				let param = $(formId).serializeObject();
421 451
 				console.log(JSON.stringify(param));
422 452
 				var searhFn = function() {
@@ -460,9 +490,9 @@ let modifyObj = {
460 490
 		var cmpyAdres = result.addr1/* + ' ' + result.addr*/;
461 491
 		kakaoMap.init('ITP_FORM_STINFO02011_DETAIL', cmpyAdres);
462 492
 
463
-		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_DPST_BNK_CD').text(result.storeBnkCd);
464
-		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ACCT_NO').text(result.storeAcctNo);
465
-		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_OWAC_NM').text(result.storeOwacNm);
493
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_DPST_BNK_CD').val(result.storeBnkCd);
494
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_ACCT_NO').val(result.storeAcctNo);
495
+		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_OWAC_NM').val(result.storeOwacNm);
466 496
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LOAN_DVSN').val(result.loanDvsn);
467 497
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_LIMIT_AMT').val(result.limitAmt);
468 498
 		$('#ITP_FORM_STINFO02011_DETAIL #ITP_FORM_STINFO02011_DETAIL_WHS_USE_YN').val(result.whsUseYn);
@@ -470,17 +500,6 @@ let modifyObj = {
470 500
 		$('#ITP_FORM_STINFO02011_DETAIL .fnAcctBal').text(result.acctBal);
471 501
 		$('#ITP_FORM_STINFO02011_DETAIL .fnTmpRcvAcctTotal').text(result.tmpRcvAcctTotal);
472 502
 		$('#ITP_FORM_STINFO02011_DETAIL .fnSysChgDttm').text(result.sysChgDttm);
473
-	},
474
-	isValid: function(formId) {
475
-		var isValid = false;
476
-		$(formId).find('input, select, checkbox, textarea').each(function(k) {
477
-			if($(this).data('check-required')) {
478
-				var arry = $(this).data('check-required').split(',');
479
-				isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
480
-				if(!isValid) return false;
481
-			}
482
-		});
483
-		return isValid;
484 503
 	}
485 504
 };
486 505
 

+ 15 - 6
src/main/webapp/js/app/stinfo/ITP_STINFO03010.js

@@ -251,6 +251,7 @@ let pageObj = {
251 251
 		if(mode == 'LIST') { // 목록
252 252
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO03010_SRH', '#ITP_BTN_STINFO03010_NEWREG']);
253 253
 			$('#ITP_AJAX_STINFO03010_LIST_CONTAINER').show();
254
+			$('#ITP_FORM_STINFO03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
254 255
 		} else if(mode == 'ADD') { // 등록
255 256
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO03010_CANCELLIST', '#ITP_BTN_STINFO03010_SAVE']);
256 257
 			$('#ITP_AJAX_STINFO03010_DETAIL_CONTAINER').show();
@@ -271,7 +272,8 @@ let pageObj = {
271 272
 			$('#ITP_FORM_STINFO03010_DETAIL .itp_form_change').show();
272 273
 
273 274
 			$('#ITP_BTN_STINFO03010_RESET_PW').hide();
274
-
275
+			$.bootstrapFileUpload('resetUpload', "ITP_STINFO03010_DETAIL_ACCT_FILE_UPLOAD");
276
+			$.bootstrapFileUpload('resetUpload', "ITP_STINFO03010_DETAIL_CORP_FILE_UPLOAD");
275 277
 		} else if(mode == 'MODIFY') { // 수정
276 278
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO03010_CANCELLIST', '#ITP_BTN_STINFO03010_SAVE', '#ITP_BTN_STINFO03010_RESET_PW']);
277 279
 			$('#ITP_AJAX_STINFO03010_DETAIL_CONTAINER').show();
@@ -282,6 +284,8 @@ let pageObj = {
282 284
 			$('#ITP_FORM_STINFO03010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
283 285
 			$('#ITP_FORM_STINFO03010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
284 286
 			$('#ITP_FORM_STINFO03010_DETAIL .fnBrandNm').text(fn_make_user_info.get('brandNm'));
287
+			$.bootstrapFileUpload('resetUpload', "ITP_STINFO03010_DETAIL_ACCT_FILE_UPLOAD");
288
+			$.bootstrapFileUpload('resetUpload', "ITP_STINFO03010_DETAIL_CORP_FILE_UPLOAD");
285 289
 		} else if(mode == 'VIEW') { // 보기
286 290
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO03010_MODIFY', '#ITP_BTN_STINFO03010_CANCELLIST']);
287 291
 			$('#ITP_AJAX_STINFO03010_VIEW_CONTAINER').show();
@@ -494,10 +498,10 @@ let modifyObj = {
494 498
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_SPPLY_NM').val(result.spplyNm);
495 499
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_BSNS_CNDT').val(result.bsnsCndt);
496 500
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_BSNS_REG_NO').val(result.bsnsRegNo);
497
-		$('#ITP_FORM_STINFO03010_DETAIL .fnBsnsRegNo').val(result.bsnsRegNo);
501
+		$('#ITP_FORM_STINFO03010_DETAIL .fnBsnsRegNo').text(result.bsnsRegNo);
498 502
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
499 503
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_CORP_REG_NO').val(result.corpRegNo);
500
-		$('#ITP_FORM_STINFO03010_DETAIL .fnCorpRegNo').val(result.corpRegNo);
504
+		$('#ITP_FORM_STINFO03010_DETAIL .fnCorpRegNo').text(result.corpRegNo);
501 505
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_TEL_NO').val(result.mgrTelNo);
502 506
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_OWNER_NM').val(result.ownerNm);
503 507
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_FAX_NO').val(result.faxNo);
@@ -508,9 +512,14 @@ let modifyObj = {
508 512
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_ACCT_NO').val(result.acctNo);
509 513
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_OWAC_NM').val(result.owacNm);
510 514
 		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_FROM_DT').val(result.openDt);
511
-		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_ZIP_NO').val(result.zipNo);
512
-		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_LOAD_ADDR').val(result.addr1);
513
-		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_DTL_ADDR').val(result.addr2);
515
+		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_ZIPNO').val(result.zipNo);
516
+		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_ADRES').val(result.addr1);
517
+		$('#ITP_FORM_STINFO03010_DETAIL #ITP_FORM_STINFO03010_DETAIL_ADRES_DTL').val(result.addr2);
518
+
519
+		$('#ITP_FORM_STINFO03010_DETAIL .fnRegId').text(result.sysRegId);
520
+		$('#ITP_FORM_STINFO03010_DETAIL .fnRegDt').text(result.sysRegDttm);
521
+		$('#ITP_FORM_STINFO03010_DETAIL .fnChgId').text(result.sysChgId);
522
+		$('#ITP_FORM_STINFO03010_DETAIL .fnChgDt').text(result.sysChgDttm);
514 523
 
515 524
 		// 담당자정보  리스트 조회
516 525
 		pageObj.grid.init('DETAIL', result.spplyMgrList);

+ 8 - 7
src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -83,7 +83,7 @@ const gridColModel = {
83 83
             sortable: false, hidden: false
84 84
         },
85 85
         {
86
-            index: 'ST_CD', name: 'stCd',
86
+            index: 'ST_CD', name: 'itemStNm',
87 87
             label: ITP_MSG_LOCALE.label.stNm, //상태
88 88
             width: '6', fixed: false, align: 'center',
89 89
             sortable: false, hidden: false
@@ -237,6 +237,7 @@ let pageObj = {
237 237
         if(mode == 'LIST') { // 목록
238 238
             $('#ITP_AJAX_STINFO04010_LIST_CONTAINER').show();
239 239
             fn_show_btn_auth_array(['#ITP_BTN_STINFO04010_SRH', '#ITP_BTN_STINFO04010_NEWREG']);
240
+            $('#ITP_FORM_STINFO04010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
240 241
         } else if(mode == 'ADD') { // 등록
241 242
             $('#ITP_AJAX_STINFO04010_DETAIL_CONTAINER').show();
242 243
             fn_show_btn_auth_array(['#ITP_BTN_STINFO04010_CANCELLIST', '#ITP_BTN_STINFO04010_SAVE']);
@@ -409,10 +410,10 @@ let viewObj = {
409 410
         pageObj.switchScreen('VIEW');
410 411
         $('#ITP_FORM_STINFO04010_VIEW #ITP_FORM_STINFO04010_VIEW_ITEM_ID').val(result.itemId);
411 412
         $('#ITP_FORM_STINFO04010_VIEW .fnStCd').text(result.itemStNm);
412
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1);
413
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2);
414
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3);
415
-        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4);
413
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass1').text(result.itemClass1Nm);
414
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass2').text(result.itemClass2Nm);
415
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass3').text(result.itemClass3Nm);
416
+        $('#ITP_FORM_STINFO04010_VIEW .fnItemClass4').text(result.itemClass4Nm);
416 417
         $('#ITP_FORM_STINFO04010_VIEW .fnItemClassMgntNo').text(result.itemClassMgntNo);
417 418
         $('#ITP_FORM_STINFO04010_VIEW .fnItemType').text(result.itemType);
418 419
         $('#ITP_FORM_STINFO04010_VIEW .fnItemNm').text(result.itemClassNm);
@@ -435,9 +436,9 @@ let viewObj = {
435 436
         $('#ITP_FORM_STINFO04010_VIEW .fnExpryPeriod').text(result.expryPeriod);
436 437
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnPssblYn').text(result.rtnPssblYn);
437 438
         $('#ITP_FORM_STINFO04010_VIEW .fnRtnDvsn').text(result.rtnDvsn);
438
-        // $('#ITP_FORM_STINFO04010_VIEW .fnItemImage').text(result.imageFileNoList);
439
+
439 440
         $.each(result.imageFileNoList, function(index, item) {
440
-            $('#ITP_FORM_STINFO04010_VIEW .fnItemImage').append('<img src=" + item.filePath +" />');
441
+            $('#ITP_FORM_STINFO04010_VIEW .fnItemImageFile').append('<img src="' + item.filePath + '" />');
441 442
         });
442 443
     }
443 444
 };

+ 9 - 4
src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -229,6 +229,7 @@ let pageObj = {
229 229
 		if(mode == 'LIST') { // 목록
230 230
 			$('#ITP_AJAX_STINFO05010_LIST_CONTAINER').show();
231 231
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO05010_SRH', '#ITP_BTN_STINFO05010_NEWREG']);
232
+			$('#ITP_FORM_STINFO05010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
232 233
 		} else if(mode == 'ADD') { // 등록
233 234
 			$('#ITP_AJAX_STINFO05010_DETAIL_CONTAINER').show();
234 235
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO05010_CANCELLIST', '#ITP_BTN_STINFO05010_SAVE']);
@@ -455,10 +456,14 @@ let modifyObj = {
455 456
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_BRAND_UNIT_UNQ_NO').val(result.brandUnitUnqNo);
456 457
 		$('#ITP_FORM_STINFO05010_DETAIL .fnBrandNm').text(result.brandNm);
457 458
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_UNIT_ST_CD').val(result.unitStCd);
458
-		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_ID').val(result.itemId);
459
-		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val(result.itemNm);
460
-		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val(result.spplyId);
461
-		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val(result.spplyNm);
459
+		$('#ITP_FORM_STINFO05010_DETAIL .fnItemId').text(result.itemId);
460
+		$('#ITP_FORM_STINFO05010_DETAIL .fnItemNm').text(result.itemNm);
461
+		$('#ITP_FORM_STINFO05010_DETAIL .fnSpplyId').text(result.spplyId);
462
+		$('#ITP_FORM_STINFO05010_DETAIL .fnSpplyNm').text(result.spplyNm);
463
+		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_ID').val(result.itemId);
464
+		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_ITEM_NM').val(result.itemNm);
465
+		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ID').val(result.spplyId);
466
+		// $('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_NM').val(result.spplyNm);
462 467
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_SPPLY_ITEM_ID').val(result.spplyItemId);
463 468
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_STT_DT').val(result.contSttDt);
464 469
 		$('#ITP_FORM_STINFO05010_DETAIL #ITP_FORM_STINFO05010_DETAIL_CONT_END_DT').val(result.contEndDt);

+ 4 - 1
src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -232,6 +232,7 @@ let pageObj = {
232 232
 				var id = $(this).attr('id');
233 233
 				$(this).on('click', function() {
234 234
 					switch (id) {
235
+						case 'ITP_BTN_STINFO06010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
235 236
 						case 'ITP_BTN_STINFO06010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
236 237
 						case 'ITP_BTN_STINFO06010_CANCELLIST'		: listObj.grid.search(); 		break;	// 취소/목록 버튼
237 238
 						case 'ITP_BTN_STINFO06010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
@@ -263,9 +264,12 @@ let pageObj = {
263 264
 			$('#ITP_AJAX_STINFO06010_LIST_CONTAINER').show();
264 265
 			if(fn_make_user_info.get('authTpCd') === '50') {
265 266
 				fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_SRH']);
267
+				$('#ITP_FORM_STINFO06010_SEARCH_STORE_ID').val(fn_make_user_info.get('storeId'));
268
+				$('#ITP_FORM_STINFO06010_SEARCH_STORE').hide();
266 269
 			} else {
267 270
 				fn_show_btn_auth_array(['#ITP_BTN_STINFO06010_SRH', '#ITP_BTN_STINFO06010_NEWREG']);
268 271
 			}
272
+			$('#ITP_FORM_STINFO06010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
269 273
 		} else if(mode == 'ADD') { // 등록
270 274
 			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO07010_DETAIL');
271 275
 
@@ -452,7 +456,6 @@ let modifyObj = {
452 456
 			var option = {
453 457
 				gridId: STINFO06010_DETAIL_GRID_ID,
454 458
 				colModel: gridColModel.detail,
455
-				mtype: 'GET',
456 459
 				param: param,
457 460
 				url: DOMAIN + API_DETAIL_INFO,
458 461
 				loadComplete: function(data) {

+ 12 - 11
src/main/webapp/js/app/stinfo/ITP_STINFO07010.js

@@ -46,7 +46,7 @@ const gridColModel = {
46 46
 			index: 'ITEM_CLASS_MNG_NO', name: 'itemClassMgntNo',
47 47
 			label: ITP_MSG_LOCALE.label.itemClassMgntNo, //품목분류명
48 48
 			width: '10', fixed: false, align: 'center',
49
-			sortable: false, hidden: true
49
+			sortable: false, hidden: false
50 50
 		},
51 51
 		{
52 52
 			index: 'ITEM_CLASS_NM', name: 'itemClassNm',
@@ -55,34 +55,34 @@ const gridColModel = {
55 55
 			sortable: false, hidden: false
56 56
 		},
57 57
 		{
58
-			index: 'ITEM_CLASS_LEVEL1', name: 'itemClass1',
58
+			index: 'ITEM_CLASS_LEVEL1', name: 'itemClass1Nm',
59 59
 			label: ITP_MSG_LOCALE.label.itemClassLevel1, //품목분류Level 1
60 60
 			width: '10', fixed: false, align: 'center',
61 61
 			sortable: false, hidden: false
62 62
 		},
63 63
 		{
64
-			index: 'ITEM_CLASS_LEVEL2', name: 'itemClass2',
64
+			index: 'ITEM_CLASS_LEVEL2', name: 'itemClass2Nm',
65 65
 			label: ITP_MSG_LOCALE.label.itemClassLevel2, //품목분류Level 2
66
-			width: '13', fixed: false, align: 'center',
66
+			width: '10', fixed: false, align: 'center',
67 67
 			sortable: false, hidden: false
68 68
 		},
69 69
 		{
70
-			index: 'ITEM_CLASS_LEVEL3', name: 'itemClass3',
70
+			index: 'ITEM_CLASS_LEVEL3', name: 'itemClass3Nm',
71 71
 			label: ITP_MSG_LOCALE.label.itemClassLevel3, //품목분류Level 3
72
-			width: '13', fixed: false, align: 'center',
72
+			width: '10', fixed: false, align: 'center',
73 73
 			sortable: false, hidden: false
74 74
 		},
75 75
 		{
76
-			index: 'ITEM_CLASS_LEVEL4', name: 'itemClass4',
76
+			index: 'ITEM_CLASS_LEVEL4', name: 'itemClass4Nm',
77 77
 			label: ITP_MSG_LOCALE.label.itemClassLevel4, //품목분류Level 4
78
-			width: '6', fixed: false, align: 'center',
78
+			width: '10', fixed: false, align: 'center',
79 79
 			sortable: false, hidden: false
80 80
 		},
81 81
 		{
82 82
 			index: 'PRN_SEQ', name: 'prnSeq',
83 83
 			label: ITP_MSG_LOCALE.label.prnSeq, //출력순번
84 84
 			width: '15', fixed: false, align: 'center',
85
-			sortable: false, hidden: false
85
+			sortable: false, hidden: true
86 86
 		}
87 87
 	]
88 88
 };
@@ -298,8 +298,9 @@ let listObj = {
298 298
 					if (colNm === 'itemClassNm') {
299 299
 						const selectVal = $(this).jqGrid('getCell', rowId, 'itemClassMgntNo');
300 300
 						const key = {brandId:fn_make_user_info.get('brandId'), itemClassMgntNo: selectVal, viewCd: 'R'};
301
-						var param = $.param(key);
302
-						viewObj.init(param);
301
+						// var param = $.param(key);
302
+						// viewObj.init(param);
303
+						listObj.popup($(gridId).jqGrid('getRowData', rowId));
303 304
 					}
304 305
 				},
305 306
 				loadComplete: function(data) {

+ 1 - 1
src/main/webapp/js/app/vendinfo/ITP_VENDINFO01010.js

@@ -278,7 +278,7 @@ let modifyObj = {
278 278
 			var vali_userPwConfirm = true;
279 279
 			*/
280 280
 			//if (vali_userId && vali_userStatCd && vali_userNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
281
-			if(modifyObj.isValid(formId)){
281
+			if(itp_fn_form_event.isValid(formId)){
282 282
 				let gridInsertData = [];
283 283
 				let gridUpdateData = [];
284 284
 				let gridDeleteData = [];

+ 6 - 2
src/main/webapp/js/app/vendinfo/ITP_VENDINFO03010.js

@@ -112,14 +112,18 @@ let pageObj = {
112 112
 		view: function() {
113 113
 			// 버튼 권한설정
114 114
 			fn_proc_btn_auth('VENDINFO03010');
115
-				// 공통코드 표시
115
+			// 공통코드 표시
116 116
 			$('select').each(function() {
117 117
 				if($(this).data('select-code')) {
118 118
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
119 119
 				}
120 120
 			});
121
-				// 조회일자 지정
121
+			// 조회일자 지정	
122
+			var now = new Date();
122 123
 			$('#ITP_TAB_VENDINFO03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
124
+		
125
+			$('#ITP_FORM_VENDINFO03010_SEARCH_CONT_FROM_DT').datepicker('setDate', '2022.10.01');
126
+			$('#ITP_FORM_VENDINFO03010_SEARCH_CONT_TO_DT').datepicker('setDate', '2024.10.01');
123 127
 		},
124 128
 		grid: function() {
125 129
 			itp_fn_jqgrid_resize(VENDINFO03010_GRID_ID, VENDINFO03010_GRID_LIST, 'lg');