메인 브랜드 관리 적용

src/main/webapp/app/oper/OPER01010.html

@@ -1,40 +1,3 @@
-<<<<<<< HEAD
-<section id="ITP_TAB_STINFO01010" class="tab-pane active itp_sec">
-	<div class="itp_cont">
-		<article class="itp_detail">
-			<div class="itp_det_head fix">
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>브랜드관리</strong></h2>
-				<div class="pull-right itp_cicon">
-					<button type="button" id="ITP_BTN_STINFO01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
-					<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>
-					<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>
-					<button type="button" id="ITP_BTN_STINFO01010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon glyphicon-remove"></i> 삭제</button>
-					<button type="button" id="ITP_BTN_STINFO01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon glyphicon-ok"></i> 저장</button>
-					<button type="button" id="ITP_BTN_STINFO01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon glyphicon-minus"></i> 취소/목록</button>
-				</div>				
-			</div>
-			<div class="itp_det_in">
-				<div id="ITP_AJAX_STINFO01010_LIST_CONTAINER">
-					<div class="itp_lg_form itp_type1 fix">
-						<div class="itp_srh_border fix">
-							<div class="col-xs-12">
-								<form id="ITP_FORM_STINFO01010_SEARCH" class="form-horizontal">
-									<div class="form-group">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_STINFO01010_SERVICE_ST_DT" class="form-control itp_input" name="serviceStDt">
-												<option value="">카테고리(전체)</option>										
-											</select>
-										</div>
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_STINFO01010_SEARCH_USER_STAT_CD" class="form-control itp_input" name="ST_CD">
-												<option value="">상태(전체)</option>										
-											</select>
-										</div>
-										<div class="col-xs-6 itp_ip">
-										<input type="text" id="ITP_FORM_STINFO01010_SEARCH_USER_NM" class="form-control itp_input" name="BRAND_NM" placeholder="브랜드명" />
-										</div>
-															
-=======
 <section id="ITP_TAB_OPER01010" class="tab-pane active itp_sec">
 	<div class="itp_cont">
 		<article class="itp_detail">
@@ -74,44 +37,12 @@
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER01010_SEARCH_USER_STAT_CD" class="form-control itp_input" name="suserStatCd"></select>
 										</div>									
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 									</div>
 								</form>
 							</div>
 						</div>
 					</div>
 					<div class="itp_table fix">
-<<<<<<< HEAD
-						<div id="ITP_STINFO01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
-							<div id="ITP_STINFO01010_jqGridView" class="itp_views fix"></div>
-							<table id="ITP_STINFO01010_jqGrid"></table>
-							<div id="ITP_STINFO01010_jqGridPager"></div>
-							<div id="ITP_STINFO01010_jqGridEmpty" class="itp_no_data"></div>
-						</div>
-					</div>
-				</div>
-				<div id="ITP_AJAX_STINFO01010_DETAIL_CONTAINER">
-					<div class="itp_form itp_type1 fix">
-						<div class="col-xs-12">
-							<form id="ITP_FORM_STINFO01010_DETAIL" class="form-horizontal">
-								<input type="hidden" id="ITP_FORM_STINFO01010_DETAIL_VIEW_CD" name="viewCd" value="C">
-					
-								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">브랜드 정보-신규</h4>
-									<div class="itp_form_in">
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 코드</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-9 itp_in">
-													<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>
-													</div>												
-												</div>
-											<label class="col-xs-2 itp_lb">상태*</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="ST_CD">
-													<option value="">사용</option>
-=======
 						<div id="ITP_OPER01010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
 							<div id="ITP_OPER01010_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_OPER01010_jqGrid"></table>
@@ -130,67 +61,40 @@
 									<!-- <h4 class="itp_form_tit">사용자정보 현재 테스트중</h4> -->
 									<div class="itp_form_in">
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">사용자명</label>
+											<label class="col-xs-2 itp_lb">가맹점</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_NM" class="form-control itp_input" name="userNm" value="" maxlength="40">
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_AFFL_SHOP" class="form-control itp_input" name="afflShop">
+														<option value=""></option>
+													</select>
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">상태</label>
+											<label class="col-xs-2 itp_lb">브랜드</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in">
-													<select id="ITP_FORM_OPER01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="userStatCd">
-													<option value=""></option>
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_BRAND_NM" class="form-control itp_input" name="brandNm">
+														<option value=""></option>
 													</select>
 												</div>
 											</div>
 										</div>
 										<div class="form-group">
-<<<<<<< HEAD
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-10 itp_in">
-													<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>
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
+											<label class="col-xs-2 itp_lb">사용자명</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="BRAND_TYPE">
-													<option value="">카페/한식/유통/아이스크림</option>
-													</select>												
+												<div class="col-xs-5 itp_in">
+													<input type="text" id="ITP_FORM_OPER01010_DETAIL_USER_NM" class="form-control itp_input" name="userNm" value="" maxlength="40">
 												</div>
 											</div>
-										</div>
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">전화번호</label>
+											<label class="col-xs-2 itp_lb">상태</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW" class="form-control itp_input" name="TEL_NO" value="###-####-####">																								
+												<div class="col-xs-5 itp_in">
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="userStatCd">
+													<option value=""></option>
+													</select>
 												</div>
-												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
-											</div>
-											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-1 itp_ip">
-												<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="">																								
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">FAX</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" class="form-control itp_input" name="FAX_NO" value="###-####-####">
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb" style="border-top:none;">로고</label>
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
-												<div class="col-xs-5 itp_in">
-													<label class="col-xs-12">로고</label>
-												</div>
-												<div class="col-xs-7 itp_in">
-													<input type="password" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" class="form-control itp_input" name="BRAND_LOGO" value="">
-=======
 											<label class="col-xs-2 itp_lb">사용자ID</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
@@ -211,7 +115,7 @@
 											<label class="col-xs-2 itp_lb">비밀번호</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in">
-													<input type="password" id="ITP_FORM_OPER01010_DETAIL_USER_PW" class="form-control itp_input" name="userPw" value="">																								
+													<input type="password" id="ITP_FORM_OPER01010_DETAIL_USER_PW" class="form-control itp_input" name="userPw" value="">
 												</div>
 												<button type="button" id="ITP_BTN_OPER01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button>
 											</div>
@@ -219,67 +123,10 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in">
 													<input type="text" id="ITP_FORM_OPER01010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="">
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 												</div>
 											</div>
 										</div>
 										<div class="form-group">
-<<<<<<< HEAD
-											<label class="col-xs-2 itp_lb">이메일</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_EMAIL" class="form-control itp_input" name="EMAL_ADDR" value="">
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb"style="border-top:none;"></label>
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
-												<div class="col-xs-7 itp_in">
-													<label class="col-xs-12"></label>
-												</div>
-												<div class="col-xs-5 itp_in">
-													<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>
-												</div>
-											</div>
-										</div>
-									</div>
-										<div class="itp_form_in">	
-											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">입금계좌정보</label>
-												<div class="col-xs-12 itp_ip">
-													<div class="col-xs-1 itp_in">
-														<select id="ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD" class="form-control itp_input" name="DPST_BNK_CD">
-														<option value="">은행</option>
-														</select>
-													</div>
-													<div class="col-xs-4 itp_in">
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" class="form-control itp_input" name="RCV_ACCT_NO" value="" placeholder="계좌번호">													
-													</div>
-													<div class="col-xs-2 itp_in">
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" class="form-control itp_input" name="OWAC_NM" value="" placeholder="예금주명">													
-													</div>										
-												</div>
-											</div>
-										</div>
-										<div class="itp_form_in">	
-											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">주소</label>
-												<div class="col-xs-10 itp_ip">
-													<div class="col-xs-2 itp_in">
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" class="form-control itp_input" name="ZIP_NO" value="" maxlength="6" readonly placeholder="우편번호">													
-													</div>
-													<div class="col-xs-1 itp_in">
-													<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>
-													</div>
-													<div class="col-xs-4 itp_in" style="margin-right: 5px;">
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES" class="form-control itp_input" name="LOAD_ADDR" value="" readonly placeholder="기본주소">													
-													</div>
-													<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES_DTL" class="form-control itp_input" name="DTL_ADDR" value="" placeholder="상세주소">													
-													</div>
-												</div>
-											</div>	
-										</div>	
-=======
 											<label class="col-xs-2 itp_lb">비밀번호 확인</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in">
