운영관리 오류 수정

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

@@ -114,7 +114,7 @@
 											</div>
 										</div>
 									</div>	
-									<div class="itp_form_info">	
+									<!--<div class="itp_form_info">
 										<div class="itp_form_in">
 											<div class="form-group">
 												<label class="col-xs-2 itp_lb">비밀번호</label>
@@ -128,7 +128,7 @@
 												</div>
 											</div>
 										</div>
-									</div>	
+									</div>-->
 									<div class="itp_form_change">
 										<div class="itp_form_in">
 											<div class="form-group">
@@ -165,13 +165,13 @@
 											<label class="col-xs-2 itp_lb">주소(*)</label>
 											<div class="col-xs-10 itp_ip">
 												<div class="col-xs-1 itp_in">
-													<input type="text" id="ITP_FORM_OPER04010_DETAIL_ZIPNO" data-check-required="empty" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
+													<input type="text" id="ITP_FORM_OPER04010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
 												</div>
 												<div class="col-xs-1 itp_in">
 													<button type="button" id="ITP_FORM_OPER04010_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_OPER04010_DETAIL_ADRES" data-check-required="empty" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
+													<input type="text" id="ITP_FORM_OPER04010_DETAIL_ADRES" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
 												</div>
 												<div class="col-xs-4 itp_in">
 													<input type="text" id="ITP_FORM_OPER04010_DETAIL_ADRES_DTL" data-check-required="empty" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">

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

@@ -17,6 +17,19 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_OPER06010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID" name="safflShopId" />
+									<div class="form-group">
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<input type="text" id="ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="가맹점" />
+										</div>
+										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
+											<button type="button" id="ITP_BTN_OPER06010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_OPER06010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+										</div>
+										<div class="col-xs-2 itp_ip itp_noMar">
+											<select id="ITP_FORM_OPER06010_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_OPER06010_SERVICE_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="sbrandType">
@@ -52,7 +65,7 @@
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_VIEW_CD" name="viewCd" value="C">
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID" name="afflShopId" value="">
 								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_BRAND_ID" name="brandId" value="">
-								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_FILE_NO" name="fileNo" value="">
+								<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_FILE_NO" name="brandLogoFileNo" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">브랜드 정보-신규</h4>
@@ -99,8 +112,22 @@
 												</div>
 											</div>
 										</div>
-									</div>	
-									<div class="itp_form_info">	
+									</div>
+									<div class="itp_form_info">
+										<div class="itp_form_in">
+											<div class="form-group">
+												<label class="col-xs-2 itp_lb">대표자명</label>
+												<div class="col-xs-10 itp_ip">
+													<div class="col-xs-2 itp_in" style="margin-left:5px;">
+														<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm">
+													</div>
+													<div class="col-xs-5 itp_in" style="margin-top:5px;">
+													</div>
+												</div>
+											</div>
+										</div>
+									</div>
+									<!--<div class="itp_form_info">
 										<div class="itp_form_in">
 											<div class="form-group">
 												<label class="col-xs-2 itp_lb">비밀번호</label>
@@ -114,7 +141,7 @@
 												</div>
 											</div>
 										</div>
-									</div>
+									</div>-->
 									<div class="itp_form_in">
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">전화번호 *</label>
@@ -125,8 +152,7 @@
 												<!-- <button type="button" id="ITP_BTN_OPER06010_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_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_OPER06010_DETAIL_BRAND_LOGO "style="border:none; top:12px; left:12px; height:70px; width:85px; position:absolute;" class="form-control itp_input" name="brandLogo" >
+											<div id="ITP_OPER06010_DETAIL_LOGO_FILE" class="col-xs-1 itp_in">
 											</div>
 										</div>
 										<div class="form-group">
@@ -177,22 +203,22 @@
 											<label class="col-xs-2 itp_lb">PG사</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<select id="ITP_FORM_OPER06010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
+													<select id="ITP_FORM_OPER06010_DETAIL_PG_ID" data-select-code="PG_ID" data-check-required="empty" class="form-control itp_input" name="pgId">
 													</select>
 												</div>
 											</div>
 										</div>
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">가맹점 아이디 </label>
+											<label class="col-xs-2 itp_lb">PG 가맹점 아이디 </label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="가맹점 id">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" data-check-required="empty" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
 												</div>
 											</div>
