Procházet zdrojové kódy

메인 브랜드 관리 적용

juney před 2 roky
rodič
revize
7e068594b6

+ 29 - 318
src/main/webapp/app/oper/OPER01010.html

@@ -1,40 +1,3 @@
1
-<<<<<<< HEAD
2
-<section id="ITP_TAB_STINFO01010" class="tab-pane active itp_sec">
3
-	<div class="itp_cont">
4
-		<article class="itp_detail">
5
-			<div class="itp_det_head fix">
6
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>브랜드관리</strong></h2>
7
-				<div class="pull-right itp_cicon">
8
-					<button type="button" id="ITP_BTN_STINFO01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
9
-					<button type="button" id="ITP_BTN_STINFO01010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-ok"></i> 수정</button>
10
-					<button type="button" id="ITP_BTN_STINFO01010_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon glyphicon-plus"></i> 신규등록</button>
11
-					<button type="button" id="ITP_BTN_STINFO01010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon glyphicon-remove"></i> 삭제</button>
12
-					<button type="button" id="ITP_BTN_STINFO01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon glyphicon-ok"></i> 저장</button>
13
-					<button type="button" id="ITP_BTN_STINFO01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon glyphicon-minus"></i> 취소/목록</button>
14
-				</div>				
15
-			</div>
16
-			<div class="itp_det_in">
17
-				<div id="ITP_AJAX_STINFO01010_LIST_CONTAINER">
18
-					<div class="itp_lg_form itp_type1 fix">
19
-						<div class="itp_srh_border fix">
20
-							<div class="col-xs-12">
21
-								<form id="ITP_FORM_STINFO01010_SEARCH" class="form-horizontal">
22
-									<div class="form-group">
23
-										<div class="col-xs-2 itp_ip itp_noMar">
24
-											<select id="ITP_FORM_STINFO01010_SERVICE_ST_DT" class="form-control itp_input" name="serviceStDt">
25
-												<option value="">카테고리(전체)</option>										
26
-											</select>
27
-										</div>
28
-										<div class="col-xs-2 itp_ip itp_noMar">
29
-											<select id="ITP_FORM_STINFO01010_SEARCH_USER_STAT_CD" class="form-control itp_input" name="ST_CD">
30
-												<option value="">상태(전체)</option>										
31
-											</select>
32
-										</div>
33
-										<div class="col-xs-6 itp_ip">
34
-										<input type="text" id="ITP_FORM_STINFO01010_SEARCH_USER_NM" class="form-control itp_input" name="BRAND_NM" placeholder="브랜드명" />
35
-										</div>
36
-															
37
-=======
38 1
 <section id="ITP_TAB_OPER01010" class="tab-pane active itp_sec">
39 2
 	<div class="itp_cont">
40 3
 		<article class="itp_detail">
@@ -74,44 +37,12 @@
74 37
 										<div class="col-xs-2 itp_ip itp_noMar">
75 38
 											<select id="ITP_FORM_OPER01010_SEARCH_USER_STAT_CD" class="form-control itp_input" name="suserStatCd"></select>
76 39
 										</div>									
77
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
78 40
 									</div>
79 41
 								</form>
80 42
 							</div>
81 43
 						</div>
82 44
 					</div>
83 45
 					<div class="itp_table fix">
84
-<<<<<<< HEAD
85
-						<div id="ITP_STINFO01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
86
-							<div id="ITP_STINFO01010_jqGridView" class="itp_views fix"></div>
87
-							<table id="ITP_STINFO01010_jqGrid"></table>
88
-							<div id="ITP_STINFO01010_jqGridPager"></div>
89
-							<div id="ITP_STINFO01010_jqGridEmpty" class="itp_no_data"></div>
90
-						</div>
91
-					</div>
92
-				</div>
93
-				<div id="ITP_AJAX_STINFO01010_DETAIL_CONTAINER">
94
-					<div class="itp_form itp_type1 fix">
95
-						<div class="col-xs-12">
96
-							<form id="ITP_FORM_STINFO01010_DETAIL" class="form-horizontal">
97
-								<input type="hidden" id="ITP_FORM_STINFO01010_DETAIL_VIEW_CD" name="viewCd" value="C">
98
-					
99
-								<section class="itp_form_sec">
100
-									<h4 class="itp_form_tit">브랜드 정보-신규</h4>
101
-									<div class="itp_form_in">
102
-										<div class="form-group">
103
-											<label class="col-xs-2 itp_lb">브랜드 코드</label>
104
-												<div class="col-xs-4 itp_ip">
105
-													<div class="col-xs-9 itp_in">
106
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" style="background:#eee;" name="REG_ID" value="(자동부여)" maxlength="20" readonly>
107
-													</div>												
108
-												</div>
109
-											<label class="col-xs-2 itp_lb">상태*</label>
110
-											<div class="col-xs-4 itp_ip">
111
-												<div class="col-xs-8 itp_in">
112
-													<select id="ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="ST_CD">
113
-													<option value="">사용</option>
114
-=======
115 46
 						<div id="ITP_OPER01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
116 47
 							<div id="ITP_OPER01010_jqGridView" class="itp_views fix"></div>
117 48
 							<table id="ITP_OPER01010_jqGrid"></table>
@@ -130,67 +61,40 @@
130 61
 									<!-- <h4 class="itp_form_tit">사용자정보 현재 테스트중</h4> -->
131 62
 									<div class="itp_form_in">
132 63
 										<div class="form-group">
133
-											<label class="col-xs-2 itp_lb">사용자명</label>
64
+											<label class="col-xs-2 itp_lb">가맹점</label>
134 65
 											<div class="col-xs-4 itp_ip">
135 66
 												<div class="col-xs-5 itp_in">
136
-													<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_NM" class="form-control itp_input" name="userNm" value="" maxlength="40">
67
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_AFFL_SHOP" class="form-control itp_input" name="afflShop">
68
+														<option value=""></option>
69
+													</select>
137 70
 												</div>
138 71
 											</div>
139
-											<label class="col-xs-2 itp_lb">상태</label>
72
+											<label class="col-xs-2 itp_lb">브랜드</label>
140 73
 											<div class="col-xs-4 itp_ip">
141 74
 												<div class="col-xs-5 itp_in">
142
-													<select id="ITP_FORM_OPER01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="userStatCd">
143
-													<option value=""></option>
144
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
75
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_BRAND_NM" class="form-control itp_input" name="brandNm">
76
+														<option value=""></option>
145 77
 													</select>
146 78
 												</div>
147 79
 											</div>
148 80
 										</div>
149 81
 										<div class="form-group">
150
-<<<<<<< HEAD
151
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
152
-											<div class="col-xs-4 itp_ip">
153
-												<div class="col-xs-10 itp_in">
154
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" class="form-control itp_input" style="background:#fff;" name="BRAND_NM" value="테스트 브랜드" maxlength="20" readonly>
155
-												</div>
156
-											</div>
157
-											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
82
+											<label class="col-xs-2 itp_lb">사용자명</label>
158 83
 											<div class="col-xs-4 itp_ip">
159
-												<div class="col-xs-8 itp_in">
160
-													<select id="ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="BRAND_TYPE">
161
-													<option value="">카페/한식/유통/아이스크림</option>
162
-													</select>												
84
+												<div class="col-xs-5 itp_in">
85
+													<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_NM" class="form-control itp_input" name="userNm" value="" maxlength="40">
163 86
 												</div>
164 87
 											</div>
165
-										</div>
166
-										<div class="form-group">
167
-											<label class="col-xs-2 itp_lb">전화번호</label>
88
+											<label class="col-xs-2 itp_lb">상태</label>
168 89
 											<div class="col-xs-4 itp_ip">
169
-												<div class="col-xs-7 itp_in">
170
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW" class="form-control itp_input" name="TEL_NO" value="###-####-####">																								
90
+												<div class="col-xs-5 itp_in">
91
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="userStatCd">
92
+													<option value=""></option>
93
+													</select>
171 94
 												</div>
172
-												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
173
-											</div>
174
-											<label class="col-xs-2 itp_lb"></label>
175
-											<div class="col-xs-1 itp_ip">
176
-												<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW "style="top:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="BRAND_LOGO" value="">																								
177 95
 											</div>
178 96
 										</div>
179 97
 										<div class="form-group">
180
-											<label class="col-xs-2 itp_lb">FAX</label>
181
-											<div class="col-xs-4 itp_ip">
182
-												<div class="col-xs-7 itp_in">
183
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" class="form-control itp_input" name="FAX_NO" value="###-####-####">
184
-												</div>
185
-											</div>
186
-											<label class="col-xs-2 itp_lb" style="border-top:none;">로고</label>
187
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
188
-												<div class="col-xs-5 itp_in">
189
-													<label class="col-xs-12">로고</label>
190
-												</div>
191
-												<div class="col-xs-7 itp_in">
192
-													<input type="password" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" class="form-control itp_input" name="BRAND_LOGO" value="">
193
-=======
194 98
 											<label class="col-xs-2 itp_lb">사용자ID</label>
195 99
 											<div class="col-xs-4 itp_ip">
196 100
 												<div class="col-xs-6 itp_in">
@@ -211,7 +115,7 @@
211 115
 											<label class="col-xs-2 itp_lb">비밀번호</label>
212 116
 											<div class="col-xs-4 itp_ip">
213 117
 												<div class="col-xs-5 itp_in">
214
-													<input type="password" id="ITP_FORM_OPER01010_DETAIL_USER_PW" class="form-control itp_input" name="userPw" value="">																								
118
+													<input type="password" id="ITP_FORM_OPER01010_DETAIL_USER_PW" class="form-control itp_input" name="userPw" value="">
215 119
 												</div>
216 120
 												<button type="button" id="ITP_BTN_OPER01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button>
217 121
 											</div>
@@ -219,67 +123,10 @@
219 123
 											<div class="col-xs-4 itp_ip">
220 124
 												<div class="col-xs-5 itp_in">
221 125
 													<input type="text" id="ITP_FORM_OPER01010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="">