@@ -302,82 +149,13 @@
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in fnLastLoginDt"></div>
 											</div>
-										</div>									
+										</div>
 									</div>
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
-								</section>								
+								</section>
 							</form>
 						</div>
 					</div>
-<<<<<<< HEAD
-				</div>
-				<div id="ITP_AJAX_STINFO01010_DETAIL_CONTAINER">
-					<div class="itp_form itp_type1 fix">
-						<div class="col-xs-12">
-							<form id="ITP_FORM_STINFO01010_DETAIL" class="form-horizontal">
-								<input type="hidden" id="ITP_FORM_STINFO01010_DETAIL_VIEW_CD" name="viewCd" value="C">
-					
-								<section class="itp_form_sec">
-									<h4 class="itp_form_tit">브랜드 정보-상세</h4>
-									<div class="itp_form_in">
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 코드</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-5 itp_in">
-													<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>
-													</div>												
-												</div>
-											<label class="col-xs-2 itp_lb">상태*</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-												<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>
-												</div>
-											</div>
-										</div>
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">브랜드 명* </label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-													<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>
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb">브랜드 타입*</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-8 itp_in">
-													<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>
-												</div>
-											</div>
-										</div>
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">전화번호</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW" style="border:none;" class="itp_input" name="TEL_NO" value="02-4568-4568">																								
-												</div>
-												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
-											</div>
-											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-1 itp_ip">
-												<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="">																								
-											</div>
-										</div>
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">FAX</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" style="border:none;" class="itp_input" name="FAX_NO" value="02-4568-4568">
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb" style="border-top:none;">로고</label>
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
-												<div class="col-xs-5 itp_in">
-													<label class="col-xs-12">로고</label>
-												</div>
-												<div class="col-xs-7 itp_in">
-													<input type="password" id="ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM" style="border:none;" class="itp_input" name="BRAND_LOGO" value="">
-												</div>
-=======
-					
+
 					<div class="itp_table fix">
 						<div class="itp_table_head fix">
 							<!-- <h4 class="itp_table_tit">* 권한정보</h4> -->
@@ -405,6 +183,16 @@
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">사용자정보</h4>
 									<div class="itp_form_in">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">가맹점</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-5 itp_in fnAfflShop"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">브랜드</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-5 itp_in fnBrandNm"></div>
+											</div>
+										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">사용자명</label>
 											<div class="col-xs-4 itp_ip">
@@ -423,84 +211,11 @@
 											<label class="col-xs-2 itp_lb">상태 일시</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-5 itp_in fnUserStatDt"></div>
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 											</div>
 										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">이메일</label>
 											<div class="col-xs-4 itp_ip">
-<<<<<<< HEAD
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_EMAIL" style="border:none;" class="itp_input" name="EMAL_ADDR" value="aaaa@test.co.kr">
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb"style="border-top:none;"></label>
-											<div class="col-xs-4 itp_ip"style="border-top:none;">
-												<div class="col-xs-7 itp_in">
-													<label class="col-xs-12"></label>
-												</div>
-												<div class="col-xs-5 itp_in">
-												</div>
-											</div>
-										</div>
-									</div>
-										<div class="itp_form_in">	
-											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">입금계좌정보</label>
-												<div class="col-xs-12 itp_ip">
-													<div class="col-xs-1 itp_in">
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" style="border:none;" class="itp_input" name="DPST_BNK_CD" value="우리은행">													
-													</div>
-													<div class="col-xs-2 itp_in">
-														<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)">													
-													</div>
-													<div class="col-xs-2 itp_in">
-														<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ZIPNO" style="border:none;" class="itp_input" name="OWAC_NM" value="테스트 브랜드">													
-													</div>										
-												</div>
-											</div>
-										</div>
-										<div class="itp_form_in">	
-											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">주소</label>
-												<div class="col-xs-10 itp_ip">
-													<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)">													
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES" style="border:none; padding:0px;" class="itp_input" name="LOAD_ADDR" value="서울 송파구 문정동 125">													
-													<input type="text" id="ITP_FORM_KOPER01010_DETAIL_CMPY_ADRES_DTL" style="border:none; padding:0px;" class="itp_input" name="DTL_ADDR" value="20">													
-												</div>
-											</div>	
-										</div>	
-										<div class="form-group">
-											<label class="col-xs-2 itp_lb">등록자/등록일 </label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-2 itp_in">
-													<div class="input-group">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" name="REG_ID" value="홍길동" maxlength="20" readonly>
-													</div>
-												</div>
-												<label class="col-xs-1" style="top:7px;">/</label>
-												<div class="col-xs-2 itp_in">
-													<div class="input-group">
-													<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>
-													</div>
-												</div>
-											</div>
-											<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-2 itp_in">
-													<div class="input-group">
-													<input type="text" id="ITP_FORM_STINFO01010_DETAIL_USER_ID" style="border:none;" class="itp_input" name="REG_ID" value="홍길동" maxlength="20" readonly>
-													</div>
-												</div>
-												<label class="col-xs-1" style="top:7px;">/</label>
-												<div class="col-xs-2 itp_in">
-													<div class="input-group">
-													<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>
-													</div>
-												</div>
-											</div>
-										</div>							
-=======
 												<div class="col-xs-5 itp_in fnEmail"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">핸드폰번호</label>
@@ -519,13 +234,10 @@
 											</div>
 										</div>									
 									</div>
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 								</section>								
 							</form>
 						</div>
 					</div>
-<<<<<<< HEAD
-=======
 					
 					<div class="itp_table fix">
 						<div class="itp_table_head fix">
@@ -539,7 +251,6 @@
 							<div id="ITP_OPER01010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 						</div>
 					</div>					
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 				</div>
 			</div>
 		</article>

src/main/webapp/app/oper/OPER02010.html

@@ -63,6 +63,26 @@
 
 								<section class="itp_form_sec">
 									<!-- <h4 class="itp_form_tit">공지정보</h4> -->
+									<div class="itp_form_in">
+										<div class="form-group">
+											<label class="col-xs-2 itp_lb">가맹점</label>
+											<div class="col-xs-5 itp_ip">
+												<div class="col-xs-10 itp_in">
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_AFFL_SHOP" class="form-control itp_input" name="afflShop">
+														<option value=""></option>
+													</select>
+												</div>
+											</div>
+											<label class="col-xs-2 itp_lb">브랜드</label>
+											<div class="col-xs-5 itp_ip">
+												<div class="col-xs-5 itp_in">
+													<select id="ITP_FORM_OPER01010_DETAIL_USER_BRAND_NM" class="form-control itp_input" name="brandNm">
+														<option value=""></option>
+													</select>
+												</div>
+											</div>
+										</div>
+									</div>
 									<div class="itp_form_in">
 										<div class="form-group colspan">
 											<label class="col-xs-2 itp_lb">공지제목</label>
@@ -142,6 +162,23 @@
 							<div id="ITP_OPER02010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
 						</div>
 					</div>