-											<label class="col-xs-2 itp_lb">가맹점 Key</label>
+											<label class="col-xs-2 itp_lb">PG 가맹점 Key</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-8 itp_in">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="가맹점 key">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_KEY" class="form-control itp_input" name="pgKey" value="" placeholder="PG 가맹점 key">
 												</div>
 											</div>
 										</div>
@@ -202,13 +228,13 @@
 											<label class="col-xs-2 itp_lb">주소</label>
 											<div class="col-xs-10 itp_ip">
 												<div class="col-xs-1 itp_in">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ZIPNO" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
 												</div>
 												<div class="col-xs-1 itp_in">
 													<button type="button" id="ITP_FORM_OPER06010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
 												</div>
 												<div class="col-xs-4 itp_in" style="margin-right: 5px; margin-left:20px;">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
 												</div>
 												<div class="col-xs-4 itp_in">
 													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES_DTL" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">
@@ -293,9 +319,7 @@
 												<div class="col-xs-5 itp_in fnTelNo"></div>
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
-											<div class="col-xs-1 itp_ip">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="fnBrandLogo" >
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="fnBrandLogo2" >
+											<div id="ITP_OPER06010_VIEW_LOGO_FILE" class="col-xs-1 itp_ip">
 											</div>
 										</div>
 										<div class="form-group">
@@ -327,17 +351,17 @@
 											</div>
 											<label class="col-xs-2 itp_lb">PG사</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn"></div>
+												<div class="col-xs-12 itp_in fn fnPgId"></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-12 itp_in fn"></div>
+												<div class="col-xs-12 itp_in fn fnPgAfflId"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">가맹점 Key</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn"></div>
+												<div class="col-xs-12 itp_in fn fnPgKey"></div>
 											</div>
 										</div>
 									</div>

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