222
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
223 126
 												</div>
224 127
 											</div>
225 128
 										</div>
226 129
 										<div class="form-group">
227
-<<<<<<< HEAD
228
-											<label class="col-xs-2 itp_lb">이메일</label>
229
-											<div class="col-xs-4 itp_ip">
230
-												<div class="col-xs-7 itp_in">
231
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_EMAIL" class="form-control itp_input" name="EMAL_ADDR" value="">
232
-												</div>
233
-											</div>
234
-											<label class="col-xs-2 itp_lb"style="border-top:none;"></label>
235
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
236
-												<div class="col-xs-7 itp_in">
237
-													<label class="col-xs-12"></label>
238
-												</div>
239
-												<div class="col-xs-5 itp_in">
240
-													<button type="button" id="ITP_BTN_STINFO01010_DETAIL_ADDROW" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon"></i>파일선택</button>
241
-												</div>
242
-											</div>
243
-										</div>
244
-									</div>
245
-										<div class="itp_form_in">	
246
-											<div class="form-group border">
247
-												<label class="col-xs-2 itp_lb">입금계좌정보</label>
248
-												<div class="col-xs-12 itp_ip">
249
-													<div class="col-xs-1 itp_in">
250
-														<select id="ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="DPST_BNK_CD">
251
-														<option value="">은행</option>
252
-														</select>
253
-													</div>
254
-													<div class="col-xs-4 itp_in">
255
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" class="form-control itp_input" name="RCV_ACCT_NO" value="" placeholder="계좌번호">													
256
-													</div>
257
-													<div class="col-xs-2 itp_in">
258
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" class="form-control itp_input" name="OWAC_NM" value="" placeholder="예금주명">													
259
-													</div>										
260
-												</div>
261
-											</div>
262
-										</div>
263
-										<div class="itp_form_in">	
264
-											<div class="form-group border">
265
-												<label class="col-xs-2 itp_lb">주소</label>
266
-												<div class="col-xs-10 itp_ip">
267
-													<div class="col-xs-2 itp_in">
268
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" class="form-control itp_input" name="ZIP_NO" value="" maxlength="6" readonly placeholder="우편번호">													
269
-													</div>
270
-													<div class="col-xs-1 itp_in">
271
-													<button type="button" id="ITP_FORM_KOPER01010_DETAIL_ADRES_SCH" class="btn btn-primary btn-xs SHOW" style="margin: 3px 0px 0px 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
272
-													</div>
273
-													<div class="col-xs-4 itp_in" style="margin-right: 5px;">
274
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES" class="form-control itp_input" name="LOAD_ADDR" value="" readonly placeholder="기본주소">													
275
-													</div>
276
-													<div class="col-xs-4 itp_in">
277
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES_DTL" class="form-control itp_input" name="DTL_ADDR" value="" placeholder="상세주소">													
278
-													</div>
279
-												</div>
280
-											</div>	
281
-										</div>	
282
-=======
283 130
 											<label class="col-xs-2 itp_lb">비밀번호 확인</label>
284 131
 											<div class="col-xs-4 itp_ip">
285 132
 												<div class="col-xs-5 itp_in">
@@ -302,82 +149,13 @@
302 149
 											<div class="col-xs-4 itp_ip">
303 150
 												<div class="col-xs-5 itp_in fnLastLoginDt"></div>
304 151
 											</div>
305
-										</div>									
152
+										</div>
306 153
 									</div>
307
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
308
-								</section>								
154
+								</section>
309 155
 							</form>
310 156
 						</div>
311 157
 					</div>
312
-<<<<<<< HEAD
313
-				</div>
314
-				<div id="ITP_AJAX_STINFO01010_DETAIL_CONTAINER">
315
-					<div class="itp_form itp_type1 fix">
316
-						<div class="col-xs-12">
317
-							<form id="ITP_FORM_STINFO01010_DETAIL" class="form-horizontal">
318
-								<input type="hidden" id="ITP_FORM_STINFO01010_DETAIL_VIEW_CD" name="viewCd" value="C">
319
-					
320
-								<section class="itp_form_sec">
321
-									<h4 class="itp_form_tit">브랜드 정보-상세</h4>
322
-									<div class="itp_form_in">
323
-										<div class="form-group">
324
-											<label class="col-xs-2 itp_lb">브랜드 코드</label>
325
-												<div class="col-xs-4 itp_ip">
326
-													<div class="col-xs-5 itp_in">
327
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" style="background:#eee;" name="REG_ID" value="BR2022001" maxlength="20" readonly>
328
-													</div>												
329
-												</div>
330
-											<label class="col-xs-2 itp_lb">상태*</label>
331
-											<div class="col-xs-4 itp_ip">
332
-												<div class="col-xs-8 itp_in">
333
-												<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" style="background:#eee;" name="ST_CD" value="사용" maxlength="20" readonly>
334
-												</div>
335
-											</div>
336
-										</div>
337
-										<div class="form-group">
338
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
339
-											<div class="col-xs-4 itp_ip">
340
-												<div class="col-xs-8 itp_in">
341
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" style="background:#fff;" name="BRAND_NM" value="테스트 브랜드" maxlength="20" readonly>
342
-												</div>
343
-											</div>
344
-											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
345
-											<div class="col-xs-4 itp_ip">
346
-												<div class="col-xs-8 itp_in">
347
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" style="background:#fff;" name="BRAND_TYPE" value="유통" maxlength="20" readonly>
348
-												</div>
349
-											</div>
350
-										</div>
351
-										<div class="form-group">
352
-											<label class="col-xs-2 itp_lb">전화번호</label>
353
-											<div class="col-xs-4 itp_ip">
354
-												<div class="col-xs-5 itp_in">
355
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW" style="border:none;" class="itp_input" name="TEL_NO" value="02-4568-4568">																								
356
-												</div>
357
-												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
358
-											</div>
359
-											<label class="col-xs-2 itp_lb"></label>
360
-											<div class="col-xs-1 itp_ip">
361
-												<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW "style="top:12px; height:100px; width:125px; position:absolute;" style="border:none;" class="itp_input" name="BRAND_LOGO" value="">																								
362
-											</div>
363
-										</div>
364
-										<div class="form-group">
365
-											<label class="col-xs-2 itp_lb">FAX</label>
366
-											<div class="col-xs-4 itp_ip">
367
-												<div class="col-xs-5 itp_in">
368
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" style="border:none;" class="itp_input" name="FAX_NO" value="02-4568-4568">
369
-												</div>
370
-											</div>
371
-											<label class="col-xs-2 itp_lb" style="border-top:none;">로고</label>
372
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
373
-												<div class="col-xs-5 itp_in">
374
-													<label class="col-xs-12">로고</label>
375
-												</div>
376
-												<div class="col-xs-7 itp_in">
377
-													<input type="password" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" style="border:none;" class="itp_input" name="BRAND_LOGO" value="">
378
-												</div>
379
-=======
380
-					
158
+
381 159
 					<div class="itp_table fix">
382 160
 						<div class="itp_table_head fix">
383 161
 							<!-- <h4 class="itp_table_tit">* 권한정보</h4> -->
@@ -405,6 +183,16 @@
405 183
 								<section class="itp_form_sec">
406 184
 									<h4 class="itp_form_tit">사용자정보</h4>
407 185
 									<div class="itp_form_in">
186
+										<div class="form-group">
187
+											<label class="col-xs-2 itp_lb">가맹점</label>
188
+											<div class="col-xs-4 itp_ip">
189
+												<div class="col-xs-5 itp_in fnAfflShop"></div>
190
+											</div>
191
+											<label class="col-xs-2 itp_lb">브랜드</label>
192
+											<div class="col-xs-4 itp_ip">
193
+												<div class="col-xs-5 itp_in fnBrandNm"></div>
194
+											</div>
195
+										</div>
408 196
 										<div class="form-group">
409 197
 											<label class="col-xs-2 itp_lb">사용자명</label>
410 198
 											<div class="col-xs-4 itp_ip">
@@ -423,84 +211,11 @@
423 211
 											<label class="col-xs-2 itp_lb">상태 일시</label>
424 212
 											<div class="col-xs-4 itp_ip">
425 213
 												<div class="col-xs-5 itp_in fnUserStatDt"></div>
426
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
427 214
 											</div>
428 215
 										</div>
429 216
 										<div class="form-group">
430 217
 											<label class="col-xs-2 itp_lb">이메일</label>
431 218
 											<div class="col-xs-4 itp_ip">