+
+					<div class="itp_table fix">
+						<div class="itp_table_head fix">
+							<h4 class="itp_table_tit">* 권한 정보 (* 공지대상이 특정 대상일 일겨웅 추가 버튼 을 통해 사용자 등록 함)</h4>
+							<div class="pull-right itp_cicon">
+								<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>
+								<button type="button" id="ITP_BTN_OPER02010_BRAND_DELROW" class="btn btn-danger btn-sm DEB"><i class="glyphicon glyphicon-remove"></i> 삭제</button>
+							</div>
+						</div>
+
+						<div id="ITP_OPER02010_BRAND_jqGrid_list" class="itp_tb_list">
+							<div id="ITP_OPER02010_BRAND_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_OPER02010_BRAND_jqGrid"></table>
+							<div id="ITP_OPER02010_BRAND_jqGridPager"></div>
+							<div id="ITP_OPER02010_BRAND_jqGridEmpty" class="itp_no_data"></div>
+						</div>
+					</div>
 				</div>
 				<div id="ITP_AJAX_OPER02010_VIEW_CONTAINER">
 					<div class="itp_form itp_type1 fix">

src/main/webapp/js/app/config.js

@@ -3,6 +3,8 @@
 var today = new Date();
 const js_version = itp_fn_date_format(today);
 