@@ -488,6 +488,7 @@ let viewObj = {
 		$('#ITP_FORM_OPER03010_VIEW .fnLoadAddr').text(result.addr1);
 		$('#ITP_FORM_OPER03010_VIEW .fnDtlAddr').text(result.addr2);
 
+		pageObj.fileUpload();
 		itp_fn_attach_file.view('ITP_OPER03010_VIEW_LOGO_FILE', result.fileLogNoList
 			, 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
 
@@ -602,11 +603,6 @@ let createObj = {
 
 			if (itp_fn_form_event.isValid(formId)) {
 
-				if($('#ITP_FORM_OPER03010_DETAIL_CMPY_ZIPNO').val() === '' || $('#ITP_FORM_OPER03010_DETAIL_CMPY_ADRES').val() === '') {
-					itp_fn_modal_alert('주소 검색을 통해 회사 주소를 입력하세요.');
-					return;
-				}
-
 				if (ITP_FORM_OPER03010_DETAIL_IS_DUPLICATE) {
 					itp_fn_modal_duplicate('회사코드 중복체크를 해주세요.', formId + '_AFFL_SHOP_ID');
 				} else {

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

@@ -99,6 +99,15 @@ let pageObj = {
             $('#ITP_TAB_OPER04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
             $('#ITP_FORM_OPER04010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
             $('#ITP_FORM_OPER04010_SEARCH_TO_DT').datepicker('setDate', new Date());
+
+            itp_fn_form_event.onKeyup('#ITP_FORM_OPER04010_DETAIL');
+
+            // form alert message 주입
+            $('input[data-alert-required="ONLYCHK"]').each(function() {
+                if($(this).data('alert-msg') === 'address') {
+                    $(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
+                }
+            });
         },
         grid: function() {
             itp_fn_jqgrid_resize(OPER04010_GRID_ID, OPER04010_GRID_LIST, 'lg');
@@ -299,7 +308,7 @@ let viewObj = {
         $('#ITP_FORM_OPER04010_VIEW .fnSaleMgrId').text(result.saleMgrId);
         $('#ITP_FORM_OPER04010_VIEW .fnSaleMgrNm').text(result.saleMgrNm);
         $('#ITP_FORM_OPER04010_VIEW .fnSaleType').text(result.saleTypeNm);
-        $('#ITP_FORM_OPER04010_VIEW .fnStCd').text(result.stCd);
+        $('#ITP_FORM_OPER04010_VIEW .fnStCd').text(result.stNm);
         $('#ITP_FORM_OPER04010_VIEW .fnTelNo').text(result.rprstTelNo);
         $('#ITP_FORM_OPER04010_VIEW .fnFaxNo').text(result.rprstFaxNo);
         $('#ITP_FORM_OPER04010_VIEW .fnEmail').text(result.rprstEmal);
@@ -335,8 +344,9 @@ let modifyObj = {
         console.log(result);
         pageObj.switchScreen('MODIFY');
         $('#ITP_FORM_OPER04010_DETAIL #ITP_FORM_OPER04010_DETAIL_VIEW_CD').val('U');
-
         $('#ITP_FORM_OPER04010_DETAIL #ITP_FORM_OPER04010_DETAIL_SALE_MGR_ID').val(result.saleMgrId);
+
+        $('#ITP_FORM_OPER04010_DETAIL .fnSaleMgrId').text(result.saleMgrId);
         $('#ITP_FORM_OPER04010_DETAIL #ITP_FORM_OPER04010_DETAIL_SALE_MGR_NM').val(result.saleMgrNm);
         $('#ITP_FORM_OPER04010_DETAIL #ITP_FORM_OPER04010_DETAIL_SALES_TYPE_CD').val(result.saleType);
         $('#ITP_FORM_OPER04010_DETAIL #ITP_FORM_OPER04010_DETAIL_USE_STAT_CD').val(result.stCd);
@@ -406,27 +416,10 @@ let createObj = {
         },
         save: function() {
             const formId = '#ITP_FORM_OPER04010_DETAIL';
+            itp_fn_form_event.removeChar('#ITP_FORM_OPER04010_DETAIL');
             itp_fn_form_clear_validate(null, formId);
-            var vali_salesUserId = itp_fn_form_validate(formId, formId + '_SALE_MGR_ID', ['empty'], undefined);
-            var vali_salesTypeCd = itp_fn_form_validate(formId, formId + '_SALES_TYPE_CD', ['empty'], undefined);
-            var vali_useStatCd = itp_fn_form_validate(formId, formId + '_USE_STAT_CD', ['empty'], undefined);
-            var vali_salesUserNm = itp_fn_form_validate(formId, formId + '_SALE_MGR_NM', ['empty'], undefined);
-            var vali_telNo = itp_fn_form_validate(formId, formId + '_TEL_NO', ['empty'], undefined);
-            var vali_email = itp_fn_form_validate(formId, formId + 'EMAIL', ['empty'], undefined);
-
-            var vali_userPw = true;
-            var vali_userPwConfirm = true;
-            if($('#ITP_FORM_OPER04010_DETAIL_VIEW_CD').val() == 'C') { // 신규
-                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_salesUserId && vali_salesTypeCd && vali_useStatCd && vali_salesUserNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
-
-                if($('#ITP_FORM_OPER04010_DETAIL_ZIPNO').val() == '' || $('#ITP_FORM_OPER04010_DETAIL_ADRES').val() == '') {
-                    itp_fn_modal_alert('주소 검색을 통해 회사 주소를 입력하세요.');
-                    return;
-                }
+            if (itp_fn_form_event.isValid(formId)) {
 
                 if (ITP_FORM_OPER04010_DETAIL_IS_DUPLICATE) {
                     itp_fn_modal_duplicate('영업담당자 ID 중복체크를 해주세요.', formId + '_SALES_USER_ID');

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

@@ -36,9 +36,10 @@ const OPER06010_DETAIL_GRID_PAGER = '#ITP_OPER06010_DETAIL_jqGridPager';
 const OPER06010_DETAIL_GRID_EMPTY = '#ITP_OPER06010_DETAIL_jqGridEmpty';
 
 /*API URL*/
-let API_DETAIL_GRID_LIST = '/api/brand/detail-grid-list';
-let API_DETAIL_INFO = '/api/brand/info-brand';
-let API_DETAIL_SAVE = '/api/brand/save-brand';
+let API_DETAIL_GRID_LIST    = '/api/brand/detail-grid-list';
+let API_DETAIL_INFO         = '/api/brand/info-brand';
+let API_DETAIL_SAVE         = '/api/brand/save-brand';
+let BRAND_POP_GRID_LIST 	= '/api/brand/pop-grid-list';
 
 let ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
 
@@ -102,7 +103,6 @@ let pageObj = {
     init: function () {
         this.ui.init();
         this.event.init();
-        this.fileUpload();
     },
     ui: {
         init: function () {
@@ -120,6 +120,15 @@ let pageObj = {
                     fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
                 }
             });
+
+            itp_fn_form_event.onKeyup('#ITP_FORM_OPER06010_DETAIL');
+
+            // form alert message 주입
+            $('input[data-alert-required="ONLYCHK"]').each(function() {
+                if($(this).data('alert-msg') === 'address') {
+                    $(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
+                }
+            });
         },
         grid: function() {
             itp_fn_jqgrid_resize(OPER06010_GRID_ID, OPER06010_GRID_LIST, 'lg');
@@ -160,13 +169,17 @@ let pageObj = {
         //파일업로드(수정화면)
         var id = 'OPER06010';
         $('#ITP_' + id + '_DETAIL_UPLOAD').empty();
+        $('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
+        var removeFn = (param) => {
+            $('#ITP_' + id + '_DETAIL_LOGO_FILE').empty();
+        };
         const fileArgs = {
             'fileNo': $('#ITP_FORM_' + id + '_DETAIL_FILE_NO').val(),
             'viewCd': $('#ITP_FORM_' + id + '_DETAIL_VIEW_CD').val(),
             'showYn': $('#ITP_' + id + '_DETAIL_UPLOAD').attr('data-show-yn'),
             'fileId': '#ITP_FORM_' + id + '_DETAIL_FILE_NO' //파일번호를 서버에서 받아서 넣을 파일번호 인풋박스 아이디
         };
-        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'notice', true, false, id, fileArgs);
+        itp_fn_set_file_upload('ITP_' + id + '_DETAIL_UPLOAD', 'brand', true, false, id, fileArgs, removeFn);
     },
     switchScreen: function(mode) {
         $('.itp_det_head').find('button[id^="ITP_BTN_OPER06010_"]').each(function(i) {
@@ -200,6 +213,8 @@ let pageObj = {
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').hide();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').show();
 
+            $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(fn_make_user_info.get('afflShopId'));
+
             $('.fnBrandId').text('(자동부여)');
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
@@ -217,8 +232,6 @@ let pageObj = {
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
 			
 			$('#ITP_BTN_OPER06010_RESET_PW').show();
-
-
         } else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_OPER06010_VIEW_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_MODIFY', '#ITP_BTN_OPER06010_CANCELLIST']);
@@ -229,6 +242,7 @@ let pageObj = {
 /*목록화면 Object*/
 let listObj = {
     init: function () {
+        afflShopObj.init();
         this.grid.init();
     },
     itp_OPER06010_param: {},
@@ -239,6 +253,7 @@ let listObj = {
             let param = $('#ITP_FORM_OPER06010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
+            console.log(JSON.stringify(param));
             $(OPER06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         },
         create: function() {
@@ -349,6 +364,8 @@ let viewObj = {
         $('#ITP_FORM_OPER06010_VIEW .fnEmalAddr').text(result.emalAddr);
         $('#ITP_FORM_OPER06010_VIEW .fnDpstBnkCd').text(result.bnkCdNm);
         $('#ITP_FORM_OPER06010_VIEW .fnRcvAcctNo').text(result.acctNo);
+        $('#ITP_FORM_OPER06010_VIEW .fnBnkCd').text(result.bnkCdNm);
+        $('#ITP_FORM_OPER06010_VIEW .fnAcctNo').text(result.acctNo);
         $('#ITP_FORM_OPER06010_VIEW .fnOwacNm').text(result.owacNm);
         $('#ITP_FORM_OPER06010_VIEW .fnZipNo').text(result.zipNo);
         $('#ITP_FORM_OPER06010_VIEW .fnLoadAddr').text(result.addr1);
@@ -359,6 +376,14 @@ let viewObj = {
         $('#ITP_FORM_OPER06010_VIEW .fnChgDt').text(result.sysChgDttm);
         // $('#ITP_FORM_OPER06010_VIEW .fnBrandLogo').text(result.lastLoginDt);
 
+        $('#ITP_FORM_OPER06010_VIEW .fnPgId').text(result.pgId);
+        $('#ITP_FORM_OPER06010_VIEW .fnPgAfflId').text(result.pgAfflId);
+        $('#ITP_FORM_OPER06010_VIEW .fnPgKey').text(result.pgKey);
+
+        pageObj.fileUpload();
+        itp_fn_attach_file.view('ITP_OPER06010_VIEW_LOGO_FILE', result.fileLogNoList
+            , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
+
         let locate = result.addr1 + ' ' + result.addr2;
         kakaoMap.init('ITP_FORM_OPER06010_VIEW', locate);
 
@@ -403,11 +428,19 @@ let modifyObj = {
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_OWAC_NM').val(result.owacNm);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ZIPNO').val(result.zipNo);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ADRES').val(result.addr1);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER03010_DETAIL_ADRES_DTL').val(result.addr2);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ADRES_DTL').val(result.addr2);
+
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_ID').val(result.pgId);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID').val(result.pgAfflId);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_PG_KEY').val(result.pgKey);
 
         $('#ITP_FORM_OPER06010_DETAIL .fnAddDt').text(result.sysRegDttm);
         $('#ITP_FORM_OPER06010_DETAIL .fnChgDt').text(result.sysChgDttm);
 
+        pageObj.fileUpload();
+        itp_fn_attach_file.view('ITP_OPER03010_DETAI_LOGO_FILE', result.fileLogNoList
+            , 'form-control itp_input', 'border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;');
+
         let locate = result.addr1 + ' ' + result.addr2;
         kakaoMap.init('ITP_FORM_OPER06010_DETAIL', locate);
 
@@ -438,11 +471,12 @@ let createObj = {
         },
         save: function() {
             const formId = '#ITP_FORM_OPER06010_DETAIL';
+            itp_fn_form_event.removeChar('#ITP_FORM_OPER06010_DETAIL');
             itp_fn_form_clear_validate(null, formId);
 
-            if (createObj.isValid(formId)) {
+            if (itp_fn_form_event.isValid(formId)) {
                 let param = $(formId).serializeObject();
-                // console.log(JSON.stringify(param));
+                console.log(JSON.stringify(param));
 
                 var searhFn = function() {
                     ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
@@ -464,16 +498,63 @@ let createObj = {
             }
         };
         fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
+    }
+};
+
+/*가맹점 Object*/
+let afflShopObj = {
+    init: function () {
+        this.action();
+        if(fn_make_user_info.get('authTpCd') === '30') {
+            this.afflInfo.setAfflShop();
+        }
     },
-    isValid: function(formId) {
-        var isValid = false;
-        $(formId).find('input, select, checkbox, textarea').each(function(k) {
-            if($(this).data('check-required')) {
-                var arry = $(this).data('check-required').split(',');
-                isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
-                if(!isValid) return false;
-            }
+    action: function () {
+        var _this = this;
+        // 가맹점 조회 버튼 클릭
+        $('#ITP_BTN_OPER06010_SEARCH_AFFL_SHOP').one('click', function() {
+            _this.popup('L');
+        });
+        // 가맹점 텍스트 삭제 버튼 클릭
+        $('#ITP_BTN_OPER06010_DELETE_AFFL_SHOP').one('click', function() {
+            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val('');
+            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val('');
+            $('select#ITP_FORM_OPER06010_SEARCH_BRAND_ID option').remove();
         });
-        return isValid;
+    },
+    afflInfo: {
+        setAfflShop: function() {
+            var _this = this;
+            this.afflShopId 	= fn_make_user_info.get('afflShopId');
+            this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
+            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val(_this.afflShopId);
+            $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val(_this.afflShopNm);
+            $('#ITP_BTN_OPER06010_SEARCH_AFFL_SHOP').attr('disabled', true);
+            $('#ITP_BTN_OPER06010_DELETE_AFFL_SHOP').attr('disabled', true);
+
+            var callbackFn = (result) => {
+                var brandList = [];
+                $.each(result.gridRows, function(i, item) {
+                    brandList.push({'brandId': item.brandId, 'brandNm': item.brandNm});
+                });
+                fn_make_select_brand(brandList, 'ITP_FORM_OPER06010_SEARCH_BRAND_ID', true, '선택');
+            };
+            var param = {'afflShopId': _this.afflShopId};
+            fn_ajax_call(BRAND_POP_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
+        }
+    },
+    popup: function (view) {
+        // 팝업
+        var popFn = function(rowDataPop) {
+            // console.log(rowDataPop);
+            if(rowDataPop.AFFL_SHOP) {
+                $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+                $('#ITP_FORM_OPER06010_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+            }
+            if(rowDataPop.AFFL_BRAND) {
+                fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_OPER06010_SEARCH_BRAND_ID', true, '선택');
+            }
+        };
+        fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
     }
 };