432
-<<<<<<< HEAD
433
-												<div class="col-xs-5 itp_in">
434
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_EMAIL" style="border:none;" class="itp_input" name="EMAL_ADDR" value="aaaa@test.co.kr">
435
-												</div>
436
-											</div>
437
-											<label class="col-xs-2 itp_lb"style="border-top:none;"></label>
438
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
439
-												<div class="col-xs-7 itp_in">
440
-													<label class="col-xs-12"></label>
441
-												</div>
442
-												<div class="col-xs-5 itp_in">
443
-												</div>
444
-											</div>
445
-										</div>
446
-									</div>
447
-										<div class="itp_form_in">	
448
-											<div class="form-group border">
449
-												<label class="col-xs-2 itp_lb">입금계좌정보</label>
450
-												<div class="col-xs-12 itp_ip">
451
-													<div class="col-xs-1 itp_in">
452
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" style="border:none;" class="itp_input" name="DPST_BNK_CD" value="우리은행">													
453
-													</div>
454
-													<div class="col-xs-2 itp_in">
455
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" style="border:none;" class="itp_input" name="RCV_ACCT_NO" value="(100.12-45-56235)">													
456
-													</div>
457
-													<div class="col-xs-2 itp_in">
458
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" style="border:none;" class="itp_input" name="OWAC_NM" value="테스트 브랜드">													
459
-													</div>										
460
-												</div>
461
-											</div>
462
-										</div>
463
-										<div class="itp_form_in">	
464
-											<div class="form-group border">
465
-												<label class="col-xs-2 itp_lb">주소</label>
466
-												<div class="col-xs-10 itp_ip">
467
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" style="border:none; width:66px;" class="itp_input" name="ZIP_NO" maxlength="6" value="(06035)">													
468
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES" style="border:none; padding:0px;" class="itp_input" name="LOAD_ADDR" value="서울 송파구 문정동 125">													
469
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES_DTL" style="border:none; padding:0px;" class="itp_input" name="DTL_ADDR" value="20">													
470
-												</div>
471
-											</div>	
472
-										</div>	
473
-										<div class="form-group">
474
-											<label class="col-xs-2 itp_lb">등록자/등록일 </label>
475
-											<div class="col-xs-4 itp_ip">
476
-												<div class="col-xs-2 itp_in">
477
-													<div class="input-group">
478
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" name="REG_ID" value="홍길동" maxlength="20" readonly>
479
-													</div>
480
-												</div>
481
-												<label class="col-xs-1" style="top:7px;">/</label>
482
-												<div class="col-xs-2 itp_in">
483
-													<div class="input-group">
484
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" name="REG_DT" value="2022-08-10" maxlength="20" readonly>
485
-													</div>
486
-												</div>
487
-											</div>
488
-											<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
489
-											<div class="col-xs-4 itp_ip">
490
-												<div class="col-xs-2 itp_in">
491
-													<div class="input-group">
492
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" name="REG_ID" value="홍길동" maxlength="20" readonly>
493
-													</div>
494
-												</div>
495
-												<label class="col-xs-1" style="top:7px;">/</label>
496
-												<div class="col-xs-2 itp_in">
497
-													<div class="input-group">
498
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" name="REG_DT" value="2022-08-10" maxlength="20" readonly>
499
-													</div>
500
-												</div>
501
-											</div>
502
-										</div>							
503
-=======
504 219
 												<div class="col-xs-5 itp_in fnEmail"></div>
505 220
 											</div>
506 221
 											<label class="col-xs-2 itp_lb">핸드폰번호</label>
@@ -519,13 +234,10 @@
519 234
 											</div>
520 235
 										</div>									
521 236
 									</div>
522
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
523 237
 								</section>								
524 238
 							</form>
525 239
 						</div>
526 240
 					</div>
527
-<<<<<<< HEAD
528
-=======
529 241
 					
530 242
 					<div class="itp_table fix">
531 243
 						<div class="itp_table_head fix">
@@ -539,7 +251,6 @@
539 251
 							<div id="ITP_OPER01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
540 252
 						</div>
541 253
 					</div>					
542
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
543 254
 				</div>
544 255
 			</div>
545 256
 		</article>

+ 37 - 0
src/main/webapp/app/oper/OPER02010.html

@@ -63,6 +63,26 @@
63 63
 
64 64
 								<section class="itp_form_sec">
65 65
 									<!-- <h4 class="itp_form_tit">공지정보</h4> -->
66
+									<div class="itp_form_in">
67
+										<div class="form-group">
68
+											<label class="col-xs-2 itp_lb">가맹점</label>
69
+											<div class="col-xs-5 itp_ip">
70
+												<div class="col-xs-10 itp_in">
71
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_AFFL_SHOP" class="form-control itp_input" name="afflShop">
72
+														<option value=""></option>
73
+													</select>
74
+												</div>
75
+											</div>
76
+											<label class="col-xs-2 itp_lb">브랜드</label>
77
+											<div class="col-xs-5 itp_ip">
78
+												<div class="col-xs-5 itp_in">
79
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_BRAND_NM" class="form-control itp_input" name="brandNm">
80
+														<option value=""></option>
81
+													</select>
82
+												</div>
83
+											</div>
84
+										</div>
85
+									</div>
66 86
 									<div class="itp_form_in">
67 87
 										<div class="form-group colspan">
68 88
 											<label class="col-xs-2 itp_lb">공지제목</label>
@@ -142,6 +162,23 @@
142 162
 							<div id="ITP_OPER02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
143 163
 						</div>
144 164
 					</div>
165
+
166
+					<div class="itp_table fix">
167
+						<div class="itp_table_head fix">
168
+							<h4 class="itp_table_tit">* 권한 정보 (* 공지대상이 특정 대상일 일겨웅 추가 버튼 을 통해 사용자 등록 함)</h4>
169
+							<div class="pull-right itp_cicon">
170
+								<button type="button" id="ITP_BTN_OPER02010_BRAND_ADDROW" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon glyphicon-plus"></i> 추가</button>
171
+								<button type="button" id="ITP_BTN_OPER02010_BRAND_DELROW" class="btn btn-danger btn-sm DEB"><i class="glyphicon glyphicon-remove"></i> 삭제</button>
172
+							</div>
173
+						</div>
174
+
175
+						<div id="ITP_OPER02010_BRAND_jqGrid_list" class="itp_tb_list">
176
+							<div id="ITP_OPER02010_BRAND_jqGridView" class="itp_views fix"></div>
177
+							<table id="ITP_OPER02010_BRAND_jqGrid"></table>
178
+							<div id="ITP_OPER02010_BRAND_jqGridPager"></div>
179
+							<div id="ITP_OPER02010_BRAND_jqGridEmpty" class="itp_no_data"></div>
180
+						</div>
181
+					</div>
145 182
 				</div>
146 183
 				<div id="ITP_AJAX_OPER02010_VIEW_CONTAINER">
147 184
 					<div class="itp_form itp_type1 fix">

+ 62 - 9
src/main/webapp/js/app/config.js

@@ -3,6 +3,8 @@
3 3
 var today = new Date();
4 4
 const js_version = itp_fn_date_format(today);
5 5
 
