운영관리 사용자관리/공지사항관리 수정

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

@@ -128,7 +128,7 @@
 
 					<div class="itp_table fix">
 						<div class="itp_table_head fix">
-							<h4 class="itp_table_tit">* 공지대상이 특정 대상일 경구 추가 버큰을 통해 사용자  등록 함</h4>
+							<h4 class="itp_table_tit">* 공지대상이 특정 대상일 경우 추가 버큰을 통해 사용자  등록 함</h4>
 							<div class="pull-right itp_cicon">
 								<button type="button" id="ITP_BTN_OPER02010_DETAIL_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_DETAIL_DELROW" class="btn btn-danger btn-sm DEB"><i class="glyphicon glyphicon-remove"></i> 삭제</button>

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

@@ -228,6 +228,7 @@ const ITP_MSG_LOCALE = (function() {
 			},
 			"page": {
 				"noMoreTab": "더는 탭을 열 수 없습니다.",
+				"noChoiceBrand": "브랜드가 선택 후 이용 바랍니다.",
 				"noBack": "뒤로 가기 버튼을 이용할 수 없습니다.",
 				"allowPop": "이 웹 사이트에 대한 팝업을<br>허용하십시오."
 			},

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

@@ -18,6 +18,19 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_OPER01010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_ID" name="afflShopId" value="">
+									<div class="form-group">
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="가맹점명" readonly>
+										</div>
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<button type="button" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
+										</div>
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
+										</div>
+									</div>
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER01010_SERVICE_ST_DT" class="form-control itp_input" name="serviceStDt">
@@ -64,16 +77,15 @@
 											<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_AFFL_SHOP" class="form-control itp_input" name="afflShop">
-														<option value=""></option>
-													</select>
+													<input type="text" name="afflShopNm" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="가맹점명" readonly>
+													<button type="button" id="ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
+													<button type="button" id="ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
 												</div>
 											</div>
 											<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_BRAND_NM" class="form-control itp_input" name="brandNm">
-														<option value=""></option>
+													<select id="ITP_FORM_OPER01010_DETAIL_SEARCH_BRAND_ID" class="form-control itp_input" name="brandId">
 													</select>
 												</div>
 											</div>

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

@@ -18,6 +18,19 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_OPER02010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID" name="afflShopId" value="">
+									<div class="form-group">
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="가맹점명" readonly>
+										</div>
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
+										</div>
+										<div class="col-xs-3 itp_ip itp_noMar">
+											<select id="ITP_FORM_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>
+										</div>
+									</div>
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER02010_SERVICE_ST_DT" class="form-control itp_input">
@@ -60,6 +73,7 @@
 								<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_VIEW_CD" name="viewCd" value="C">
 								<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_NTICE_NO" name="nticeNo" value="">
 								<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_FILE_NO" name="fileNo" value="">
+								<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_ID" name="afflShopId" value="">
 
 								<section class="itp_form_sec">
 									<!-- <h4 class="itp_form_tit">공지정보</h4> -->
@@ -67,17 +81,16 @@
 										<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 class="col-xs-8 itp_in">
+													<input type="text" name="afflShopNm" id="ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" placeholder="가맹점명" readonly>
+													<button type="button" id="ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
+													<button type="button" id="ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><i class="glyphicon glyphicon-erase"></i></button>
 												</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>
+												<div class="col-xs-12 itp_in">
+													<select id="ITP_FORM_OPER02010_DETAIL_SEARCH_BRAND_ID" class="form-control itp_input" name="brandId">
 													</select>
 												</div>
 											</div>
@@ -132,12 +145,20 @@
 												</div>
 											</div>
 										</div>
-										<div class="form-group border">
+										<div class="form-group colspan">
 											<label class="col-xs-2 itp_lb">공지대상</label>
-											<div class="col-xs-10 itp_ip">
+											<div class="col-xs-5 itp_ip">
 												<div class="col-xs-2 itp_in">
 												<select id="ITP_FORM_OPER02010_DETAIL_TARGET_CD" class="form-control itp_input" name="targetCd"></select>
 												</div>
+												<div class="col-xs-5 itp_in" id="ITP_FORM_OPER02010_TARGET">
+													<input id="ITP_FORM_OPER02010_DETAIL_BRAND" type="checkbox" class="itp_check"> 브랜드
+													<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_BRAND_CHK" name="brandChk" value="">
+													<input id="ITP_FORM_OPER02010_DETAIL_STORE" type="checkbox" class="itp_check"> 매장
+													<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_STORE_CHK" name="storeChk" value="">
+													<input id="ITP_FORM_OPER02010_DETAIL_SPPLY" type="checkbox" class="itp_check"> 공급사
+													<input type="hidden" id="ITP_FORM_OPER02010_DETAIL_SPPLY_CHK" name="spplyChk" value="">
+												</div>
 											</div>
 										</div>
 									</div>
@@ -148,10 +169,10 @@
 
 					<div class="itp_table fix">
 						<div class="itp_table_head fix">
-							<h4 class="itp_table_tit">* 공지대상이 특정 대상일 경구 추가 버큰을 통해 사용자  등록 함</h4>
+							<h4 class="itp_table_tit">* 권한 정보 (* 공지대상이 특정 대상일 경우 추가 버튼 을 통해 사용자 등록 함)</h4>
 							<div class="pull-right itp_cicon">
-								<button type="button" id="ITP_BTN_OPER02010_DETAIL_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_DETAIL_DELROW" class="btn btn-danger btn-sm DEB"><i class="glyphicon glyphicon-remove"></i> 삭제</button>
+								<button type="button" id="ITP_BTN_OPER02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ADB" style="display: inline-block;" disabled><i class="glyphicon glyphicon-plus"></i> 추가</button>
+								<button type="button" id="ITP_BTN_OPER02010_DETAIL_DELROW" class="btn btn-danger btn-sm DEB" disabled><i class="glyphicon glyphicon-remove"></i> 삭제</button>
 							</div>
 						</div>
 
@@ -162,23 +183,6 @@
 							<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/app/popup/biz/BIZPOP_AFFL_BRAND.html

@@ -0,0 +1,47 @@
+<div id="ITP_BIZPOP_AFFL_BRAND" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<form id="ITP_FORM_BIZPOP_AFFL_BRAND">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h5 class="modal-title">가맹점 검색</h5>
+				</div>
+				<div class="modal-body">
+					<div class="itp_form fix">
+						<div class="col-xs-12 itp_form_inline">
+							<div class="form-horizontal fix">
+								<!--<div class="col-xs-4 itp_ip itp_pr">
+									<input type="text" name="scmpyCd" id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_CD" class="form-control itp_input" placeholder="가맹점코드">
+								</div>-->
+								<div class="col-xs-9 itp_ip itp_pr">
+									<input type="text" name="afflShopNm" id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_NM" class="form-control itp_input" placeholder="가맹점명">
+								</div>
+								<!--<div class="col-xs-4 itp_ip itp_noMar">
+									<select id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_TYPE_CD" class="form-control itp_input" name="scmpyTypeCd"></select>
+								</div>-->
+								<div class="pull-right itp_cicon">
+									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_AFFL_BRAND_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
+									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_AFFL_BRAND_BTN_SELECT"><i class="glyphicon glyphicon-ok"></i> 선택</button>
+								</div>
+							</div>
+						</div>
+					</div>
+					<!--<div class="itp_form fix">
+						<div class="pull-right itp_cicon">
+							<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_AFFL_BRAND_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
+							<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_AFFL_BRAND_BTN_SELECT"><i class="glyphicon glyphicon-ok"></i> 선택</button>
+						</div>
+					</div>-->
+					<div id="ITP_BIZPOP_AFFL_BRAND_jqGrid_list" class="itp_tb_list" data-total-cnt="">
+						<div id="ITP_BIZPOP_AFFL_BRAND_jqGridView" class="itp_views fix"></div>
+						<table id="ITP_BIZPOP_AFFL_BRAND_jqGrid"></table>
+						<div id="ITP_BIZPOP_AFFL_BRAND_jqGridPager"></div>
+						<div id="ITP_BIZPOP_AFFL_BRAND_jqGridEmpty" class="itp_no_data"></div>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<div id="ITP_POPUP_JS"></div>
+</div>

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

@@ -0,0 +1,38 @@
+<div id="ITP_BIZPOP_AFFL_SHOP" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<form id="ITP_FORM_BIZPOP_AFFL_SHOP">
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+					<h5 class="modal-title">가맹점 검색</h5>
+				</div>
+				<div class="modal-body">
+					<div class="itp_form fix">
+						<div class="col-xs-12 itp_form_inline">
+							<div class="form-horizontal fix">
+								<div class="col-xs-9 itp_ip itp_pr">
+									<input type="text" name="afflShopNm" id="ITP_FORM_BIZPOP_AFFL_SHOP_CMPY_NM" class="form-control itp_input" placeholder="가맹점명">
+								</div>
+								<!--<div class="col-xs-4 itp_ip itp_noMar">
+									<select id="ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_TYPE_CD" class="form-control itp_input" name="scmpyTypeCd"></select>
+								</div>-->
+								<div class="pull-right itp_cicon">
+									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_AFFL_SHOP_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
+									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_AFFL_SHOP_BTN_SELECT"><i class="glyphicon glyphicon-ok"></i> 선택</button>
+								</div>
+							</div>
+						</div>
+					</div>
+					<div id="ITP_BIZPOP_AFFL_SHOP_jqGrid_list" class="itp_tb_list" data-total-cnt="">
+						<div id="ITP_BIZPOP_AFFL_SHOP_jqGridView" class="itp_views fix"></div>
+						<table id="ITP_BIZPOP_AFFL_SHOP_jqGrid"></table>
+						<div id="ITP_BIZPOP_AFFL_SHOP_jqGridPager"></div>
+						<div id="ITP_BIZPOP_AFFL_SHOP_jqGridEmpty" class="itp_no_data"></div>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<div id="ITP_POPUP_JS"></div>
+</div>

src/main/webapp/css/style.css

@@ -122,6 +122,9 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_HEADER .itp_rt .itp_icon {margin-right:5px;}
 #ITP_HEADER .itp_logo {margin:0; padding:0; color:#337ab7; float:left; width:30px;}
 #ITP_HEADER .itp_logo img{width:30px;}
+#ITP_HEADER .itp_txt_brand {float:left; margin:4px; padding:0 4px; color:#fff; font-size:18px; text-decoration:none;}
+#ITP_HEADER .itp_sch_brand {margin:0 4px; padding:0; color:#337ab7; float:left; width:30px;}
+#ITP_HEADER .itp_sch_brand button{width:30px;}
 #ITP_HEADER .itp_menu {float:left; border:1px solid #ddd; line-height: 24px; background:#eee;margin:4px; border-radius: 2px; padding:0 4px;}
 #ITP_HEADER .itp_menu a {color:#000; font-size:13px; text-decoration:none;}
 #ITP_HEADER .itp_out {float:left; border:1px solid #000; line-height: 24px; background:#666; margin:4px; border-radius: 2px; padding:0 4px;}

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

@@ -139,6 +139,10 @@ require([
 	$('[data-toggle="tooltip"]').tooltip();
 	$('.modal.itp_modal .modal-content').draggable();
 
+
+	itp_fn_set_timeout.init();
+
+
 	$('#ITP_BTN_HOME').on('click', function() {
 		location.replace(ITP_CONTEXTPATH + '/main.html');
 	});
@@ -185,8 +189,11 @@ require([
 		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');
+			// $('#ITP_HEADER .itp_tab_list li:first-child').addClass('active');
+			// $('#ITP_CONTAINER .itp_contents .itp_sec:first-child').addClass('active');
+			$('#ITP_HEADER .itp_tab_list li').eq(curIdx - 1).addClass('active');
+			$('#ITP_CONTAINER .itp_contents .itp_sec').eq(curIdx - 1).addClass('active');
+			itp_fn_fire_window_resize();
 			selTabIndex = 0;
 		} else {
 			selTabIndex = selTabIndex - 1;
@@ -341,8 +348,9 @@ require([
 					USER_NM = result.userNm;					
 					USER_TYPE_CD = result.userTypeCd;
 					AUTH_TYPE_CD = result.authTpCd;
-					AFFL_LIST = result.afflList;
-					BRAND_LIST = result.brandList;
+					AUTH_TYPE_NM = result.authTpNm;
+					AFFL_SHOP_LIST = result.afflList;
+					AFFL_BRAND_LIST = result.brandList;
 					/*
 					if(FRCOMP_LIST.length > 0) {
 						let itp_manage_cmpy_cd = '';
@@ -367,7 +375,7 @@ require([
 					// 사용자명
 					$('#ITP_LOGIN_USER').text(USER_NM);
 					// 가맹점 만들기
-					fn_make_brand_shop.init();
+					fn_make_affl_brand.init();
 					// 왼쪽 메뉴 만들기
 					fn_make_side_menu();
 					// 메뉴 요약
@@ -388,33 +396,30 @@ function fn_make_menu_summary() {
 	
 }
 
-var fn_make_brand_shop = {
+var fn_make_affl_brand = {
 	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();
-		}
+		sessionStorage.setItem('itp_manage_cmpy_cd', (AFFL_BRAND_LIST.length < 1) ? '' : JSON.stringify(AFFL_BRAND_LIST[0]));
+		let authTypeNm = (AUTH_TYPE_NM === undefined) ? '오더퀸' : AUTH_TYPE_NM;
+		$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
 	},
 	action: function () {
-		$('#ITP_BTN_MAIN_SHR_CMPY').on('click', function() {
+		$('#ITP_BTN_MAIN_SHR_AFFL').on('click', function() {
 			// 팝업
 			var popFn = function(rowDataPop) {
+				console.log(rowDataPop);
+				// sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(AFFL_BRAND_LIST[0]));
+				// $('#ITP_TXT_MAIN_SHR_CMPY').text(AFFL_BRAND_LIST[0].brandNm);
 				$.each(rowDataPop, function(key, value) {
 					itp_fn_close_other_tab(''); // 다른탭 닫기
-					sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(value));
+					$('#ITP_TXT_MAIN_SHR_BRAND').text('(' + value.brandNm + ')');
+					sessionStorage.setItem('itp_manage_brand_cd', JSON.stringify(value));
 				});
 			};
-			fn_call_popup('biz', 'BIZPOP_FRCOMP_STORE', '#ITP_ASIDE', popFn, null, 'S');
+			fn_call_popup('biz', 'BIZPOP_AFFL_BRAND', '#ITP_ASIDE', popFn, null, 'S');
 		});
 	}
 };
@@ -464,6 +469,11 @@ function fn_make_side_menu() {
 
 		console.log('[ITP_NAV_LINK] data-itp-nav-id = ' + id + ', data-conn-url = ' + connUrl + ', tabSize = ' + tabSize);
 
+		if(String(id).indexOf('OPER') === -1 && !sessionStorage.getItem('itp_manage_brand_cd')) {
+			itp_fn_modal_alert(ITP_MSG_LOCALE.message.page.noChoiceBrand);
+			return false;
+		}
+
 		if (tabSize > 10) {
 			itp_fn_modal_alert(ITP_MSG_LOCALE.message.page.noMoreTab);
 			return false;
@@ -619,7 +629,7 @@ function fn_make_select_brand(options, select_id, all_show_yn, all_name) { //브
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.brandCd,	// 브랜드코드
+            'value': value.brandId,	// 브랜드코드
             'text': value.brandNm	// 브랜드명
         }).appendTo($select_id);
 	});
@@ -2855,4 +2865,18 @@ var itp_fn_jqgrid_to_excel = function(gridId, fileName, sheetName){
 		dataList.push(data);
 	});
 	itp_fn_export_excel(dataList, fileName, sheetName);    
-}
+};
+
+var itp_fn_set_timeout = {
+	init: function () {
+		this.action();
+	},
+	action: function () {
+		$(document).on('click', 'button', function() {
+			if(!$(this).hasClass('itp_out')) {
+				//로그인체크
+				itp_fn_logined_check();
+			}
+		});
+	}
+};

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

@@ -106,13 +106,15 @@ const ITP_MSG_LOCALE = (function() {
 			"numbering": "NO",
 			"inputSelf": "직접입력",
 			"active": "활성",
-			"afflShop": "가맹점",
-			"brandNm": "브랜드",
+			"afflShopNm": "가맹점",
+			"brandId": "브랜드ID",
+			"brandNm": "브랜드명",
 			"notiNo": "공지번호",
 			"titlet": "제목",
 			"targetNm": "대상구분",
 			"viewDt": "노출일",
 			"regDt": "등록일",
+			"srhResult": "검색결과",
 		},
 		"table": {
 			"brandId": "브랜드ID",
@@ -239,6 +241,7 @@ const ITP_MSG_LOCALE = (function() {
 			},
 			"page": {
 				"noMoreTab": "더는 탭을 열 수 없습니다.",
+				"noChoiceBrand": "브랜드 선택 후 이용 바랍니다.",
 				"noBack": "뒤로 가기 버튼을 이용할 수 없습니다.",
 				"allowPop": "이 웹 사이트에 대한 팝업을<br>허용하십시오."
 			},

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

@@ -23,7 +23,7 @@ require(['config'], function() {
 	    	itp_fn_fire_window_resize();
 	
 			// 조회
-	    	itp_fn_MAIN_NOTICE_search();	
+	    	itp_fn_MAIN_NOTICE_search();
 		}, 100);
 				
 	});

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

@@ -39,6 +39,9 @@ require(['config'], function() {
 		$('#ITP_TAB_OPER01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 		// $('#ITP_FORM_OPER01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
 		// $('#ITP_FORM_OPER01010_SEARCH_TO_DT').datepicker('setDate', new Date());
+
+		// 가맹점 조회
+		itp_fn_OPER01010_brand_search.init();
 				
 		// 그리드				
 		itp_fn_jqgrid_resize(OPER01010_GRID_ID, OPER01010_GRID_LIST, 'lg');
@@ -282,8 +285,8 @@ var itp_fn_OPER01010_grid = {
 	},
 	colModel: [
 		{
-			index: 'AGENCY_NM', name: 'afflShop',
-			label: ITP_MSG_LOCALE.label.afflShop, //가맹점
+			index: 'AFFL_SHOP_NM', name: 'afflShopNm',
+			label: ITP_MSG_LOCALE.label.afflShopNm, //가맹점
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
@@ -650,4 +653,73 @@ var itp_fn_OPER01010_detail_grid = {
 	unload : function() {
 		$.jgrid.gridUnload(OPER01010_DETAIL_GRID_ID); 
 	}
+};
+
+var itp_fn_OPER01010_brand_search = {
+	init: function () {
+		if(AUTH_TYPE_CD === '10' || AUTH_TYPE_CD === '20') {
+			this.action();
+		} else {
+			this.make();
+		}
+	},
+	make: function() {
+		$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP').hide();
+		$('#ITP_FORM_OPER01010_DELETE_AFFL_SHOP').hide();
+		if(AFFL_SHOP_LIST) {
+			$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_ID').val(AFFL_SHOP_LIST[0].afflShopId);
+			$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM').val(AFFL_SHOP_LIST[0].afflShopNm);
+		}
+		if(AFFL_BRAND_LIST) {
+			fn_make_select_brand(AFFL_BRAND_LIST, 'ITP_FORM_OPER01010_SEARCH_BRAND_ID');
+		}
+	},
+	action: function () {
+		var _this = this;
+		// 가맹점 조회 버튼 클릭
+		$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP').on('click', function() {
+			_this.afflShop('L');
+		});
+		// 가맹점 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_OPER01010_DELETE_AFFL_SHOP').on('click', function() {
+			$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM').val('');
+			$('select#ITP_FORM_OPER01010_SEARCH_BRAND_ID option').remove();
+		});
+		// 신규등록 가맹점 조회 버튼 클릭
+		$('#ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP').on('click', function() {
+			_this.afflShop('C');
+		});
+		// 신규등록 가맹점 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_OPER01010_DETAIL_DELETE_AFFL_SHOP').on('click', function() {
+			$('#ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM').val('');
+			$('select#ITP_FORM_OPER01010_DETAIL_SEARCH_BRAND_ID option').remove();
+		});
+	},
+	afflShop: function (view) {
+		// 팝업
+		var popFn = (view === 'C') ? this.callback.create : this.callback.list;
+		fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
+	},
+	callback: {
+		list: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop.AFFL_SHOP) {
+				$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+				$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+			}
+			if(rowDataPop.AFFL_BRAND) {
+				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER01010_SEARCH_BRAND_ID');
+			}
+		},
+		create: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop.AFFL_SHOP) {
+				$('#ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+				$('#ITP_FORM_OPER01010_DETAIL_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+			}
+			if(rowDataPop.AFFL_BRAND) {
+				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER01010_DETAIL_SEARCH_BRAND_ID', true, '선택');
+			}
+		}
+	}
 };

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

@@ -34,6 +34,7 @@ require(['config'], function() {
 		// 버튼 권한설정
 		fn_proc_btn_auth('OPER02010');
 		// 공통코드 표시
+		// fn_make_select(CODE_LIST, 'TARGET_CD', 'ITP_FORM_OPER02010_DETAIL_TARGET_CD');
 		fn_make_select(CODE_LIST, 'TARGET_CD', 'ITP_FORM_OPER02010_DETAIL_TARGET_CD', true, '선택');
 
 		// 조회일자 지정
@@ -42,6 +43,9 @@ require(['config'], function() {
 		$('#ITP_FORM_OPER02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
 		$('#ITP_FORM_OPER02010_SEARCH_TO_DT').datepicker('setDate', new Date());
 
+		// 가맹점 조회
+		itp_fn_OPER02010_brand_search.init();
+
 		// 그리드
 		itp_fn_jqgrid_resize(OPER02010_GRID_ID, OPER02010_GRID_LIST, 'lg');
 		itp_fn_OPER02010_grid.init();
@@ -147,25 +151,26 @@ require(['config'], function() {
 				var exists = '';
 				const rowData = $(OPER02010_DETAIL_GRID_ID).getRowData();
 				$.each(rowData, function(key, value) {
-					exists = exists + value.userId + ';';
+					exists = exists + value.brandId + ';';
 				});
 
 				$.each(rowDataPop, function(key, value) {
-					// console.log(JSON.stringify(value));
+					console.log(value);
 					// console.log(exists.indexOf(value.userId));
-					if(exists.indexOf(value.userId) < 0) {
+					if(exists.indexOf(value.brandId) < 0) {
 						// 행추가
 						$(OPER02010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
 						var rids = $(OPER02010_DETAIL_GRID_ID).jqGrid('getDataIDs');
 						var last_row_id = rids[rids.length - 1];
 						$(OPER02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'viewCd', 'C');
-						$(OPER02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'userId', value.userId);
-						$(OPER02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'userNm', value.userNm);
+						$(OPER02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'brandId', value.brandId);
+						$(OPER02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'brandNm', value.brandNm);
 					}
 				});
 				$(OPER02010_DETAIL_GRID_EMPTY).hide();
 			};
-			fn_call_popup('comm', 'USER_SCH_POPUP', '#ITP_ASIDE', popFn, null, 'S');
+			var args = {'brandNm':$('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_NM').val()};
+			fn_call_popup('biz', 'BIZPOP_AFFL_BRAND', '#ITP_ASIDE', popFn, args, 'S');
 		});
 		// 상세:삭제버튼
 		$('#ITP_BTN_OPER02010_DETAIL_DELROW').on('click', function() {
@@ -178,6 +183,9 @@ require(['config'], function() {
 			var last_row_id = rids[rids.length - 1];
 			itp_fn_grid_reset_selection(e, last_row_id, gridId, 'OPER02010_DETAIL');
 		});
+
+		// [수발주 추가]
+		itp_fn_OPER02010_form_set.init();
 	});
 });
 
@@ -210,7 +218,7 @@ var itp_fn_OPER02010_switch_screen = function(mode) {
 		$('#ITP_FORM_OPER02010_DETAIL_NTICE_TITL').val('');
 		$('#ITP_FORM_OPER02010_DEL_YN').val('N');
 		$('#ITP_FORM_OPER02010_DETAIL_NTICE_DESC').val('');
-		$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').val('');
+		// $('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').val('');
 		$('#ITP_FORM_OPER02010_FROM_DT').datepicker('setDate', new Date());
 		$('#ITP_FORM_OPER02010_TO_DT').datepicker('setDate', new Date());
 	} else if(mode == 'MODIFY') { // 수정
@@ -259,6 +267,18 @@ var itp_fn_OPER02010_grid = {
 					width: '10', fixed: false, align: 'center',
 					sortable: false, hidden: false
 				},
+				{
+					index: 'AFFL_SHOP_NM', name: 'afflShopNm',
+					label: ITP_MSG_LOCALE.label.afflShopNm, //가맹점
+					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: 'NTICE_TITL', name: 'nticeTitl',
 					label: ITP_MSG_LOCALE.label.titlet, //공지제목
@@ -538,14 +558,14 @@ var itp_fn_OPER02010_detail_grid = {
 					sortable: false, hidden: true
 				},
 				{
-					index: 'USER_ID', name: 'userId',
-					label: ITP_MSG_LOCALE.label.userId,
+					index: 'BRAND_ID', name: 'brandId',
+					label: ITP_MSG_LOCALE.label.brandId,
 					width: '20', fixed: false, align: 'center',
 					sortable: false, editable: false, edittype: 'text'
 				},
 				{
-					index: 'USER_NM', name: 'userNm',
-					label: ITP_MSG_LOCALE.label.userName,
+					index: 'BRAND_NM', name: 'brandNm',
+					label: ITP_MSG_LOCALE.label.brandNm,
 					width: '30', fixed: false, align: 'center',
 					sortable: false, editable: false, edittype: 'text'
 				}
@@ -630,4 +650,122 @@ var itp_fn_OPER02010_brand_grid = {
 	unload : function() {
 		$.jgrid.gridUnload(OPER02010_BRAND_GRID_ID);
 	}
+};
+
+var itp_fn_OPER02010_form_set = {
+	init: function () {
+		this.selectbox.init();
+		this.checkbox.init();
+	},
+	selectbox: {
+		init: function () {
+			this.brand();
+			this.target();
+		},
+		brand: function() {
+			// 브랜드 selectbox 선택
+			$('#ITP_FORM_OPER02010_DETAIL_SEARCH_BRAND_ID').on('change', function() {
+				if(this.selectedIndex > 0) {
+					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD option:eq(0)').prop('selected', true);
+					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').attr('disabled', true);
+					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').trigger('change');
+				} else {
+					$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').attr('disabled', false);
+				}
+			});
+		},
+		target: function() {
+			// 공지대상 selectbox 선택
+			$('#ITP_FORM_OPER02010_DETAIL_TARGET_CD').on('change', function() {
+				if(this.selectedIndex > 1) {
+					$('#ITP_BTN_OPER02010_DETAIL_ADDROW').attr('disabled', false);
+					$('#ITP_BTN_OPER02010_DETAIL_DELROW').attr('disabled', false);
+				} else {
+					$('#ITP_BTN_OPER02010_DETAIL_ADDROW').attr('disabled', true);
+					$('#ITP_BTN_OPER02010_DETAIL_DELROW').attr('disabled', true);
+					$(OPER02010_DETAIL_GRID_ID).remove();
+				}
+			});
+		}
+	},
+	checkbox: {
+		init: function () {
+			this.target();
+		},
+		target: function() {
+			// 공지대상 checkbox 선택
+			$('#ITP_FORM_OPER02010_TARGET').find('input:checkbox').on('change', function() {
+				$(this).next().val($(this).is(':checked') ? 'Y' : '');
+			});
+		}
+	}
+};
+
+var itp_fn_OPER02010_brand_search = {
+	init: function () {
+		if(AUTH_TYPE_CD === '10' || AUTH_TYPE_CD === '20') {
+			this.action();
+		} else {
+			this.make();
+		}
+	},
+	make: function() {
+		$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP').hide();
+		$('#ITP_FORM_OPER02010_DELETE_AFFL_SHOP').hide();
+		if(AFFL_SHOP_LIST) {
+			$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID').val(AFFL_SHOP_LIST[0].afflShopId);
+			$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM').val(AFFL_SHOP_LIST[0].afflShopNm);
+		}
+		if(AFFL_BRAND_LIST) {
+			fn_make_select_brand(AFFL_BRAND_LIST, 'ITP_FORM_OPER02010_SEARCH_BRAND_ID');
+		}
+	},
+	action: function () {
+		var _this = this;
+		// 가맹점 조회 버튼 클릭
+		$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP').on('click', function() {
+			_this.afflShop('L');
+		});
+		// 가맹점 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_OPER02010_DELETE_AFFL_SHOP').on('click', function() {
+			$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM').val('');
+			$('select#ITP_FORM_OPER02010_SEARCH_BRAND_ID option').remove();
+		});
+		// 신규등록 가맹점 조회 버튼 클릭
+		$('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP').on('click', function() {
+			_this.afflShop('C');
+		});
+		// 신규등록 가맹점 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_OPER02010_DETAIL_DELETE_AFFL_SHOP').on('click', function() {
+			$('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_NM').val('');
+			$('select#ITP_FORM_OPER02010_DETAIL_SEARCH_BRAND_ID option').remove();
+		});
+	},
+	afflShop: function (view) {
+		// 팝업
+		var popFn = (view === 'C') ? this.callback.create : this.callback.list;
+		fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
+	},
+	callback: {
+		list: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop.AFFL_SHOP) {
+				$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+				$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+			}
+			if(rowDataPop.AFFL_BRAND) {
+				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER02010_SEARCH_BRAND_ID');
+			}
+		},
+		create: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop.AFFL_SHOP) {
+				$('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+				$('#ITP_FORM_OPER02010_DETAIL_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+			}
+			if(rowDataPop.AFFL_BRAND) {
+				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER02010_DETAIL_SEARCH_BRAND_ID', true, '선택');
+			}
+		}
+	}
 };

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_AFFL_BRAND.js

@@ -0,0 +1,128 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+let FRCOMP_POP_GRID_LIST = '/api/brand/pop-grid-list';
+
+function itp_fn_BIZPOP_AFFL_BRAND(parentPopFn, args, returnType) {
+	// 공통코드
+	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_TYPE_CD', true, '가맹점타입 선택');
+	
+	let itp_BIZPOP_AFFL_BRAND_param = {};
+	let itp_BIZPOP_AFFL_BRAND_search = false;
+
+	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_AFFL_BRAND';
+	const THIS_GIRD_ID = '#ITP_BIZPOP_AFFL_BRAND_jqGrid';
+	const THIS_GIRD_PAGER = '#ITP_BIZPOP_AFFL_BRAND_jqGridPager';
+
+	if(args) {
+		$('#ITP_FORM_BIZPOP_AFFL_BRAND_CMPY_NM').val(args.brandNm);
+	}
+	
+	$('#ITP_BIZPOP_AFFL_BRAND').one('shown.bs.modal', function(e) {
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_AFFL_BRAND_jqGrid_list', '');
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_AFFL_BRAND').remove();
+	}).modal('show');
+
+	$('#ITP_BIZPOP_AFFL_BRAND_BTN_SEARCH').on('click', function() {
+		itp_BIZPOP_AFFL_BRAND_search = true;
+		let param = $(THIS_FORM_ID).serializeObject();
+		param.gridSize = 10;
+		param.gridPage = $.jgrid.defaults.page;
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+	});
+	
+	$('#ITP_BIZPOP_AFFL_BRAND_BTN_SELECT').on('click', function() {		
+		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
+	    if (!rowKey) {
+	    	return;
+	    }
+
+		var list = [];
+	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
+
+		if(selectedIds.length > 1) { // 1개만 선택
+			return;
+		} 
+		
+	    for (var i=selectedIds.length-1; i>=0; i--) {
+			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
+		}
+		parentPopFn(list);
+		$('#ITP_BIZPOP_AFFL_BRAND').modal('hide'); // 팝업닫기
+	});
+
+	$('#ITP_BIZPOP_AFFL_BRAND_jqGridEmpty').on('click', function() {
+		itp_fn_BIZPOP_AFFL_BRAND_empty.back();
+		itp_BIZPOP_AFFL_BRAND_param.gridSize = 10;
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_AFFL_BRAND_param)}).trigger('reloadGrid');
+	});
+
+	var itp_fn_BIZPOP_AFFL_BRAND_empty = {
+		push: function() {
+			let param = $(THIS_FORM_ID).serializeObject();
+			itp_BIZPOP_AFFL_BRAND_param = param;
+		},
+		back: function() {
+			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_AFFL_BRAND_param.scmpyCd);
+			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_AFFL_BRAND_param.scmpyNm);
+			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_AFFL_BRAND_param.scmpyTypeCd);
+		}
+	};
+
+	itp_fn_BIZPOP_AFFL_BRAND_empty.push();
+	let param = $('#ITP_FORM_BIZPOP_AFFL_BRAND').serializeObject();
+	param.gridSize = 10;
+
+	$(THIS_GIRD_ID).jqGrid({
+		colModel: [
+			{
+				index: 'AFFL_SHOP_ID', name: 'afflShopId',
+				label: '가맹점ID', //
+				width: '0', fixed: false, align: 'center',
+				sortable: false, hidden: true
+			},
+			{
+				index: 'AFFL_SHOP_NM', name: 'afflShopNm',
+				label: '가맹점명', //
+				width: '20', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'BRAND_ID', name: 'brandId',
+				label: '브랜드ID', //
+				width: '10', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'BRAND_NM', name: 'brandNm',
+				label: '브랜드명', //
+				width: '20', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			}
+		],
+		loadBeforeSend: function(jqXHR) {
+		    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
+		},
+		postData: JSON.stringify(param),
+		url: DOMAIN + FRCOMP_POP_GRID_LIST,
+		pager: THIS_GIRD_PAGER,
+		multiselect: true,
+		loadComplete: function(data) {
+			console.log(data);
+			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_AFFL_BRAND', itp_BIZPOP_AFFL_BRAND_search, itp_fn_BIZPOP_AFFL_BRAND_empty, true, data.gridRecords, false);
+	    },
+	    loadError: function(jqXHR, textStatus, errorThrown) {
+	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
+	    },
+	    onPaging: function(action) {
+	    	itp_fn_grid_paging(THIS_GIRD_ID, action, param);
+	    }
+	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
+};

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_AFFL_SHOP.js

@@ -0,0 +1,116 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+let AFFL_POP_GRID_LIST = '/api/affl/pop-grid-list';
+let BRAND_POP_GRID_LIST = '/api/brand/affl-brand-list';
+
+function itp_fn_BIZPOP_AFFL_SHOP(parentPopFn, args, returnType) {
+	
+	let itp_BIZPOP_AFFL_SHOP_param = {};
+	let itp_BIZPOP_AFFL_SHOP_search = false;
+
+	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_AFFL_SHOP';
+	const THIS_GIRD_ID = '#ITP_BIZPOP_AFFL_SHOP_jqGrid';
+	const THIS_GIRD_PAGER = '#ITP_BIZPOP_AFFL_SHOP_jqGridPager';
+	
+	$('#ITP_BIZPOP_AFFL_SHOP').one('shown.bs.modal', function(e) {
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_AFFL_SHOP_jqGrid_list', '');
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_AFFL_SHOP').remove();
+	}).modal('show');
+
+	$('#ITP_BIZPOP_AFFL_SHOP_BTN_SEARCH').on('click', function() {
+		itp_BIZPOP_AFFL_SHOP_search = true;
+		let param = $(THIS_FORM_ID).serializeObject();
+		param.gridSize = 10;
+		param.gridPage = $.jgrid.defaults.page;
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+	});
+	
+	$('#ITP_BIZPOP_AFFL_SHOP_BTN_SELECT').on('click', function() {		
+		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
+	    if (!rowKey) {
+	    	return;
+	    }
+	    const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
+
+		var afflData = {};
+		var callbackFn = function(result) {
+			afflData['AFFL_SHOP'] = selRow;
+			afflData['AFFL_BRAND'] = result.searchList;
+			parentPopFn(afflData);
+			$('#ITP_BIZPOP_AFFL_SHOP').modal('hide'); // 팝업닫기
+		};
+		console.log(selRow);
+		var param = {'afflShopId': selRow.afflShopId};
+		console.log('===>', param);
+		fn_ajax_call(BRAND_POP_GRID_LIST, param, callbackFn, 'GET');
+	});
+
+	$('#ITP_BIZPOP_AFFL_SHOP_jqGridEmpty').on('click', function() {
+		itp_fn_BIZPOP_AFFL_SHOP_empty.back();
+		itp_BIZPOP_AFFL_SHOP_param.gridSize = 10;
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_AFFL_SHOP_param)}).trigger('reloadGrid');
+	});
+
+	var itp_fn_BIZPOP_AFFL_SHOP_empty = {
+		push: function() {
+			let param = $(THIS_FORM_ID).serializeObject();
+			itp_BIZPOP_AFFL_SHOP_param = param;
+		},
+		back: function() {
+			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_AFFL_SHOP_param.scmpyCd);
+			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_AFFL_SHOP_param.scmpyNm);
+			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_AFFL_SHOP_param.scmpyTypeCd);
+		}
+	};
+
+	itp_fn_BIZPOP_AFFL_SHOP_empty.push();
+	let param = $('#ITP_FORM_BIZPOP_AFFL_SHOP').serializeObject();
+	param.gridSize = 10;
+
+	$(THIS_GIRD_ID).jqGrid({
+		colModel: [
+			{
+				index: 'AFFL_SHOP_ID', name: 'afflShopId',
+				label: '가맹점코드', // 
+				width: '10', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'AFFL_SHOP_NM', name: 'afflShopNm',
+				label: '가맹점명', //
+				width: '12', 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
+			}
+		],
+		loadBeforeSend: function(jqXHR) {
+		    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
+		},
+		postData: JSON.stringify(param),
+		url: DOMAIN + AFFL_POP_GRID_LIST,
+		pager: THIS_GIRD_PAGER,
+		multiselect: false,
+		loadComplete: function(data) {
+			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_AFFL_SHOP', itp_BIZPOP_AFFL_SHOP_search, itp_fn_BIZPOP_AFFL_SHOP_empty, true, data.gridRecords, false);
+	    },
+	    loadError: function(jqXHR, textStatus, errorThrown) {
+	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
+	    },
+	    onPaging: function(action) {
+	    	itp_fn_grid_paging(THIS_GIRD_ID, action, param);
+	    }
+	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
+};

src/main/webapp/main.html

@@ -48,8 +48,7 @@
 		<header id="ITP_HEADER">
 			<div class="itp_head bg-primary">
 				<h1 class="text-center itp_tit">
-					<span>브랜드명</span>
-					<button type="button" id="" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+					<span id="ITP_TXT_MAIN_SHR_AFFL">오더퀸</span>
 					<span style="font-size: 18px; margin-top: -3px">|</span>
 					<span style="font-size: 14px">수발주시스템</span>
 				</h1>
@@ -58,8 +57,11 @@
 					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_HOME"><i class="glyphicon glyphicon-home"></i></a></span>
 					<span class="itp_user" id="ITP_LOGIN_USER" style="cursor: pointer;"></span>
 				</div>
-				<div class="itp_rt"> 
-					<span class="itp_logo"><img src="/oqpo-view/images/favicon.ico" alt="로고"></span>
+				<div class="itp_rt">
+					<!--<span class="itp_logo"><img src="/oqpo-view/images/favicon.ico" alt="로고"></span>-->
+					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_TIMEOUT"></span>
+					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_BRAND"></span>
+					<span class="itp_sch_brand"><button type="button" id="ITP_BTN_MAIN_SHR_AFFL" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button></span>
 					<span class="itp_menu"><a href="javascript:void(0)" class="">메뉴안내</a></span>
 					<span class="itp_out"><a href="javascript:void(0)" class="ITP_BTN_LOGOUT">로그아웃</a></span>
 				</div>