+var selTabIndex = 0;
+
 requirejs.config({
 	baseUrl: ITP_CONTEXTPATH,
 	paths: {
@@ -166,7 +168,9 @@ require([
 	});
 
 	$('#ITP_HEADER .itp_tab_list').on('click', '.itp_tab_open', function() {
-		//console.log('[ITP_TAB_OPEN] CALL');
+		var li = $(this).closest('li');
+		selTabIndex = li.index();
+		// console.log('[ITP_TAB_OPEN] CALL');
 		//로그인체크
 		itp_fn_logined_check();
 		itp_fn_fire_window_resize();
@@ -174,12 +178,20 @@ require([
 
 	$('#ITP_HEADER .itp_tab_list').on('click', '.itp_tab_close', function() {
 		var tab_id = $(this).attr('data-itp-tab-id');
+		var li = $(this).closest('li');
+		var curIdx = li.index();
 		$('#ITP_TAB_' + tab_id).remove();
 		$(this).closest('li').remove();
-		$('#ITP_HEADER .itp_tab_list li').removeClass('active');
-		$('#ITP_CONTAINER .itp_contents .itp_sec').removeClass('active');
-		$('#ITP_HEADER .itp_tab_list li:first-child').addClass('active');
-		$('#ITP_CONTAINER .itp_contents .itp_sec:first-child').addClass('active');
+		if(curIdx === selTabIndex) {
+			$('#ITP_HEADER .itp_tab_list li').removeClass('active');
+			$('#ITP_CONTAINER .itp_contents .itp_sec').removeClass('active');
+			$('#ITP_HEADER .itp_tab_list li:first-child').addClass('active');
+			$('#ITP_CONTAINER .itp_contents .itp_sec:first-child').addClass('active');
+			selTabIndex = 0;
+		} else {
+			selTabIndex = selTabIndex - 1;
+		}
+
 		return false;
 	});
 
@@ -320,13 +332,17 @@ require([
 				CONN_KEY = data.connKey; //로그인 했을때 넣었던 키를 가져옴
 
 				var callbackFn = function(result) {
+					console.log(result);
 					CODE_LIST = result.codeList;
 					AUTH_MENU_LIST = result.authMenuList;
 					ACT_LIST = result.actList;
 					POP_LIST = result.popList;
 					USER_ID = result.userId; 
 					USER_NM = result.userNm;					
-					USER_TYPE_CD = result.userTypeCd;	
+					USER_TYPE_CD = result.userTypeCd;
+					AUTH_TYPE_CD = result.authTpCd;
+					AFFL_LIST = result.afflList;
+					BRAND_LIST = result.brandList;
 					/*
 					if(FRCOMP_LIST.length > 0) {
 						let itp_manage_cmpy_cd = '';
@@ -349,7 +365,9 @@ require([
 						sessionStorage.setItem('itp_manage_cmpy_cd', '{}'); 
 					//}
 					// 사용자명
-					$('#ITP_LOGIN_USER').text(USER_NM); 
+					$('#ITP_LOGIN_USER').text(USER_NM);
+					// 가맹점 만들기
+					fn_make_brand_shop.init();
 					// 왼쪽 메뉴 만들기
 					fn_make_side_menu();
 					// 메뉴 요약
@@ -370,6 +388,37 @@ function fn_make_menu_summary() {
 	
 }
 
+var fn_make_brand_shop = {
+	init : function() {
+		this.make();
+		this.action();
+	},
+	make: function () {
+		if(BRAND_LIST.length > 1) {
+			sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(BRAND_LIST[0]));
+			$('#ITP_TXT_MAIN_SHR_CMPY').text(BRAND_LIST[0].brandNm);
+		} else {
+			if(BRAND_LIST.length === 1) {
+				sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(BRAND_LIST[0]));
+				$('#ITP_TXT_MAIN_SHR_CMPY').text(BRAND_LIST[0].brandNm);
+			}
+			$('#ITP_BTN_MAIN_SHR_CMPY').hide();
+		}
+	},
+	action: function () {
+		$('#ITP_BTN_MAIN_SHR_CMPY').on('click', function() {
+			// 팝업
+			var popFn = function(rowDataPop) {
+				$.each(rowDataPop, function(key, value) {
+					itp_fn_close_other_tab(''); // 다른탭 닫기
+					sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(value));
+				});
+			};
+			fn_call_popup('biz', 'BIZPOP_FRCOMP_STORE', '#ITP_ASIDE', popFn, null, 'S');
+		});
+	}
+};
+
 function fn_make_side_menu() {
 	$('#ITP_SIDEBAR .panel-group').empty();
 	
@@ -429,17 +478,21 @@ function fn_make_side_menu() {
 	        	$('#ITP_CONTAINER .itp_contents .itp_sec').removeClass('active');
 	        	$(this).addClass('active');
 	        	$('#ITP_TAB_' + id).addClass('active');
+
+				selTabIndex = this.index();
 				return false;
 			}
 		});
 
 		if (!isDup && openCd == 'C') {
-			
+
+			selTabIndex = tabSize;
+
 			const href = ITP_CONTEXTPATH + connUrl; // $(this).attr('href');
 			const text = $(this).children('.itp_tt').text();
 			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>';
 			itp_fn_load_page(href, tab, '', id);
-			
+
 		} else {
 			itp_fn_fire_window_resize();
 		}

src/main/webapp/js/app/locales/locale-ko.js

@@ -106,6 +106,17 @@ const ITP_MSG_LOCALE = (function() {
 			"numbering": "NO",
 			"inputSelf": "직접입력",
 			"active": "활성",
+			"afflShop": "가맹점",
+			"brandNm": "브랜드",
+			"notiNo": "공지번호",
+			"titlet": "제목",
+			"targetNm": "대상구분",
+			"viewDt": "노출일",
+			"regDt": "등록일",
+		},
+		"table": {
+			"brandId": "브랜드ID",
+			"brandNm": "브랜드명",
 		},
 		"link": {
 			"forgotPassword": "비밀번호찾기"
@@ -284,6 +295,7 @@ const ITP_MSG_LOCALE = (function() {
 		language: data.language,
 		title: data.title,
 		label: data.label,
+		table: data.table,
 		link: data.link,
 		text: data.text,
 		button: data.button,

src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -1,23 +1,4 @@
 
-<<<<<<< HEAD
-const STINFO01010_GRID_ID = '#ITP_STINFO01010_jqGrid';
-const STINFO01010_GRID_LIST = '#ITP_STINFO01010_jqGrid_list';
-const STINFO01010_GRID_PAGER = '#ITP_STINFO01010_jqGridPager';
-const STINFO01010_GRID_EMPTY = '#ITP_STINFO01010_jqGridEmpty';
-
-const STINFO01010_VIEW_GRID_ID = '#ITP_STINFO01010_VIEW_jqGrid';
-const STINFO01010_VIEW_GRID_LIST = '#ITP_STINFO01010_VIEW_jqGrid_list';
-const STINFO01010_VIEW_GRID_PAGER = '#ITP_STINFO01010_VIEW_jqGridPager';
-const STINFO01010_VIEW_GRID_EMPTY = '#ITP_STINFO01010_VIEW_jqGridEmpty';
-
-const STINFO01010_DETAIL_GRID_ID = '#ITP_STINFO01010_DETAIL_jqGrid';
-const STINFO01010_DETAIL_GRID_LIST = '#ITP_STINFO01010_DETAIL_jqGrid_list';
-const STINFO01010_DETAIL_GRID_PAGER = '#ITP_STINFO01010_DETAIL_jqGridPager';
-const STINFO01010_DETAIL_GRID_EMPTY = '#ITP_STINFO01010_DETAIL_jqGridEmpty';
-
-let ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = false;
-let ITP_FORM_STINFO01010_DETAIL_IS_WRITING = false;
-=======
 const OPER01010_GRID_ID = '#ITP_OPER01010_jqGrid';
 const OPER01010_GRID_LIST = '#ITP_OPER01010_jqGrid_list';
 const OPER01010_GRID_PAGER = '#ITP_OPER01010_jqGridPager';
@@ -35,7 +16,6 @@ const OPER01010_DETAIL_GRID_EMPTY = '#ITP_OPER01010_DETAIL_jqGridEmpty';
 
 let ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE = false;
 let ITP_FORM_OPER01010_DETAIL_IS_WRITING = false;
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 
 let USER_DETAIL_GRID_LIST = '/api/user/detail-grid-list';
 let USER_USERAUTH_GRID_LIST = '/api/user/userauth-grid-list';
@@ -49,61 +29,6 @@ require(['config'], function() {
 		'jquery'
 	], function($) {
 		// 버튼 권한설정
-<<<<<<< HEAD
-		fn_proc_btn_auth('STINFO01010');
-		// 공통코드 표시
-		fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_STINFO01010_SEARCH_USER_STAT_CD');
-		fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD', true, '선택');
-		
-		// 조회일자 지정
-		var now = new Date();
-		$('#ITP_TAB_STINFO01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-		// $('#ITP_FORM_STINFO01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
-		// $('#ITP_FORM_STINFO01010_SEARCH_TO_DT').datepicker('setDate', new Date());
-				
-		// 그리드				
-		itp_fn_jqgrid_resize(STINFO01010_GRID_ID, STINFO01010_GRID_LIST, 'lg');
-		itp_fn_STINFO01010_grid.init();
-    	itp_fn_fire_window_resize();
-
-		// 조회    	
-    	itp_fn_STINFO01010_search();
-    	
-		// 조회 버튼 클릭
-		$('#ITP_BTN_STINFO01010_SRH').on('click', function() {
-			itp_STINFO01010_search = true;
-			let param = $('#ITP_FORM_STINFO01010_SEARCH').serializeObject();
-			param.gridSize = $.jgrid.defaults.rowNum;
-			param.gridPage = $.jgrid.defaults.page;
-			$(STINFO01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
-		});
-		
-		// 수정 버튼
-		$('#ITP_BTN_STINFO01010_MODIFY').on('click', function() {
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO01010_DETAIL');			
-			const userIdVal = $('#ITP_FORM_STINFO01010_VIEW_USER_ID').val();
-			const key = {userId: userIdVal, viewCd: 'R'};
-			var param = $.param(key);
-			itp_fn_STINFO01010_detail(param);	
-		});
-		
-		// 신규등록 버튼
-		$('#ITP_BTN_STINFO01010_NEWREG').on('click', function() {
-			itp_fn_STINFO01010_switch_screen('ADD');			
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STINFO01010_DETAIL');				
-			// 권한정보 리스트 조회
-			itp_fn_STINFO01010_detail_grid.unload();
-			itp_fn_STINFO01010_detail_grid.callBack();
-		});
-		
-		// 취소/목록 버튼
-		$('#ITP_BTN_STINFO01010_CANCELLIST').on('click', function() {
-			itp_fn_STINFO01010_search();
-    	});
-		
-		// 삭제 버튼
-		$('#ITP_BTN_STINFO01010_DELETE').on('click', function() {
-=======
 		fn_proc_btn_auth('OPER01010');
 		// 공통코드 표시
 		fn_make_select(CODE_LIST, 'USER_STAT_CD', 'ITP_FORM_OPER01010_SEARCH_USER_STAT_CD');
@@ -157,18 +82,12 @@ require(['config'], function() {
 		
 		// 삭제 버튼
 		$('#ITP_BTN_OPER01010_DELETE').on('click', function() {
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			
 		});
 		
 		// 저장 버튼
-<<<<<<< HEAD
-		$('#ITP_BTN_STINFO01010_SAVE').on('click', function() {			
-			const formId = '#ITP_FORM_STINFO01010_DETAIL';
-=======
 		$('#ITP_BTN_OPER01010_SAVE').on('click', function() {			
 			const formId = '#ITP_FORM_OPER01010_DETAIL';
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			itp_fn_form_clear_validate(null, formId);			
 			var vali_userId = itp_fn_form_validate(formId, formId + '_USER_ID', ['empty'], undefined);
 			var vali_userStatCd = itp_fn_form_validate(formId, formId + '_USER_STAT_CD', ['empty'], undefined);
@@ -177,30 +96,18 @@ require(['config'], function() {
 			var vali_email = itp_fn_form_validate(formId, formId + '_EMAIL', ['empty'], undefined);
 			var vali_userPw = true;
 			var vali_userPwConfirm = true;
-<<<<<<< HEAD
-			if($('#ITP_FORM_STINFO01010_DETAIL_VIEW_CD').val() == 'C') { // 신규
-=======
 			if($('#ITP_FORM_OPER01010_DETAIL_VIEW_CD').val() == 'C') { // 신규
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 				vali_userPw = itp_fn_form_validate(formId, formId + '_USER_PW', ['empty'], undefined);
 				vali_userPwConfirm = itp_fn_form_validate(formId, formId + '_USER_PW_CONFIRM', ['empty'], undefined);	
 			}
 			if (vali_userId && vali_userStatCd && vali_userNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
-<<<<<<< HEAD
-				if (ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE) {
-=======
 				if (ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE) {
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 					itp_fn_modal_duplicate(ITP_MSG_LOCALE.label.userId, formId + '_USER_ID');
 				} else {
 					let gridInsertData = [];
 					let gridUpdateData = [];
 					let gridDeleteData = [];
-<<<<<<< HEAD
-					const rowData = $(STINFO01010_DETAIL_GRID_ID).getRowData();
-=======
 					const rowData = $(OPER01010_DETAIL_GRID_ID).getRowData();
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 					const keyValue = $(formId + '_USER_ID').val();
 					$.each(rowData, function(key, value) {
 						if (value.viewCd != 'R') {
@@ -220,13 +127,8 @@ require(['config'], function() {
 					param.gridDeleteData = gridDeleteData;
 					//console.log(JSON.stringify(param)); 						
 					var searhFn = function() {
-<<<<<<< HEAD
-						ITP_FORM_STINFO01010_DETAIL_IS_WRITING = false;
-						itp_fn_STINFO01010_search();
-=======
 						ITP_FORM_OPER01010_DETAIL_IS_WRITING = false;
 						itp_fn_OPER01010_search();
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 					};
 					fn_ajax_call(USER_SAVE_USER, JSON.stringify(param), searhFn, 'POST');	
 				}
@@ -234,27 +136,16 @@ require(['config'], function() {
 		});		
 		
 		// 중복체크
-<<<<<<< HEAD
-		$('#ITP_FORM_STINFO01010_DETAIL_DUP').on('click', function() {
-			const formId = '#ITP_FORM_STINFO01010_DETAIL';
-=======
 		$('#ITP_FORM_OPER01010_DETAIL_DUP').on('click', function() {
 			const formId = '#ITP_FORM_OPER01010_DETAIL';
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			itp_fn_form_clear_validate(null, formId + '_DETAIL');
 			var vali_userId = itp_fn_form_validate(formId + '_DETAIL', formId + '_USER_ID', ['empty'], undefined);
 			if (vali_userId) {
 				var dupFn = function(result) {
 					if (result.code == 'N') {
-<<<<<<< HEAD
-						ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = false;
-					} else {
-						ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = true;
-=======
 						ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE = false;
 					} else {
 						ITP_FORM_OPER01010_DETAIL_IS_DUPLICATE = true;
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 					}
 				};
 				const key = {'userId':  $(formId + '_USER_ID').val()};
@@ -264,17 +155,10 @@ require(['config'], function() {
 		});
 		
 		// 상세:비밀번호 초기화
-<<<<<<< HEAD
-		$('#ITP_BTN_STINFO01010_RESET_PW').on('click', function() {
-			var resetPwFn = {
-				callBack: function(args) {
-					const key = {'userId':  $('#ITP_FORM_STINFO01010_DETAIL_USER_ID').val()};
-=======
 		$('#ITP_BTN_OPER01010_RESET_PW').on('click', function() {
 			var resetPwFn = {
 				callBack: function(args) {
 					const key = {'userId':  $('#ITP_FORM_OPER01010_DETAIL_USER_ID').val()};
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 					const param = $.param(key);
 					fn_ajax_call(USER_INTI_USERPW, param, undefined, 'GET');					
 				}
@@ -282,20 +166,12 @@ require(['config'], function() {
 			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.askResetUserPw, resetPwFn, null);		
 		});
 		// 상세:추가버튼
-<<<<<<< HEAD
-		$('#ITP_BTN_STINFO01010_DETAIL_ADDROW').on('click', function() {
-=======
 		$('#ITP_BTN_OPER01010_DETAIL_ADDROW').on('click', function() {
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			// 팝업
 			var popFn = function(rowDataPop) {
 				// 기존등록 데이터 
 				var exists = '';				
-<<<<<<< HEAD
-				const rowData = $(STINFO01010_DETAIL_GRID_ID).getRowData();
-=======
 				const rowData = $(OPER01010_DETAIL_GRID_ID).getRowData();
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 				$.each(rowData, function(key, value) {
 					exists = exists + value.authNo + ';';
 				});
@@ -303,17 +179,6 @@ require(['config'], function() {
 				$.each(rowDataPop, function(key, value) {
 					if(exists.indexOf(value.authNo) < 0) {
 						// 행추가
-<<<<<<< HEAD
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
-						var rids = $(STINFO01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
-						var last_row_id = rids[rids.length - 1];
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'viewCd', 'C');
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'authNo', value.authNo);
-						$(STINFO01010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'authNm', value.authNm);	
-					}
-				});
-				$(STINFO01010_DETAIL_GRID_EMPTY).hide();
-=======
 						$(OPER01010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
 						var rids = $(OPER01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
 						var last_row_id = rids[rids.length - 1];
@@ -323,22 +188,10 @@ require(['config'], function() {
 					}
 				});
 				$(OPER01010_DETAIL_GRID_EMPTY).hide();
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			};
 			fn_call_popup('comm', 'AUTH_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
 		});
 		// 상세:삭제버튼
-<<<<<<< HEAD
-		$('#ITP_BTN_STINFO01010_DETAIL_DELROW').on('click', function() {
-			itp_fn_grid_del_row(STINFO01010_DETAIL_GRID_ID);
-		});
-		
-		$('body').on('click', function(e) {
-			var gridId = STINFO01010_DETAIL_GRID_ID.replace('#', '');
-			var rids = $(STINFO01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
-			var last_row_id = rids[rids.length - 1];			
-			itp_fn_grid_reset_selection(e, last_row_id, gridId, 'STINFO01010_DETAIL');
-=======
 		$('#ITP_BTN_OPER01010_DETAIL_DELROW').on('click', function() {
 			itp_fn_grid_del_row(OPER01010_DETAIL_GRID_ID);
 		});
@@ -348,92 +201,10 @@ require(['config'], function() {
 			var rids = $(OPER01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
 			var last_row_id = rids[rids.length - 1];			
 			itp_fn_grid_reset_selection(e, last_row_id, gridId, 'OPER01010_DETAIL');
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 		});
 	});
 });
 
-<<<<<<< HEAD
-var itp_fn_STINFO01010_switch_screen = function(mode) {
-	if(mode == 'LIST') { // 목록
-		$('#ITP_BTN_STINFO01010_MODIFY').hide();
-		$('#ITP_BTN_STINFO01010_CANCELLIST').hide();
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
-		$('#ITP_BTN_STINFO01010_SAVE').hide();
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_SRH');
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_NEWREG');
-		
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').show();
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').hide();		
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').hide();
-	} else if(mode == 'ADD') { // 등록
-		ITP_FORM_STINFO01010_DETAIL_IS_DUPLICATE = true;
-	
-		$('#ITP_BTN_STINFO01010_SRH').hide();
-		$('#ITP_BTN_STINFO01010_MODIFY').hide();
-		$('#ITP_BTN_STINFO01010_NEWREG').hide();
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
-		$('#ITP_BTN_STINFO01010_RESET_PW').hide();
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_CANCELLIST');
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_SAVE');
-		
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').hide();
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').show();
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').hide();		
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_ID').removeAttr('readonly');
-		$('#ITP_FORM_STINFO01010_DETAIL_DUP').removeAttr('disabled');
-		
-		$('#ITP_FORM_STINFO01010_DETAIL_VIEW_CD').val('C');
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_NM').val('');
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD').val('');
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_ID').val('');
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_PW').val('');
-		$('#ITP_FORM_STINFO01010_DETAIL_TEL_NO').val('');
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM').val('');
-		$('#ITP_FORM_STINFO01010_DETAIL_EMAIL').val('');
-	} else if(mode == 'MODIFY') { // 수정
-		$('#ITP_BTN_STINFO01010_SRH').hide();
-		$('#ITP_BTN_STINFO01010_MODIFY').hide();
-		$('#ITP_BTN_STINFO01010_NEWREG').hide();		
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_CANCELLIST');
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_SAVE');
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_RESET_PW');	
-		
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').hide();
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').show();
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').hide();
-		$('#ITP_FORM_STINFO01010_DETAIL_USER_ID').attr('readonly', true);
-		$('#ITP_FORM_STINFO01010_DETAIL_DUP').attr('disabled', true);
-	} else if(mode == 'VIEW') { // 보기
-		$('#ITP_BTN_STINFO01010_SRH').hide();
-		$('#ITP_BTN_STINFO01010_NEWREG').hide();		
-		$('#ITP_BTN_STINFO01010_DELETE').hide();
-		$('#ITP_BTN_STINFO01010_SAVE').hide();
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_MODIFY');
-		fn_show_btn_auth('#ITP_BTN_STINFO01010_CANCELLIST');
-		
-		$('#ITP_AJAX_STINFO01010_LIST_CONTAINER').hide();
-		$('#ITP_AJAX_STINFO01010_DETAIL_CONTAINER').hide();
-		$('#ITP_AJAX_STINFO01010_VIEW_CONTAINER').show();
-	}	
-};
-
-var itp_fn_STINFO01010_grid = {
-	init: function() {
-		// 데이터 없을때
-		itp_fn_STINFO01010_empty.push();
-		$(STINFO01010_GRID_EMPTY).on('click', function() {
-			itp_fn_STINFO01010_empty.back();
-			itp_STINFO01010_param.gridSize = $.jgrid.defaults.rowNum;
-			$(STINFO01010_GRID_ID).setGridParam({'postData': JSON.stringify(itp_STINFO01010_param)}).trigger('reloadGrid');
-		});	
-	},
-	callBack: function() {
-		let param = $('#ITP_FORM_STINFO01010_SEARCH').serializeObject();
-		param.gridSize = $.jgrid.defaults.rowNum;	
-		$(STINFO01010_GRID_ID).jqGrid({
-=======
 var itp_fn_OPER01010_switch_screen = function(mode) {
 	if(mode == 'LIST') { // 목록
 		$('#ITP_BTN_OPER01010_MODIFY').hide();
@@ -509,71 +280,79 @@ var itp_fn_OPER01010_grid = {
 			$(OPER01010_GRID_ID).setGridParam({'postData': JSON.stringify(itp_OPER01010_param)}).trigger('reloadGrid');
 		});	
 	},
+	colModel: [
+		{
+			index: 'AGENCY_NM', name: 'afflShop',
+			label: ITP_MSG_LOCALE.label.afflShop, //가맹점
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'BRAND_NM', name: 'brandNm',
+			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'USER_ID', name: 'userId',
+			label: ITP_MSG_LOCALE.label.userId, //사용자ID
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'USER_NM', name: 'userNm',
+			label: ITP_MSG_LOCALE.label.userName, //닉네임
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'EMAIL', name: 'email',
+			label: ITP_MSG_LOCALE.label.idEmail, //아이디(이메일)
+			width: '15', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'TEL_NO', name: 'telNo',
+			label: ITP_MSG_LOCALE.label.telNo, //휴대폰 번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'USER_STAT_NM', name: 'userStatNm',
+			label: ITP_MSG_LOCALE.label.status, //상태
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'USER_STAT_DT', name: 'userStatDt',
+			label: ITP_MSG_LOCALE.label.statusDt, //상태일시
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ADD_DT', name: 'addDt',
+			label: ITP_MSG_LOCALE.label.regDt, //등록일
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'LAST_LOGIN_DT', name: 'lastLoginDt',
+			label: ITP_MSG_LOCALE.label.lastLogin, //마지막 로그인
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	],
 	callBack: function() {
 		let param = $('#ITP_FORM_OPER01010_SEARCH').serializeObject();
 		param.gridSize = $.jgrid.defaults.rowNum;	
 		$(OPER01010_GRID_ID).jqGrid({
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
-			colModel: [
-				{
-					index: 'USER_ID', name: 'userId',
-					label: ITP_MSG_LOCALE.label.userId, //사용자ID
-					width: '10', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'USER_NM', name: 'userNm',
-					label: ITP_MSG_LOCALE.label.userName, //닉네임
-					width: '13', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'EMAIL', name: 'email',
-					label: ITP_MSG_LOCALE.label.idEmail, //아이디(이메일)
-					width: '15', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'TEL_NO', name: 'telNo',
-					label: ITP_MSG_LOCALE.label.telNo, //휴대폰 번호
-					width: '10', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},			
-				{
-					index: 'USER_STAT_NM', name: 'userStatNm',
-					label: ITP_MSG_LOCALE.label.status, //상태
-					width: '6', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'USER_STAT_DT', name: 'userStatDt',
-					label: ITP_MSG_LOCALE.label.statusDt, //상태일시
-					width: '10', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'ADD_DT', name: 'addDt',
-					label: ITP_MSG_LOCALE.label.regDt, //등록일
-					width: '10', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'LAST_LOGIN_DT', name: 'lastLoginDt',
-					label: ITP_MSG_LOCALE.label.lastLogin, //마지막 로그인
-					width: '10', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				}
-			],
+			colModel: this.colModel,
 			loadBeforeSend: function(jqXHR) {
 			    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
 			},
 			postData: JSON.stringify(param),
 			url: DOMAIN + USER_DETAIL_GRID_LIST,
-<<<<<<< HEAD
-			pager: STINFO01010_GRID_PAGER,
-=======
 			pager: OPER01010_GRID_PAGER,
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			multiselect: false,
 			rownumbers: true, 
 			onCellSelect: function(rowId, cellIdx, cellValue) {
@@ -583,106 +362,21 @@ var itp_fn_OPER01010_grid = {
 					const userIdVal = $(this).jqGrid('getCell', rowId, 'userId');
 					const key = {userId: userIdVal, viewCd: 'R'};
 					var param = $.param(key);
-<<<<<<< HEAD
-					itp_fn_STINFO01010_view(param);
-=======
 					itp_fn_OPER01010_view(param);
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 				}
 		   	},
 			loadComplete: function(data) {
 				//console.log(JSON.stringify(data));
-<<<<<<< HEAD
-				itp_fn_grid_load_complete(data, STINFO01010_GRID_ID, true, 'number', 'STINFO01010', itp_STINFO01010_search, itp_fn_STINFO01010_empty, true, data.gridRecords, true);
-				var ids = $(STINFO01010_GRID_ID).getDataIDs();
-				$.each(ids, function(idx, rowId) {
-					$(STINFO01010_GRID_ID).jqGrid('setCell', rowId, 'userNm', '', ITP_GRID_COL_STYLE.link);
-=======
 				itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', itp_OPER01010_search, itp_fn_OPER01010_empty, true, data.gridRecords, true);
 				var ids = $(OPER01010_GRID_ID).getDataIDs();
 				$.each(ids, function(idx, rowId) {
 					$(OPER01010_GRID_ID).jqGrid('setCell', rowId, 'userNm', '', ITP_GRID_COL_STYLE.link);
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 				});	
 		    },
 		    loadError: function(jqXHR, textStatus, errorThrown) {
 		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
 		    },
 		    onPaging: function(action) {
-<<<<<<< HEAD
-		    	itp_fn_grid_paging(STINFO01010_GRID_ID, action, param);
-		    }
-		}).navGrid(STINFO01010_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
-	},
-	clearData : function() {
-		$(STINFO01010_GRID_ID).jqGrid('clearGridData', true);
-		$(STINFO01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
-		$(STINFO01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
-		$(STINFO01010_GRID_EMPTY).show();
-	}, 
-	unload : function() {
-		$.jgrid.gridUnload(STINFO01010_GRID_ID); 
-	}
-};
-
-var itp_fn_STINFO01010_search = function() {
-	itp_fn_STINFO01010_switch_screen('LIST');	
-	itp_fn_STINFO01010_grid.unload();
-	itp_fn_STINFO01010_grid.callBack();
-};
-
-let itp_STINFO01010_param = {};
-let itp_STINFO01010_search = false;
-var itp_fn_STINFO01010_empty = {
-	push: function() {
-		let param = $('#ITP_FORM_STINFO01010_SEARCH').serializeObject();
-		itp_STINFO01010_param = param;
-	},
-	back: function() {
-		$('#ITP_FORM_STINFO01010_DEVI_TP_CD').val(itp_STINFO01010_param.deviTpCd);
-		$('#ITP_FORM_STINFO01010_ORDER_YN').val(itp_STINFO01010_param.orderYn);
-		$('#ITP_FORM_STINFO01010_ADT_AUTH_CD').val(itp_STINFO01010_param.adtAuthCd);
-		$('#ITP_FORM_STINFO01010_EMAIL_RCV_YN').val(itp_STINFO01010_param.emailRcvYn);
-		$('#ITP_FORM_STINFO01010_SMS_RCV_YN').val(itp_STINFO01010_param.smsRcvYn);
-		$('#ITP_FORM_STINFO01010_MEMB_EXIT_DT').val(itp_STINFO01010_param.membExitDt);
-		$('#ITP_FORM_STINFO01010_FROM_DT').val(itp_STINFO01010_param.fromDt);
-		$('#ITP_FORM_STINFO01010_TO_DT').val(itp_STINFO01010_param.toDt);
-		$('#ITP_FORM_STINFO01010_KEYWORD').val(itp_STINFO01010_param.keyword);
-	}
-};
-
-var itp_fn_STINFO01010_view = function(param) {
-	fn_ajax_call(USER_INFO_USER, param, itp_fn_STINFO01010_view_callback, 'GET');
-};
-
-var itp_fn_STINFO01010_view_callback = function(result) {
-	// console.log(result);
-	itp_fn_STINFO01010_switch_screen('VIEW');
-	$('#ITP_FORM_STINFO01010_VIEW #ITP_FORM_STINFO01010_VIEW_USER_ID').val(result.userId);
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserNm').text(result.userNm);
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserStatDt').text(result.userStatDt);
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserStatNm').text(result.userStatNm);
-	$('#ITP_FORM_STINFO01010_VIEW .fnUserId').text(result.userId);
-	$('#ITP_FORM_STINFO01010_VIEW .fnEmail').text(result.email);
-	$('#ITP_FORM_STINFO01010_VIEW .fnTelNo').text(result.telNo);
-	$('#ITP_FORM_STINFO01010_VIEW .fnAddDt').text(result.addDt);
-	$('#ITP_FORM_STINFO01010_VIEW .fnLastLoginDt').text(result.lastLoginDt);
-	
-	// 권한정보 리스트 조회
-	itp_fn_STINFO01010_view_grid.unload();
-	itp_fn_STINFO01010_view_grid.callBack();
-};
-
-var itp_fn_STINFO01010_view_grid = {
-	init: function() {
-	},
-	callBack: function() {
-		let param = $('#ITP_FORM_STINFO01010_VIEW').serializeObject();
-		param.gridSize = $.jgrid.defaults.rowNum; 
-		param.pagingYn = false; // 페이징안함
-		
-		$(STINFO01010_VIEW_GRID_ID).jqGrid({
-=======
 		    	itp_fn_grid_paging(OPER01010_GRID_ID, action, param);
 		    }
 		}).navGrid(OPER01010_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
@@ -754,7 +448,6 @@ var itp_fn_OPER01010_view_grid = {
 		param.pagingYn = false; // 페이징안함
 		
 		$(OPER01010_VIEW_GRID_ID).jqGrid({
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			colModel: [
 				{
 					index: 'VIEW_CD', name: 'viewCd',
@@ -794,17 +487,10 @@ var itp_fn_OPER01010_view_grid = {
 			},
 			postData: JSON.stringify(param),
 			url: DOMAIN + USER_USERAUTH_GRID_LIST,
-<<<<<<< HEAD
-			pager: STINFO01010_VIEW_GRID_PAGER,
-			multiselect: false,
-			loadComplete: function(data) {				
-				itp_fn_grid_load_complete(data, STINFO01010_VIEW_GRID_ID, true, undefined, 'STINFO01010_VIEW');
-=======
 			pager: OPER01010_VIEW_GRID_PAGER,
 			multiselect: false,
 			loadComplete: function(data) {				
 				itp_fn_grid_load_complete(data, OPER01010_VIEW_GRID_ID, true, undefined, 'OPER01010_VIEW');
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 		    },
 		    loadError: function(jqXHR, textStatus, errorThrown) {
 		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
@@ -815,19 +501,11 @@ var itp_fn_OPER01010_view_grid = {
 	    				$(args).trigger('reloadGrid');
 	    			}
 	    		};
-<<<<<<< HEAD
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_VIEW_GRID_ID)) {
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, STINFO01010_VIEW_GRID_ID);
-		    		return 'stop';
-		    	} else {
-		    		itp_fn_grid_paging(STINFO01010_VIEW_GRID_ID, action, param);
-=======
 		    	if (itp_fn_check_grid_is_writing(OPER01010_VIEW_GRID_ID)) {
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, OPER01010_VIEW_GRID_ID);
 		    		return 'stop';
 		    	} else {
 		    		itp_fn_grid_paging(OPER01010_VIEW_GRID_ID, action, param);
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 		    	}
 		    },
 		    onSortCol: function(index, columnIndex, sortOrder) {
@@ -836,61 +514,6 @@ var itp_fn_OPER01010_view_grid = {
 	    				$(args).trigger('reloadGrid');
 	    			}
 	    		};
-<<<<<<< HEAD
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_VIEW_GRID_ID)) {
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, STINFO01010_VIEW_GRID_ID);
-		    		return 'stop';
-		    	} else {
-		    		itp_fn_grid_sorting(STINFO01010_VIEW_GRID_ID, index, sortOrder);
-		    	}
-		    }
-		}).navGrid(STINFO01010_VIEW_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
-	},
-	clearData : function() {
-		$(STINFO01010_VIEW_GRID_ID).jqGrid('clearGridData', true);
-		$(STINFO01010_VIEW_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
-		$(STINFO01010_VIEW_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
-		$(STINFO01010_VIEW_GRID_EMPTY).show();
-	}, 
-	unload : function() {
-		$.jgrid.gridUnload(STINFO01010_VIEW_GRID_ID); 
-	}
-};
-
-var itp_fn_STINFO01010_detail = function(param) {
-	fn_ajax_call(USER_INFO_USER, param, itp_fn_STINFO01010_detail_callback, 'GET');
-};
-
-var itp_fn_STINFO01010_detail_callback = function(result) {
-	// console.log(result);
-	itp_fn_STINFO01010_switch_screen('MODIFY');
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_VIEW_CD').val('U');
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_NM').val(result.userNm);
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_STAT_CD').val(result.userStatCd);
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_ID').val(result.userId);
-	$('#ITP_FORM_STINFO01010_DETAIL .fnUserStatDt').text(result.userStatDt);
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_PW').val(result.userPw);
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_USER_PW_CONFIRM').val(result.userPw);
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_TEL_NO').val(result.telNo);
-	$('#ITP_FORM_STINFO01010_DETAIL #ITP_FORM_STINFO01010_DETAIL_EMAIL').val(result.email);
-	$('#ITP_FORM_STINFO01010_DETAIL .fnAddDt').text(result.addDt);
-	$('#ITP_FORM_STINFO01010_DETAIL .fnLastLoginDt').text(result.lastLoginDt);
-	
-	// 권한정보 리스트 조회
-	itp_fn_STINFO01010_detail_grid.unload();
-	itp_fn_STINFO01010_detail_grid.callBack();
-};
-
-var itp_fn_STINFO01010_detail_grid = {
-	init: function() {
-	},
-	callBack: function() {
-		let param = $('#ITP_FORM_STINFO01010_DETAIL').serializeObject();
-		param.gridSize = $.jgrid.defaults.rowNum; 
-		param.pagingYn = false; // 페이지안함 
-		
-		$(STINFO01010_DETAIL_GRID_ID).jqGrid({
-=======
 		    	if (itp_fn_check_grid_is_writing(OPER01010_VIEW_GRID_ID)) {
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, OPER01010_VIEW_GRID_ID);
 		    		return 'stop';
@@ -944,7 +567,6 @@ var itp_fn_OPER01010_detail_grid = {
 		param.pagingYn = false; // 페이지안함 
 		
 		$(OPER01010_DETAIL_GRID_ID).jqGrid({
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 			colModel: [
 				{
 					index: 'VIEW_CD', name: 'viewCd',
@@ -984,15 +606,9 @@ var itp_fn_OPER01010_detail_grid = {
 			},
 			postData: JSON.stringify(param),
 			url: DOMAIN + USER_USERAUTH_GRID_LIST,
-<<<<<<< HEAD
-			pager: STINFO01010_DETAIL_GRID_PAGER,
-			loadComplete: function(data) {				
-				itp_fn_grid_load_complete(data, STINFO01010_DETAIL_GRID_ID, true, undefined, 'STINFO01010_DETAIL');
-=======
 			pager: OPER01010_DETAIL_GRID_PAGER,
 			loadComplete: function(data) {				
 				itp_fn_grid_load_complete(data, OPER01010_DETAIL_GRID_ID, true, undefined, 'OPER01010_DETAIL');
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 		    },
 		    loadError: function(jqXHR, textStatus, errorThrown) {
 		    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
@@ -1003,19 +619,11 @@ var itp_fn_OPER01010_detail_grid = {
 	    				$(args).trigger('reloadGrid');
 	    			}
 	    		};
-<<<<<<< HEAD
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_DETAIL_GRID_ID)) {
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, STINFO01010_DETAIL_GRID_ID);
-		    		return 'stop';
-		    	} else {
-		    		itp_fn_grid_paging(STINFO01010_DETAIL_GRID_ID, action, param);
-=======
 		    	if (itp_fn_check_grid_is_writing(OPER01010_DETAIL_GRID_ID)) {
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, OPER01010_DETAIL_GRID_ID);
 		    		return 'stop';
 		    	} else {
 		    		itp_fn_grid_paging(OPER01010_DETAIL_GRID_ID, action, param);
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 		    	}
 		    },
 		    onSortCol: function(index, columnIndex, sortOrder) {
@@ -1024,25 +632,6 @@ var itp_fn_OPER01010_detail_grid = {
 	    				$(args).trigger('reloadGrid');
 	    			}
 	    		};
-<<<<<<< HEAD
-		    	if (itp_fn_check_grid_is_writing(STINFO01010_DETAIL_GRID_ID)) {
-		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, STINFO01010_DETAIL_GRID_ID);
-		    		return 'stop';
-		    	} else {
-		    		itp_fn_grid_sorting(STINFO01010_DETAIL_GRID_ID, index, sortOrder);
-		    	}
-		    }
-		}).navGrid(STINFO01010_DETAIL_GRID_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
-	},
-	clearData : function() {
-		$(STINFO01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
-		$(STINFO01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
-		$(STINFO01010_DETAIL_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
-		$(STINFO01010_DETAIL_GRID_EMPTY).show();
-	}, 
-	unload : function() {
-		$.jgrid.gridUnload(STINFO01010_DETAIL_GRID_ID); 
-=======
 		    	if (itp_fn_check_grid_is_writing(OPER01010_DETAIL_GRID_ID)) {
 		    		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, OPER01010_DETAIL_GRID_ID);
 		    		return 'stop';
@@ -1060,6 +649,5 @@ var itp_fn_OPER01010_detail_grid = {
 	}, 
 	unload : function() {
 		$.jgrid.gridUnload(OPER01010_DETAIL_GRID_ID); 
->>>>>>> 1f5591176f85803c9f8126ffe3f4b6729e10f879
 	}
 };

src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -14,6 +14,11 @@ const OPER02010_DETAIL_GRID_LIST = '#ITP_OPER02010_DETAIL_jqGrid_list';
 const OPER02010_DETAIL_GRID_PAGER = '#ITP_OPER02010_DETAIL_jqGridPager';
 const OPER02010_DETAIL_GRID_EMPTY = '#ITP_OPER02010_DETAIL_jqGridEmpty';
 
+const OPER02010_BRAND_GRID_ID = '#ITP_OPER02010_BRAND_jqGrid';
+const OPER02010_BRAND_GRID_LIST = '#ITP_OPER02010_BRAND_jqGrid_list';
+const OPER02010_BRAND_GRID_PAGER = '#ITP_OPER02010_BRAND_jqGridPager';
+const OPER02010_BRAND_GRID_EMPTY = '#ITP_OPER02010_BRAND_jqGridEmpty';
+
 let ITP_FORM_OPER02010_DETAIL_IS_WRITING = false;
 
 let NTICE_SAVE_NTICE = '/api/ntice/save-ntice';
@@ -594,4 +599,35 @@ var itp_fn_OPER02010_detail_grid = {
 	unload : function() {
 		$.jgrid.gridUnload(OPER02010_DETAIL_GRID_ID);
 	}
+};
+
+var itp_fn_OPER02010_brand_grid = {
+	init: function() {
+	},
+	colModel: [
+		{
+			index: 'BRAND_ID', name: 'brandId',
+			label: ITP_MSG_LOCALE.table.brandId,
+			width: '20', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text'
+		},
+		{
+			index: 'BRAND_NM', name: 'brandNm',
+			label: ITP_MSG_LOCALE.table.brandNm,
+			width: '30', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text'
+		}
+	],
+	callBack: function() {
+
+	},
+	clearData : function() {
+		$(OPER02010_BRAND_GRID_ID).jqGrid('clearGridData', true);
+		$(OPER02010_BRAND_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+		$(OPER02010_BRAND_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+		$(OPER02010_BRAND_GRID_EMPTY).show();
+	},
+	unload : function() {
+		$.jgrid.gridUnload(OPER02010_BRAND_GRID_ID);
+	}
 };

src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -467,54 +467,55 @@ var itp_fn_OPER03010_grid = {
 			$(OPER03010_GRID_ID).setGridParam({'postData': JSON.stringify(itp_OPER03010_param)}).trigger('reloadGrid');
 		});	
 	},
+	colModel: [
+		{
+			index: 'CMPY_CD', name: 'cmpyCd',
+			label: '가맹점코드',
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'CMPY_NM', name: 'cmpyNm',
+			label: '가맹점명',
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'CMPY_TYPE_NM', name: 'cmpyTypeNm',
+			label: '기업형태',
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'CMPY_STAT_NM', name: 'cmpyStatNm',
+			label: '기업상태',
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'BOSS_NM', name: 'bossNm',
+			label: '대표자명',
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'MAIN_TEL', name: 'mainTel',
+			label: '대표연락처',
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ADD_DT', name: 'addDt',
+			label: '가입일자',
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	],
 	callBack: function() {
 		let param = $('#ITP_FORM_OPER03010_SEARCH').serializeObject();
 		param.gridSize = $.jgrid.defaults.rowNum;	
 		$(OPER03010_GRID_ID).jqGrid({
-			colModel: [
-				{
-					index: 'CMPY_CD', name: 'cmpyCd',
-					label: '가입자코드', 
-					width: '6', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'CMPY_NM', name: 'cmpyNm',
-					label: '가입자명', 
-					width: '10', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'CMPY_TYPE_NM', name: 'cmpyTypeNm',
-					label: '기업형태', 
-					width: '6', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'CMPY_STAT_NM', name: 'cmpyStatNm',
-					label: '기업상태', 
-					width: '6', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'BOSS_NM', name: 'bossNm',
-					label: '대표자명', 
-					width: '6', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'MAIN_TEL', name: 'mainTel',
-					label: '대표연락처', 
-					width: '6', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				},
-				{
-					index: 'ADD_DT', name: 'addDt',
-					label: '가입일자', 
-					width: '8', fixed: false, align: 'center',
-					sortable: false, hidden: false
-				}
-			],
+			colModel: this.colModel,
 			loadBeforeSend: function(jqXHR) {
 			    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
 			},