6
+var selTabIndex = 0;
7
+
6 8
 requirejs.config({
7 9
 	baseUrl: ITP_CONTEXTPATH,
8 10
 	paths: {
@@ -166,7 +168,9 @@ require([
166 168
 	});
167 169
 
168 170
 	$('#ITP_HEADER .itp_tab_list').on('click', '.itp_tab_open', function() {
169
-		//console.log('[ITP_TAB_OPEN] CALL');
171
+		var li = $(this).closest('li');
172
+		selTabIndex = li.index();
173
+		// console.log('[ITP_TAB_OPEN] CALL');
170 174
 		//로그인체크
171 175
 		itp_fn_logined_check();
172 176
 		itp_fn_fire_window_resize();
@@ -174,12 +178,20 @@ require([
174 178
 
175 179
 	$('#ITP_HEADER .itp_tab_list').on('click', '.itp_tab_close', function() {
176 180
 		var tab_id = $(this).attr('data-itp-tab-id');
181
+		var li = $(this).closest('li');
182
+		var curIdx = li.index();
177 183
 		$('#ITP_TAB_' + tab_id).remove();
178 184
 		$(this).closest('li').remove();
179
-		$('#ITP_HEADER .itp_tab_list li').removeClass('active');
180
-		$('#ITP_CONTAINER .itp_contents .itp_sec').removeClass('active');
181
-		$('#ITP_HEADER .itp_tab_list li:first-child').addClass('active');
182
-		$('#ITP_CONTAINER .itp_contents .itp_sec:first-child').addClass('active');
185
+		if(curIdx === selTabIndex) {
186
+			$('#ITP_HEADER .itp_tab_list li').removeClass('active');
187
+			$('#ITP_CONTAINER .itp_contents .itp_sec').removeClass('active');
188
+			$('#ITP_HEADER .itp_tab_list li:first-child').addClass('active');
189
+			$('#ITP_CONTAINER .itp_contents .itp_sec:first-child').addClass('active');
190
+			selTabIndex = 0;
191
+		} else {
192
+			selTabIndex = selTabIndex - 1;
193
+		}
194
+
183 195
 		return false;
184 196
 	});
185 197
 
@@ -320,13 +332,17 @@ require([
320 332
 				CONN_KEY = data.connKey; //로그인 했을때 넣었던 키를 가져옴
321 333
 
322 334
 				var callbackFn = function(result) {
335
+					console.log(result);
323 336
 					CODE_LIST = result.codeList;
324 337
 					AUTH_MENU_LIST = result.authMenuList;
325 338
 					ACT_LIST = result.actList;
326 339
 					POP_LIST = result.popList;
327 340
 					USER_ID = result.userId; 
328 341
 					USER_NM = result.userNm;					
329
-					USER_TYPE_CD = result.userTypeCd;	
342
+					USER_TYPE_CD = result.userTypeCd;
343
+					AUTH_TYPE_CD = result.authTpCd;
344
+					AFFL_LIST = result.afflList;
345
+					BRAND_LIST = result.brandList;
330 346
 					/*
331 347
 					if(FRCOMP_LIST.length > 0) {
332 348
 						let itp_manage_cmpy_cd = '';
@@ -349,7 +365,9 @@ require([
349 365
 						sessionStorage.setItem('itp_manage_cmpy_cd', '{}'); 
350 366
 					//}
351 367
 					// 사용자명
352
-					$('#ITP_LOGIN_USER').text(USER_NM); 
368
+					$('#ITP_LOGIN_USER').text(USER_NM);
369
+					// 가맹점 만들기
370
+					fn_make_brand_shop.init();
353 371
 					// 왼쪽 메뉴 만들기
354 372
 					fn_make_side_menu();
355 373
 					// 메뉴 요약
@@ -370,6 +388,37 @@ function fn_make_menu_summary() {
370 388
 	
371 389
 }
372 390
 
391
+var fn_make_brand_shop = {
392
+	init : function() {
393
+		this.make();
394
+		this.action();
395
+	},
396
+	make: function () {
397
+		if(BRAND_LIST.length > 1) {
398
+			sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(BRAND_LIST[0]));
399
+			$('#ITP_TXT_MAIN_SHR_CMPY').text(BRAND_LIST[0].brandNm);
400
+		} else {
401
+			if(BRAND_LIST.length === 1) {
402
+				sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(BRAND_LIST[0]));
403
+				$('#ITP_TXT_MAIN_SHR_CMPY').text(BRAND_LIST[0].brandNm);
404
+			}
405
+			$('#ITP_BTN_MAIN_SHR_CMPY').hide();
406
+		}
407
+	},
408
+	action: function () {
409
+		$('#ITP_BTN_MAIN_SHR_CMPY').on('click', function() {
410
+			// 팝업
411
+			var popFn = function(rowDataPop) {
412
+				$.each(rowDataPop, function(key, value) {
413
+					itp_fn_close_other_tab(''); // 다른탭 닫기
414
+					sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(value));
415
+				});
416
+			};
417
+			fn_call_popup('biz', 'BIZPOP_FRCOMP_STORE', '#ITP_ASIDE', popFn, null, 'S');
418
+		});
419
+	}
420
+};
421
+
373 422
 function fn_make_side_menu() {
374 423
 	$('#ITP_SIDEBAR .panel-group').empty();
375 424
 	
@@ -429,17 +478,21 @@ function fn_make_side_menu() {
429 478
 	        	$('#ITP_CONTAINER .itp_contents .itp_sec').removeClass('active');
430 479
 	        	$(this).addClass('active');
431 480
 	        	$('#ITP_TAB_' + id).addClass('active');
481
+
482
+				selTabIndex = this.index();
432 483
 				return false;
433 484
 			}
434 485
 		});
435 486
 
436 487
 		if (!isDup && openCd == 'C') {
437
-			
488
+
489
+			selTabIndex = tabSize;
490
+
438 491
 			const href = ITP_CONTEXTPATH + connUrl; // $(this).attr('href');
439 492
 			const text = $(this).children('.itp_tt').text();
440 493
 			const tab = '<li class="active"><a href="#ITP_TAB_' + id + '" role="tab" data-toggle="tab" class="itp_tab_open">' + text + ' <i class="glyphicon glyphicon-remove itp_tab_close" data-itp-tab-id="' + id + '"></i></a></li>';
441 494
 			itp_fn_load_page(href, tab, '', id);
442
-			
495
+
443 496
 		} else {
444 497
 			itp_fn_fire_window_resize();
445 498
 		}

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

@@ -106,6 +106,17 @@ const ITP_MSG_LOCALE = (function() {
106 106
 			"numbering": "NO",
107 107
 			"inputSelf": "직접입력",
108 108
 			"active": "활성",
109
+			"afflShop": "가맹점",
110
+			"brandNm": "브랜드",
111
+			"notiNo": "공지번호",
112
+			"titlet": "제목",
113
+			"targetNm": "대상구분",
114
+			"viewDt": "노출일",
115
+			"regDt": "등록일",
116
+		},
117
+		"table": {
118
+			"brandId": "브랜드ID",
119
+			"brandNm": "브랜드명",
109 120
 		},
110 121
 		"link": {
111 122
 			"forgotPassword": "비밀번호찾기"
@@ -284,6 +295,7 @@ const ITP_MSG_LOCALE = (function() {
284 295
 		language: data.language,
285 296
 		title: data.title,
286 297
 		label: data.label,
298
+		table: data.table,
287 299
 		link: data.link,
288 300
 		text: data.text,
289 301
 		button: data.button,

+ 63 - 475
src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -1,23 +1,4 @@
1 1
 
2
-<<<<<<< HEAD
3
-const STINFO01010_GRID_ID = '#ITP_STINFO01010_jqGrid';
4
-const STINFO01010_GRID_LIST = '#ITP_STINFO01010_jqGrid_list';
5
-const STINFO01010_GRID_PAGER = '#ITP_STINFO01010_jqGridPager';
6
-const STINFO01010_GRID_EMPTY = '#ITP_STINFO01010_jqGridEmpty';
7
-
8
-const STINFO01010_VIEW_GRID_ID = '#ITP_STINFO01010_VIEW_jqGrid';
9
-const STINFO01010_VIEW_GRID_LIST = '#ITP_STINFO01010_VIEW_jqGrid_list';
10
-const STINFO01010_VIEW_GRID_PAGER = '#ITP_STINFO01010_VIEW_jqGridPager';
11
-const STINFO01010_VIEW_GRID_EMPTY = '#ITP_STINFO01010_VIEW_jqGridEmpty';
12
-
13
-const STINFO01010_DETAIL_GRID_ID = '#ITP_STINFO01010_DETAIL_jqGrid';
14
-const STINFO01010_DETAIL_GRID_LIST = '#ITP_STINFO01010_DETAIL_jqGrid_list';
15
-const STINFO01010_DETAIL_GRID_PAGER = '#ITP_STINFO01010_DETAIL_jqGridPager';
16
-const STINFO01010_DETAIL_GRID_EMPTY = '#ITP_STINFO01010_DETAIL_jqGridEmpty';
17
-
18
-let ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = false;
19
-let ITP_FORM_STINFO01010_DETAIL_IS_WRITING = false;
20
-=======
21 2
 const OPER01010_GRID_ID = '#ITP_OPER01010_jqGrid';
22 3
 const OPER01010_GRID_LIST = '#ITP_OPER01010_jqGrid_list';
23 4
 const OPER01010_GRID_PAGER = '#ITP_OPER01010_jqGridPager';
@@ -35,7 +16,6 @@ const OPER01010_DETAIL_GRID_EMPTY = '#ITP_OPER01010_DETAIL_jqGridEmpty';
35 16
 
36 17
 let ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE = false;
37 18
 let ITP_FORM_OPER01010_DETAIL_IS_WRITING = false;
38
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
39 19
 
40 20
 let USER_DETAIL_GRID_LIST = '/api/user/detail-grid-list';
41 21
 let USER_USERAUTH_GRID_LIST = '/api/user/userauth-grid-list';
@@ -49,61 +29,6 @@ require(['config'], function() {
49 29
 		'jquery'
50 30
 	], function($) {
51 31
 		// 버튼 권한설정
52
-<<<<<<< HEAD
53
-		fn_proc_btn_auth('STINFO01010');
54
-		// 공통코드 표시
55
-		fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_STINFO01010_SEARCH_USER_STAT_CD');
56
-		fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD', true, '선택');
57
-		
58
-		// 조회일자 지정
59
-		var now = new Date();
60
-		$('#ITP_TAB_STINFO01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
61
-		// $('#ITP_FORM_STINFO01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
62
-		// $('#ITP_FORM_STINFO01010_SEARCH_TO_DT').datepicker('setDate', new Date());
63
-				
64
-		// 그리드				
65
-		itp_fn_jqgrid_resize(STINFO01010_GRID_ID, STINFO01010_GRID_LIST, 'lg');
66
-		itp_fn_STINFO01010_grid.init();
67
-    	itp_fn_fire_window_resize();
68
-
69
-		// 조회    	
70
-    	itp_fn_STINFO01010_search();
71
-    	
72
-		// 조회 버튼 클릭
73
-		$('#ITP_BTN_STINFO01010_SRH').on('click', function() {
74
-			itp_STINFO01010_search = true;
75
-			let param = $('#ITP_FORM_STINFO01010_SEARCH').serializeObject();
76
-			param.gridSize = $.jgrid.defaults.rowNum;
77
-			param.gridPage = $.jgrid.defaults.page;
78
-			$(STINFO01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
79
-		});
80
-		
81
-		// 수정 버튼
82
-		$('#ITP_BTN_STINFO01010_MODIFY').on('click', function() {
83
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO01010_DETAIL');			
84
-			const userIdVal = $('#ITP_FORM_STINFO01010_VIEW_USER_ID').val();
85
-			const key = {userId: userIdVal, viewCd: 'R'};
86
-			var param = $.param(key);
87
-			itp_fn_STINFO01010_detail(param);	
88
-		});
89
-		
90
-		// 신규등록 버튼
91
-		$('#ITP_BTN_STINFO01010_NEWREG').on('click', function() {
92
-			itp_fn_STINFO01010_switch_screen('ADD');			
93
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO01010_DETAIL');				
94
-			// 권한정보 리스트 조회
95
-			itp_fn_STINFO01010_detail_grid.unload();
96
-			itp_fn_STINFO01010_detail_grid.callBack();
97
-		});
98
-		
99
-		// 취소/목록 버튼
100
-		$('#ITP_BTN_STINFO01010_CANCELLIST').on('click', function() {
101
-			itp_fn_STINFO01010_search();
102
-    	});
103
-		
104
-		// 삭제 버튼
105
-		$('#ITP_BTN_STINFO01010_DELETE').on('click', function() {
106
-=======
107 32
 		fn_proc_btn_auth('OPER01010');
108 33
 		// 공통코드 표시
109 34
 		fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_OPER01010_SEARCH_USER_STAT_CD');
@@ -157,18 +82,12 @@ require(['config'], function() {
157 82
 		
158 83
 		// 삭제 버튼
159 84
 		$('#ITP_BTN_OPER01010_DELETE').on('click', function() {
160
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
161 85
 			
162 86
 		});
163 87
 		
164 88
 		// 저장 버튼
165
-<<<<<<< HEAD
166
-		$('#ITP_BTN_STINFO01010_SAVE').on('click', function() {			
167
-			const formId = '#ITP_FORM_STINFO01010_DETAIL';
168
-=======
169 89
 		$('#ITP_BTN_OPER01010_SAVE').on('click', function() {			
170 90
 			const formId = '#ITP_FORM_OPER01010_DETAIL';
171
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
172 91
 			itp_fn_form_clear_validate(null, formId);			
173 92
 			var vali_userId = itp_fn_form_validate(formId, formId + '_USER_ID', ['empty'], undefined);
174 93
 			var vali_userStatCd = itp_fn_form_validate(formId, formId + '_USER_STAT_CD', ['empty'], undefined);
@@ -177,30 +96,18 @@ require(['config'], function() {
177 96
 			var vali_email = itp_fn_form_validate(formId, formId + '_EMAIL', ['empty'], undefined);
178 97
 			var vali_userPw = true;
179 98
 			var vali_userPwConfirm = true;
180
-<<<<<<< HEAD
181
-			if($('#ITP_FORM_STINFO01010_DETAIL_VIEW_CD').val() == 'C') { // 신규
182
-=======
183 99
 			if($('#ITP_FORM_OPER01010_DETAIL_VIEW_CD').val() == 'C') { // 신규
184
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
185 100
 				vali_userPw = itp_fn_form_validate(formId, formId + '_USER_PW', ['empty'], undefined);
186 101
 				vali_userPwConfirm = itp_fn_form_validate(formId, formId + '_USER_PW_CONFIRM', ['empty'], undefined);	
187 102
 			}
188 103
 			if (vali_userId && vali_userStatCd && vali_userNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
189
-<<<<<<< HEAD
190
-				if (ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE) {
191
-=======
192 104
 				if (ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE) {
193
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
194 105
 					itp_fn_modal_duplicate(ITP_MSG_LOCALE.label.userId, formId + '_USER_ID');
195 106
 				} else {
196 107
 					let gridInsertData = [];
197 108
 					let gridUpdateData = [];
198 109
 					let gridDeleteData = [];
199
-<<<<<<< HEAD
200
-					const rowData = $(STINFO01010_DETAIL_GRID_ID).getRowData();
201
-=======
202 110
 					const rowData = $(OPER01010_DETAIL_GRID_ID).getRowData();
203
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
204 111
 					const keyValue = $(formId + '_USER_ID').val();
205 112
 					$.each(rowData, function(key, value) {
206 113
 						if (value.viewCd != 'R') {
@@ -220,13 +127,8 @@ require(['config'], function() {
220 127
 					param.gridDeleteData = gridDeleteData;
221 128
 					//console.log(JSON.stringify(param)); 						
222 129
 					var searhFn = function() {
223
-<<<<<<< HEAD
224
-						ITP_FORM_STINFO01010_DETAIL_IS_WRITING = false;
225
-						itp_fn_STINFO01010_search();
226
-=======
227 130
 						ITP_FORM_OPER01010_DETAIL_IS_WRITING = false;
228 131
 						itp_fn_OPER01010_search();
229
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
230 132
 					};
231 133
 					fn_ajax_call(USER_SAVE_USER, JSON.stringify(param), searhFn, 'POST');	
232 134
 				}
@@ -234,27 +136,16 @@ require(['config'], function() {
234 136
 		});		
235 137
 		
236 138
 		// 중복체크
237
-<<<<<<< HEAD
238
-		$('#ITP_FORM_STINFO01010_DETAIL_DUP').on('click', function() {
239
-			const formId = '#ITP_FORM_STINFO01010_DETAIL';
240
-=======
241 139
 		$('#ITP_FORM_OPER01010_DETAIL_DUP').on('click', function() {
242 140
 			const formId = '#ITP_FORM_OPER01010_DETAIL';
243
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
244 141
 			itp_fn_form_clear_validate(null, formId + '_DETAIL');
245 142
 			var vali_userId = itp_fn_form_validate(formId + '_DETAIL', formId + '_USER_ID', ['empty'], undefined);
246 143
 			if (vali_userId) {
247 144
 				var dupFn = function(result) {
248 145
 					if (result.code == 'N') {
249
-<<<<<<< HEAD
250
-						ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = false;
251
-					} else {
252
-						ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = true;
253
-=======
254 146
 						ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE = false;
255 147
 					} else {
256 148
 						ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE = true;
257
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
258 149
 					}
259 150
 				};
260 151
 				const key = {'userId':  $(formId + '_USER_ID').val()};
@@ -264,17 +155,10 @@ require(['config'], function() {
264 155
 		});
265 156
 		
266 157
 		// 상세:비밀번호 초기화
267
-<<<<<<< HEAD
268
-		$('#ITP_BTN_STINFO01010_RESET_PW').on('click', function() {
269
-			var resetPwFn = {
270
-				callBack: function(args) {
271
-					const key = {'userId':  $('#ITP_FORM_STINFO01010_DETAIL_USER_ID').val()};
272
-=======
273 158
 		$('#ITP_BTN_OPER01010_RESET_PW').on('click', function() {
274 159
 			var resetPwFn = {
275 160
 				callBack: function(args) {
276 161
 					const key = {'userId':  $('#ITP_FORM_OPER01010_DETAIL_USER_ID').val()};
277
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
278 162
 					const param = $.param(key);
279 163
 					fn_ajax_call(USER_INTI_USERPW, param, undefined, 'GET');					
280 164
 				}
@@ -282,20 +166,12 @@ require(['config'], function() {
282 166
 			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.askResetUserPw, resetPwFn, null);		
283 167
 		});
284 168
 		// 상세:추가버튼
285
-<<<<<<< HEAD
286
-		$('#ITP_BTN_STINFO01010_DETAIL_ADDROW').on('click', function() {
287
-=======
288 169
 		$('#ITP_BTN_OPER01010_DETAIL_ADDROW').on('click', function() {
289
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
290 170
 			// 팝업
291 171
 			var popFn = function(rowDataPop) {
292 172
 				// 기존등록 데이터 
293 173
 				var exists = '';				
294
-<<<<<<< HEAD
295
-				const rowData = $(STINFO01010_DETAIL_GRID_ID).getRowData();
296
-=======
297 174
 				const rowData = $(OPER01010_DETAIL_GRID_ID).getRowData();
298
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
299 175
 				$.each(rowData, function(key, value) {
300 176
 					exists = exists + value.authNo + ';';
301 177
 				});
@@ -303,17 +179,6 @@ require(['config'], function() {
303 179
 				$.each(rowDataPop, function(key, value) {
304 180
 					if(exists.indexOf(value.authNo) < 0) {
305 181
 						// 행추가
306
-<<<<<<< HEAD
307
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
308
-						var rids = $(STINFO01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
309
-						var last_row_id = rids[rids.length - 1];
310
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'viewCd', 'C');
311
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'authNo', value.authNo);
312
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'authNm', value.authNm);	
313
-					}
314
-				});
315
-				$(STINFO01010_DETAIL_GRID_EMPTY).hide();
316
-=======
317 182
 						$(OPER01010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
318 183
 						var rids = $(OPER01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
319 184
 						var last_row_id = rids[rids.length - 1];
@@ -323,22 +188,10 @@ require(['config'], function() {
323 188
 					}
324 189
 				});
325 190
 				$(OPER01010_DETAIL_GRID_EMPTY).hide();
326
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
327 191
 			};
328 192
 			fn_call_popup('comm', 'AUTH_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
329 193
 		});
330 194
 		// 상세:삭제버튼
331
-<<<<<<< HEAD
332
-		$('#ITP_BTN_STINFO01010_DETAIL_DELROW').on('click', function() {
333
-			itp_fn_grid_del_row(STINFO01010_DETAIL_GRID_ID);
334
-		});
335
-		
336
-		$('body').on('click', function(e) {
337
-			var gridId = STINFO01010_DETAIL_GRID_ID.replace('#', '');
338
-			var rids = $(STINFO01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
339
-			var last_row_id = rids[rids.length - 1];			
340
-			itp_fn_grid_reset_selection(e, last_row_id, gridId, 'STINFO01010_DETAIL');
341
-=======
342 195
 		$('#ITP_BTN_OPER01010_DETAIL_DELROW').on('click', function() {
343 196
 			itp_fn_grid_del_row(OPER01010_DETAIL_GRID_ID);
344 197
 		});
@@ -348,92 +201,10 @@ require(['config'], function() {
348 201
 			var rids = $(OPER01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
349 202
 			var last_row_id = rids[rids.length - 1];			
350 203
 			itp_fn_grid_reset_selection(e, last_row_id, gridId, 'OPER01010_DETAIL');
351
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
352 204
 		});
353 205
 	});
354 206
 });
355 207
 
356
-<<<<<<< HEAD
357
-var itp_fn_STINFO01010_switch_screen = function(mode) {
358
-	if(mode == 'LIST') { // 목록
359
-		$('#ITP_BTN_STINFO01010_MODIFY').hide();
360
-		$('#ITP_BTN_STINFO01010_CANCELLIST').hide();
361
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
362
-		$('#ITP_BTN_STINFO01010_SAVE').hide();
363
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_SRH');
364
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_NEWREG');
365
-		
366
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').show();
367
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').hide();		
368
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').hide();
369
-	} else if(mode == 'ADD') { // 등록
370
-		ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = true;
371
-	
372
-		$('#ITP_BTN_STINFO01010_SRH').hide();
373
-		$('#ITP_BTN_STINFO01010_MODIFY').hide();
374
-		$('#ITP_BTN_STINFO01010_NEWREG').hide();
375
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
376
-		$('#ITP_BTN_STINFO01010_RESET_PW').hide();
377
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_CANCELLIST');
378
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_SAVE');
379
-		
380
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').hide();
381
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').show();
382
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').hide();		
383
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_ID').removeAttr('readonly');
384
-		$('#ITP_FORM_STINFO01010_DETAIL_DUP').removeAttr('disabled');
385
-		
386
-		$('#ITP_FORM_STINFO01010_DETAIL_VIEW_CD').val('C');
387
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_NM').val('');
388
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD').val('');
389
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_ID').val('');
390
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_PW').val('');
391
-		$('#ITP_FORM_STINFO01010_DETAIL_TEL_NO').val('');
392
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM').val('');
393
-		$('#ITP_FORM_STINFO01010_DETAIL_EMAIL').val('');
394
-	} else if(mode == 'MODIFY') { // 수정
395
-		$('#ITP_BTN_STINFO01010_SRH').hide();
396
-		$('#ITP_BTN_STINFO01010_MODIFY').hide();
397
-		$('#ITP_BTN_STINFO01010_NEWREG').hide();		
398
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
399
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_CANCELLIST');
400
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_SAVE');
401
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_RESET_PW');	
402
-		
403
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').hide();
404
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').show();
405
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').hide();
406
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_ID').attr('readonly', true);
407
-		$('#ITP_FORM_STINFO01010_DETAIL_DUP').attr('disabled', true);
408
-	} else if(mode == 'VIEW') { // 보기
409
-		$('#ITP_BTN_STINFO01010_SRH').hide();
410
-		$('#ITP_BTN_STINFO01010_NEWREG').hide();		
411
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
412
-		$('#ITP_BTN_STINFO01010_SAVE').hide();
413
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_MODIFY');
414
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_CANCELLIST');
415
-		
416
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').hide();
417
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').hide();
418
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').show();
419
-	}	
420
-};
421
-
422
-var itp_fn_STINFO01010_grid = {
423
-	init: function() {
424
-		// 데이터 없을때
425
-		itp_fn_STINFO01010_empty.push();
426
-		$(STINFO01010_GRID_EMPTY).on('click', function() {
427
-			itp_fn_STINFO01010_empty.back();
428
-			itp_STINFO01010_param.gridSize = $.jgrid.defaults.rowNum;
429
-			$(STINFO01010_GRID_ID).setGridParam({'postData': JSON.stringify(itp_STINFO01010_param)}).trigger('reloadGrid');
430
-		});	
431
-	},
432
-	callBack: function() {
433
-		let param = $('#ITP_FORM_STINFO01010_SEARCH').serializeObject();
434
-		param.gridSize = $.jgrid.defaults.rowNum;	
435
-		$(STINFO01010_GRID_ID).jqGrid({
436
-=======
437 208
 var itp_fn_OPER01010_switch_screen = function(mode) {
438 209
 	if(mode == 'LIST') { // 목록
439 210
 		$('#ITP_BTN_OPER01010_MODIFY').hide();
@@ -509,71 +280,79 @@ var itp_fn_OPER01010_grid = {
509 280
 			$(OPER01010_GRID_ID).setGridParam({'postData': JSON.stringify(itp_OPER01010_param)}).trigger('reloadGrid');
510 281
 		});	
511 282
 	},
283
+	colModel: [
284
+		{
285
+			index: 'AGENCY_NM', name: 'afflShop',
286
+			label: ITP_MSG_LOCALE.label.afflShop, //가맹점
287
+			width: '10', fixed: false, align: 'center',
288
+			sortable: false, hidden: false
289
+		},
290
+		{
291
+			index: 'BRAND_NM', name: 'brandNm',
292
+			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
293
+			width: '13', fixed: false, align: 'center',
294
+			sortable: false, hidden: false
295
+		},
296
+		{
297
+			index: 'USER_ID', name: 'userId',
298
+			label: ITP_MSG_LOCALE.label.userId, //사용자ID
299
+			width: '10', fixed: false, align: 'center',
300
+			sortable: false, hidden: false
301
+		},
302
+		{
303
+			index: 'USER_NM', name: 'userNm',
304
+			label: ITP_MSG_LOCALE.label.userName, //닉네임
305
+			width: '13', fixed: false, align: 'center',
306
+			sortable: false, hidden: false
307
+		},
308
+		{
309
+			index: 'EMAIL', name: 'email',
310
+			label: ITP_MSG_LOCALE.label.idEmail, //아이디(이메일)
311
+			width: '15', fixed: false, align: 'center',
312
+			sortable: false, hidden: false
313
+		},
314
+		{
315
+			index: 'TEL_NO', name: 'telNo',
316
+			label: ITP_MSG_LOCALE.label.telNo, //휴대폰 번호
317
+			width: '10', fixed: false, align: 'center',
318
+			sortable: false, hidden: false
319
+		},
320
+		{
321
+			index: 'USER_STAT_NM', name: 'userStatNm',
322
+			label: ITP_MSG_LOCALE.label.status, //상태
323
+			width: '6', fixed: false, align: 'center',
324
+			sortable: false, hidden: false
325
+		},
326
+		{
327
+			index: 'USER_STAT_DT', name: 'userStatDt',
328
+			label: ITP_MSG_LOCALE.label.statusDt, //상태일시
329
+			width: '10', fixed: false, align: 'center',
330
+			sortable: false, hidden: false
331
+		},
332
+		{
333
+			index: 'ADD_DT', name: 'addDt',
334
+			label: ITP_MSG_LOCALE.label.regDt, //등록일
335
+			width: '10', fixed: false, align: 'center',
336
+			sortable: false, hidden: false
337
+		},
338
+		{
339
+			index: 'LAST_LOGIN_DT', name: 'lastLoginDt',
340
+			label: ITP_MSG_LOCALE.label.lastLogin, //마지막 로그인
341
+			width: '10', fixed: false, align: 'center',
342
+			sortable: false, hidden: false
343
+		}
344
+	],
512 345
 	callBack: function() {
513 346
 		let param = $('#ITP_FORM_OPER01010_SEARCH').serializeObject();
514 347
 		param.gridSize = $.jgrid.defaults.rowNum;	
515 348
 		$(OPER01010_GRID_ID).jqGrid({
516
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
517
-			colModel: [
518
-				{
519
-					index: 'USER_ID', name: 'userId',
520
-					label: ITP_MSG_LOCALE.label.userId, //사용자ID
521
-					width: '10', fixed: false, align: 'center',
522
-					sortable: false, hidden: false
523
-				},
524
-				{
525
-					index: 'USER_NM', name: 'userNm',
526
-					label: ITP_MSG_LOCALE.label.userName, //닉네임
527
-					width: '13', fixed: false, align: 'center',
528
-					sortable: false, hidden: false
529
-				},
530
-				{
531
-					index: 'EMAIL', name: 'email',
532
-					label: ITP_MSG_LOCALE.label.idEmail, //아이디(이메일)
533
-					width: '15', fixed: false, align: 'center',
534
-					sortable: false, hidden: false
535
-				},
536
-				{
537
-					index: 'TEL_NO', name: 'telNo',
538
-					label: ITP_MSG_LOCALE.label.telNo, //휴대폰 번호
539
-					width: '10', fixed: false, align: 'center',
540
-					sortable: false, hidden: false
541
-				},			
542
-				{
543
-					index: 'USER_STAT_NM', name: 'userStatNm',
544
-					label: ITP_MSG_LOCALE.label.status, //상태
545
-					width: '6', fixed: false, align: 'center',
546
-					sortable: false, hidden: false
547
-				},
548
-				{
549
-					index: 'USER_STAT_DT', name: 'userStatDt',
550
-					label: ITP_MSG_LOCALE.label.statusDt, //상태일시
551
-					width: '10', fixed: false, align: 'center',
552
-					sortable: false, hidden: false
553
-				},
554
-				{
555
-					index: 'ADD_DT', name: 'addDt',
556
-					label: ITP_MSG_LOCALE.label.regDt, //등록일
557
-					width: '10', fixed: false, align: 'center',
558
-					sortable: false, hidden: false
559
-				},
560
-				{
561
-					index: 'LAST_LOGIN_DT', name: 'lastLoginDt',
562
-					label: ITP_MSG_LOCALE.label.lastLogin, //마지막 로그인
563
-					width: '10', fixed: false, align: 'center',
564
-					sortable: false, hidden: false
565
-				}
566
-			],
349
+			colModel: this.colModel,
567 350
 			loadBeforeSend: function(jqXHR) {
568 351
 			    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
569 352
 			},
570 353
 			postData: JSON.stringify(param),
571 354
 			url: DOMAIN + USER_DETAIL_GRID_LIST,
572
-<<<<<<< HEAD
573
-			pager: STINFO01010_GRID_PAGER,
574
-=======
575 355
 			pager: OPER01010_GRID_PAGER,
576
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
577 356
 			multiselect: false,
578 357
 			rownumbers: true, 
579 358
 			onCellSelect: function(rowId, cellIdx, cellValue) {
@@ -583,106 +362,21 @@ var itp_fn_OPER01010_grid = {
583 362
 					const userIdVal = $(this).jqGrid('getCell', rowId, 'userId');
584 363
 					const key = {userId: userIdVal, viewCd: 'R'};
585 364
 					var param = $.param(key);
586
-<<<<<<< HEAD
587
-					itp_fn_STINFO01010_view(param);
588
-=======
589 365
 					itp_fn_OPER01010_view(param);
590
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
591 366
 				}
592 367
 		   	},
593 368
 			loadComplete: function(data) {
594 369
 				//console.log(JSON.stringify(data));
595
-<<<<<<< HEAD
596
-				itp_fn_grid_load_complete(data, STINFO01010_GRID_ID, true, 'number', 'STINFO01010', itp_STINFO01010_search, itp_fn_STINFO01010_empty, true, data.gridRecords, true);
597
-				var ids = $(STINFO01010_GRID_ID).getDataIDs();
598
-				$.each(ids, function(idx, rowId) {
599
-					$(STINFO01010_GRID_ID).jqGrid('setCell', rowId, 'userNm', '', ITP_GRID_COL_STYLE.link);
600
-=======
601 370
 				itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', itp_OPER01010_search, itp_fn_OPER01010_empty, true, data.gridRecords, true);
602 371
 				var ids = $(OPER01010_GRID_ID).getDataIDs();
603 372
 				$.each(ids, function(idx, rowId) {
604 373
 					$(OPER01010_GRID_ID).jqGrid('setCell', rowId, 'userNm', '', ITP_GRID_COL_STYLE.link);
605
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
606 374
 				});	
607 375
 		    },
608 376
 		    loadError: function(jqXHR, textStatus, errorThrown) {
609 377
 		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
610 378
 		    },
611 379
 		    onPaging: function(action) {
612
-<<<<<<< HEAD
613
-		    	itp_fn_grid_paging(STINFO01010_GRID_ID, action, param);
614
-		    }
615
-		}).navGrid(STINFO01010_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
616
-	},
617
-	clearData : function() {
618
-		$(STINFO01010_GRID_ID).jqGrid('clearGridData', true);
619
-		$(STINFO01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
620
-		$(STINFO01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
621
-		$(STINFO01010_GRID_EMPTY).show();
622
-	}, 
623
-	unload : function() {
624
-		$.jgrid.gridUnload(STINFO01010_GRID_ID); 
625
-	}
626
-};
627
-
628
-var itp_fn_STINFO01010_search = function() {
629
-	itp_fn_STINFO01010_switch_screen('LIST');	
630
-	itp_fn_STINFO01010_grid.unload();
631
-	itp_fn_STINFO01010_grid.callBack();
632
-};
633
-
634
-let itp_STINFO01010_param = {};
635
-let itp_STINFO01010_search = false;
636
-var itp_fn_STINFO01010_empty = {
637
-	push: function() {
638
-		let param = $('#ITP_FORM_STINFO01010_SEARCH').serializeObject();
639
-		itp_STINFO01010_param = param;
640
-	},
641
-	back: function() {
642
-		$('#ITP_FORM_STINFO01010_DEVI_TP_CD').val(itp_STINFO01010_param.deviTpCd);
643
-		$('#ITP_FORM_STINFO01010_ORDER_YN').val(itp_STINFO01010_param.orderYn);
644
-		$('#ITP_FORM_STINFO01010_ADT_AUTH_CD').val(itp_STINFO01010_param.adtAuthCd);
645
-		$('#ITP_FORM_STINFO01010_EMAIL_RCV_YN').val(itp_STINFO01010_param.emailRcvYn);
646
-		$('#ITP_FORM_STINFO01010_SMS_RCV_YN').val(itp_STINFO01010_param.smsRcvYn);
647
-		$('#ITP_FORM_STINFO01010_MEMB_EXIT_DT').val(itp_STINFO01010_param.membExitDt);
648
-		$('#ITP_FORM_STINFO01010_FROM_DT').val(itp_STINFO01010_param.fromDt);
649
-		$('#ITP_FORM_STINFO01010_TO_DT').val(itp_STINFO01010_param.toDt);
650
-		$('#ITP_FORM_STINFO01010_KEYWORD').val(itp_STINFO01010_param.keyword);
651
-	}
652
-};
653
-
654
-var itp_fn_STINFO01010_view = function(param) {
655
-	fn_ajax_call(USER_INFO_USER, param, itp_fn_STINFO01010_view_callback, 'GET');
656
-};
657
-
658
-var itp_fn_STINFO01010_view_callback = function(result) {
659
-	// console.log(result);
660
-	itp_fn_STINFO01010_switch_screen('VIEW');
661
-	$('#ITP_FORM_STINFO01010_VIEW #ITP_FORM_STINFO01010_VIEW_USER_ID').val(result.userId);
662
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserNm').text(result.userNm);
663
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserStatDt').text(result.userStatDt);
664
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserStatNm').text(result.userStatNm);
665
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserId').text(result.userId);
666
-	$('#ITP_FORM_STINFO01010_VIEW .fnEmail').text(result.email);
667
-	$('#ITP_FORM_STINFO01010_VIEW .fnTelNo').text(result.telNo);
668
-	$('#ITP_FORM_STINFO01010_VIEW .fnAddDt').text(result.addDt);
669
-	$('#ITP_FORM_STINFO01010_VIEW .fnLastLoginDt').text(result.lastLoginDt);
670
-	
671
-	// 권한정보 리스트 조회
672
-	itp_fn_STINFO01010_view_grid.unload();
673
-	itp_fn_STINFO01010_view_grid.callBack();
674
-};
675
-
676
-var itp_fn_STINFO01010_view_grid = {
677
-	init: function() {
678
-	},
679
-	callBack: function() {
680
-		let param = $('#ITP_FORM_STINFO01010_VIEW').serializeObject();
681
-		param.gridSize = $.jgrid.defaults.rowNum; 
682
-		param.pagingYn = false; // 페이징안함
683
-		
684
-		$(STINFO01010_VIEW_GRID_ID).jqGrid({
685
-=======
686 380
 		    	itp_fn_grid_paging(OPER01010_GRID_ID, action, param);
687 381
 		    }
688 382
 		}).navGrid(OPER01010_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
@@ -754,7 +448,6 @@ var itp_fn_OPER01010_view_grid = {
754 448
 		param.pagingYn = false; // 페이징안함
755 449
 		
756 450
 		$(OPER01010_VIEW_GRID_ID).jqGrid({
757
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
758 451
 			colModel: [
759 452
 				{
760 453
 					index: 'VIEW_CD', name: 'viewCd',
@@ -794,17 +487,10 @@ var itp_fn_OPER01010_view_grid = {
794 487
 			},
795 488
 			postData: JSON.stringify(param),
796 489
 			url: DOMAIN + USER_USERAUTH_GRID_LIST,
797
-<<<<<<< HEAD
798
-			pager: STINFO01010_VIEW_GRID_PAGER,
799
-			multiselect: false,
800
-			loadComplete: function(data) {				
801
-				itp_fn_grid_load_complete(data, STINFO01010_VIEW_GRID_ID, true, undefined, 'STINFO01010_VIEW');
802
-=======
803 490
 			pager: OPER01010_VIEW_GRID_PAGER,
804 491
 			multiselect: false,
805 492
 			loadComplete: function(data) {				
806 493
 				itp_fn_grid_load_complete(data, OPER01010_VIEW_GRID_ID, true, undefined, 'OPER01010_VIEW');
807
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
808 494
 		    },
809 495
 		    loadError: function(jqXHR, textStatus, errorThrown) {
810 496
 		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
@@ -815,19 +501,11 @@ var itp_fn_OPER01010_view_grid = {
815 501
 	    				$(args).trigger('reloadGrid');
816 502
 	    			}
817 503
 	    		};
818
-<<<<<<< HEAD
819
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_VIEW_GRID_ID)) {
820
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, STINFO01010_VIEW_GRID_ID);
821
-		    		return 'stop';
822
-		    	} else {
823
-		    		itp_fn_grid_paging(STINFO01010_VIEW_GRID_ID, action, param);
824
-=======
825 504
 		    	if (itp_fn_check_grid_is_writing(OPER01010_VIEW_GRID_ID)) {
826 505
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, OPER01010_VIEW_GRID_ID);
827 506
 		    		return 'stop';
828 507
 		    	} else {
829 508
 		    		itp_fn_grid_paging(OPER01010_VIEW_GRID_ID, action, param);
830
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
831 509
 		    	}
832 510
 		    },
833 511
 		    onSortCol: function(index, columnIndex, sortOrder) {
@@ -836,61 +514,6 @@ var itp_fn_OPER01010_view_grid = {
836 514
 	    				$(args).trigger('reloadGrid');
837 515
 	    			}
838 516
 	    		};
839
-<<<<<<< HEAD
840
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_VIEW_GRID_ID)) {
841
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, STINFO01010_VIEW_GRID_ID);
842
-		    		return 'stop';
843
-		    	} else {
844
-		    		itp_fn_grid_sorting(STINFO01010_VIEW_GRID_ID, index, sortOrder);
845
-		    	}
846
-		    }
847
-		}).navGrid(STINFO01010_VIEW_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
848
-	},
849
-	clearData : function() {
850
-		$(STINFO01010_VIEW_GRID_ID).jqGrid('clearGridData', true);
851
-		$(STINFO01010_VIEW_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
852
-		$(STINFO01010_VIEW_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
853
-		$(STINFO01010_VIEW_GRID_EMPTY).show();
854
-	}, 
855
-	unload : function() {
856
-		$.jgrid.gridUnload(STINFO01010_VIEW_GRID_ID); 
857
-	}
858
-};
859
-
860
-var itp_fn_STINFO01010_detail = function(param) {
861
-	fn_ajax_call(USER_INFO_USER, param, itp_fn_STINFO01010_detail_callback, 'GET');
862
-};
863
-
864
-var itp_fn_STINFO01010_detail_callback = function(result) {
865
-	// console.log(result);
866
-	itp_fn_STINFO01010_switch_screen('MODIFY');
867
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_VIEW_CD').val('U');
868
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_NM').val(result.userNm);
869
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD').val(result.userStatCd);
870
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_ID').val(result.userId);
871
-	$('#ITP_FORM_STINFO01010_DETAIL .fnUserStatDt').text(result.userStatDt);
872
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_PW').val(result.userPw);
873
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM').val(result.userPw);
874
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_TEL_NO').val(result.telNo);
875
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_EMAIL').val(result.email);
876
-	$('#ITP_FORM_STINFO01010_DETAIL .fnAddDt').text(result.addDt);
877
-	$('#ITP_FORM_STINFO01010_DETAIL .fnLastLoginDt').text(result.lastLoginDt);
878
-	
879
-	// 권한정보 리스트 조회
880
-	itp_fn_STINFO01010_detail_grid.unload();
881
-	itp_fn_STINFO01010_detail_grid.callBack();
882
-};
883
-
884
-var itp_fn_STINFO01010_detail_grid = {
885
-	init: function() {
886
-	},
887
-	callBack: function() {
888
-		let param = $('#ITP_FORM_STINFO01010_DETAIL').serializeObject();
889
-		param.gridSize = $.jgrid.defaults.rowNum; 
890
-		param.pagingYn = false; // 페이지안함 
891
-		
892
-		$(STINFO01010_DETAIL_GRID_ID).jqGrid({
893
-=======
894 517
 		    	if (itp_fn_check_grid_is_writing(OPER01010_VIEW_GRID_ID)) {
895 518
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, OPER01010_VIEW_GRID_ID);
896 519
 		    		return 'stop';
@@ -944,7 +567,6 @@ var itp_fn_OPER01010_detail_grid = {
944 567
 		param.pagingYn = false; // 페이지안함 
945 568
 		
946 569
 		$(OPER01010_DETAIL_GRID_ID).jqGrid({
947
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
948 570
 			colModel: [
949 571
 				{
950 572
 					index: 'VIEW_CD', name: 'viewCd',
@@ -984,15 +606,9 @@ var itp_fn_OPER01010_detail_grid = {
984 606
 			},
985 607
 			postData: JSON.stringify(param),
986 608
 			url: DOMAIN + USER_USERAUTH_GRID_LIST,
987
-<<<<<<< HEAD
988
-			pager: STINFO01010_DETAIL_GRID_PAGER,
989
-			loadComplete: function(data) {				
990
-				itp_fn_grid_load_complete(data, STINFO01010_DETAIL_GRID_ID, true, undefined, 'STINFO01010_DETAIL');
991
-=======
992 609
 			pager: OPER01010_DETAIL_GRID_PAGER,
993 610
 			loadComplete: function(data) {				
994 611
 				itp_fn_grid_load_complete(data, OPER01010_DETAIL_GRID_ID, true, undefined, 'OPER01010_DETAIL');
995
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
996 612
 		    },
997 613
 		    loadError: function(jqXHR, textStatus, errorThrown) {
998 614
 		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
@@ -1003,19 +619,11 @@ var itp_fn_OPER01010_detail_grid = {
1003 619
 	    				$(args).trigger('reloadGrid');
1004 620
 	    			}
1005 621
 	    		};
1006
-<<<<<<< HEAD
1007
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_DETAIL_GRID_ID)) {
1008
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, STINFO01010_DETAIL_GRID_ID);
1009
-		    		return 'stop';
1010
-		    	} else {
1011
-		    		itp_fn_grid_paging(STINFO01010_DETAIL_GRID_ID, action, param);
1012
-=======
1013 622
 		    	if (itp_fn_check_grid_is_writing(OPER01010_DETAIL_GRID_ID)) {
1014 623
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, OPER01010_DETAIL_GRID_ID);
1015 624
 		    		return 'stop';
1016 625
 		    	} else {
1017 626
 		    		itp_fn_grid_paging(OPER01010_DETAIL_GRID_ID, action, param);
1018
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
1019 627
 		    	}
1020 628
 		    },
1021 629
 		    onSortCol: function(index, columnIndex, sortOrder) {
@@ -1024,25 +632,6 @@ var itp_fn_OPER01010_detail_grid = {
1024 632
 	    				$(args).trigger('reloadGrid');
1025 633
 	    			}
1026 634
 	    		};
1027
-<<<<<<< HEAD
1028
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_DETAIL_GRID_ID)) {
1029
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, STINFO01010_DETAIL_GRID_ID);
1030
-		    		return 'stop';
1031
-		    	} else {
1032
-		    		itp_fn_grid_sorting(STINFO01010_DETAIL_GRID_ID, index, sortOrder);
1033
-		    	}
1034
-		    }
1035
-		}).navGrid(STINFO01010_DETAIL_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
1036
-	},
1037
-	clearData : function() {
1038
-		$(STINFO01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
1039
-		$(STINFO01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
1040
-		$(STINFO01010_DETAIL_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
1041
-		$(STINFO01010_DETAIL_GRID_EMPTY).show();
1042
-	}, 
1043
-	unload : function() {
1044
-		$.jgrid.gridUnload(STINFO01010_DETAIL_GRID_ID); 
1045
-=======
1046 635
 		    	if (itp_fn_check_grid_is_writing(OPER01010_DETAIL_GRID_ID)) {
1047 636
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, OPER01010_DETAIL_GRID_ID);
1048 637
 		    		return 'stop';
@@ -1060,6 +649,5 @@ var itp_fn_OPER01010_detail_grid = {
1060 649
 	}, 
1061 650
 	unload : function() {
1062 651
 		$.jgrid.gridUnload(OPER01010_DETAIL_GRID_ID); 
1063
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
1064 652
 	}
1065 653
 };

+ 36 - 0
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -14,6 +14,11 @@ const OPER02010_DETAIL_GRID_LIST = '#ITP_OPER02010_DETAIL_jqGrid_list';
14 14
 const OPER02010_DETAIL_GRID_PAGER = '#ITP_OPER02010_DETAIL_jqGridPager';
15 15
 const OPER02010_DETAIL_GRID_EMPTY = '#ITP_OPER02010_DETAIL_jqGridEmpty';
16 16
 
17
+const OPER02010_BRAND_GRID_ID = '#ITP_OPER02010_BRAND_jqGrid';
18
+const OPER02010_BRAND_GRID_LIST = '#ITP_OPER02010_BRAND_jqGrid_list';
19
+const OPER02010_BRAND_GRID_PAGER = '#ITP_OPER02010_BRAND_jqGridPager';
20
+const OPER02010_BRAND_GRID_EMPTY = '#ITP_OPER02010_BRAND_jqGridEmpty';
21
+
17 22
 let ITP_FORM_OPER02010_DETAIL_IS_WRITING = false;
18 23
 
19 24
 let NTICE_SAVE_NTICE = '/api/ntice/save-ntice';
@@ -594,4 +599,35 @@ var itp_fn_OPER02010_detail_grid = {
594 599
 	unload : function() {
595 600
 		$.jgrid.gridUnload(OPER02010_DETAIL_GRID_ID);
596 601
 	}
602
+};
603
+
604
+var itp_fn_OPER02010_brand_grid = {
605
+	init: function() {
606
+	},
607
+	colModel: [
608
+		{
609
+			index: 'BRAND_ID', name: 'brandId',
610
+			label: ITP_MSG_LOCALE.table.brandId,
611
+			width: '20', fixed: false, align: 'center',
612
+			sortable: false, editable: false, edittype: 'text'
613
+		},
614
+		{
615
+			index: 'BRAND_NM', name: 'brandNm',
616
+			label: ITP_MSG_LOCALE.table.brandNm,
617
+			width: '30', fixed: false, align: 'center',
618
+			sortable: false, editable: false, edittype: 'text'
619
+		}
620
+	],
621
+	callBack: function() {
622
+
623
+	},
624
+	clearData : function() {
625
+		$(OPER02010_BRAND_GRID_ID).jqGrid('clearGridData', true);
626
+		$(OPER02010_BRAND_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
627
+		$(OPER02010_BRAND_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
628
+		$(OPER02010_BRAND_GRID_EMPTY).show();
629
+	},
630
+	unload : function() {
631
+		$.jgrid.gridUnload(OPER02010_BRAND_GRID_ID);
632
+	}
597 633
 };

+ 45 - 44
src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -467,54 +467,55 @@ var itp_fn_OPER03010_grid = {
467 467
 			$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(itp_OPER03010_param)}).trigger('reloadGrid');
468 468
 		});	
469 469
 	},
470
+	colModel: [
471
+		{
472
+			index: 'CMPY_CD', name: 'cmpyCd',
473
+			label: '가맹점코드',
474
+			width: '6', fixed: false, align: 'center',
475
+			sortable: false, hidden: false
476
+		},
477
+		{
478
+			index: 'CMPY_NM', name: 'cmpyNm',
479
+			label: '가맹점명',
480
+			width: '10', fixed: false, align: 'center',
481
+			sortable: false, hidden: false
482
+		},
483
+		{
484
+			index: 'CMPY_TYPE_NM', name: 'cmpyTypeNm',
485
+			label: '기업형태',
486
+			width: '6', fixed: false, align: 'center',
487
+			sortable: false, hidden: false
488
+		},
489
+		{
490
+			index: 'CMPY_STAT_NM', name: 'cmpyStatNm',
491
+			label: '기업상태',
492
+			width: '6', fixed: false, align: 'center',
493
+			sortable: false, hidden: false
494
+		},
495
+		{
496
+			index: 'BOSS_NM', name: 'bossNm',
497
+			label: '대표자명',
498
+			width: '6', fixed: false, align: 'center',
499
+			sortable: false, hidden: false
500
+		},
501
+		{
502
+			index: 'MAIN_TEL', name: 'mainTel',
503
+			label: '대표연락처',
504
+			width: '6', fixed: false, align: 'center',
505
+			sortable: false, hidden: false
506
+		},
507
+		{
508
+			index: 'ADD_DT', name: 'addDt',
509
+			label: '가입일자',
510
+			width: '8', fixed: false, align: 'center',
511
+			sortable: false, hidden: false
512
+		}
513
+	],
470 514
 	callBack: function() {
471 515
 		let param = $('#ITP_FORM_OPER03010_SEARCH').serializeObject();
472 516
 		param.gridSize = $.jgrid.defaults.rowNum;	
473 517
 		$(OPER03010_GRID_ID).jqGrid({
474
-			colModel: [
475
-				{
476
-					index: 'CMPY_CD', name: 'cmpyCd',
477
-					label: '가입자코드', 
478
-					width: '6', fixed: false, align: 'center',
479
-					sortable: false, hidden: false
480
-				},
481
-				{
482
-					index: 'CMPY_NM', name: 'cmpyNm',
483
-					label: '가입자명', 
484
-					width: '10', fixed: false, align: 'center',
485
-					sortable: false, hidden: false
486
-				},
487
-				{
488
-					index: 'CMPY_TYPE_NM', name: 'cmpyTypeNm',
489
-					label: '기업형태', 
490
-					width: '6', fixed: false, align: 'center',
491
-					sortable: false, hidden: false
492
-				},
493
-				{
494
-					index: 'CMPY_STAT_NM', name: 'cmpyStatNm',
495
-					label: '기업상태', 
496
-					width: '6', fixed: false, align: 'center',
497
-					sortable: false, hidden: false
498
-				},
499
-				{
500
-					index: 'BOSS_NM', name: 'bossNm',
501
-					label: '대표자명', 
502
-					width: '6', fixed: false, align: 'center',
503
-					sortable: false, hidden: false
504
-				},
505
-				{
506
-					index: 'MAIN_TEL', name: 'mainTel',
507
-					label: '대표연락처', 
508
-					width: '6', fixed: false, align: 'center',
509
-					sortable: false, hidden: false
510
-				},
511
-				{
512
-					index: 'ADD_DT', name: 'addDt',
513
-					label: '가입일자', 
514
-					width: '8', fixed: false, align: 'center',
515
-					sortable: false, hidden: false
516
-				}
517
-			],
518
+			colModel: this.colModel,
518 519
 			loadBeforeSend: function(jqXHR) {
519 520
 			    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
520 521
 			},