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

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

@@ -119,13 +119,13 @@
 											<label class="col-xs-2 itp_lb">가맹점 구분</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<select id="ITP_FORM_OPER03010_DETAIL_" class="form-control itp_input" name=""></select>
+													<select id="ITP_FORM_OPER03010_DETAIL_AUTH_TYPE" class="form-control itp_input" name=""></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-4 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_ "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >																					
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_ "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -260,8 +260,8 @@
 					<div class="itp_form itp_type1 fix">
 						<div class="col-xs-12">
 							<form id="ITP_FORM_OPER03010_VIEW" class="form-horizontal">
-								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_VIEW_CD" name="viewCd" value="C">
-								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_CMPY_LOCATION" name="cmpyLocation" value="">
+								<input type="hidden" id="ITP_FORM_OPER03010_VIEW_VIEW_CD" name="viewCd" value="R">
+								<input type="hidden" id="ITP_FORM_OPER03010_VIEW_AFFL_SHOP_ID" name="afflShopId" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">가맹점정보</h4>
@@ -303,7 +303,7 @@
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-4 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_ "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >																					
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_LOGO "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -371,30 +371,24 @@
 													<div class="col-xs-2 itp_in fnLoadAddr"></div>
 													<div class="col-xs-3 itp_in fnDtlAddr"></div>
 												</div>
-												
+
 												<!-- 주소 맵 -->
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_LOTS_ADDRESS" value="" />
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_STREET_ADDRESS" value="" />
-												<input type="hidden" name="cmpyLat" id="ITP_FORM_OPER03010_DETAIL_LAT" value="" />
-												<input type="hidden" name="cmpyLng" id="ITP_FORM_OPER03010_DETAIL_LNG" value="" />
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_HJ_DONG" value="" />
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_BJ_DONG" value="" />
-												<div id="ITP_FORM_OPER03010_DETAIL_MAP" style="width:700px; height:400px;"></div>
+												<div id="ITP_FORM_OPER03010_VIEW_MAP" style="width:700px; height:400px;"></div>
 											</div>
 										</div>
 									</div>
 								</section>								
 							</form>
 						</div>
-					</div>	
+					</div>
 					<div class="itp_table fix">
-						<div id="ITP_OPER03010_DETAIL_jqGrid_list" class="itp_tb_list">
-							<div id="ITP_OPER03010_DETAIL_jqGridView" class="itp_views fix"></div>
-							<table id="ITP_OPER03010_DETAIL_jqGrid"></table>
-							<div id="ITP_OPER03010_DETAIL_jqGridPager"></div>
-							<div id="ITP_OPER03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
+						<div id="ITP_OPER03010_VIEW_jqGrid_list" class="itp_tb_list">
+							<div id="ITP_OPER03010_VIEW_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_OPER03010_VIEW_jqGrid"></table>
+							<div id="ITP_OPER03010_VIEW_jqGridPager"></div>
+							<div id="ITP_OPER03010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 						</div>
-					</div>				
+					</div>
 				</div>
 			</div>
 		</article>

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

@@ -1675,7 +1675,7 @@ function itp_fn_grid_make_local(option) {
 		multiselect: false,
 		rownumbers: true
 	}, option);
-	$(OPER03010_VIEW_GRID_ID).jqGrid({
+	$(option.gridId).jqGrid({
 		colModel: options.colModel,
 		data: options.data,
 		datatype: 'local',

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

@@ -262,7 +262,7 @@ let pageObj = {
 			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_SEARCH_ST_CD', true, '상태(전체)');
 			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_DETAIL_STAT_CD', true, '선택');
 			fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_OPER03010_DETAIL_TYPE_CD', true, '선택');
-			fn_make_select(CODE_LIST, 'FRCOMP_AUTH_CD', 'ITP_FORM_OPER03010_DETAIL_FRCOMP_AUTH_CD', true, '선택');
+			fn_make_select(CODE_LIST, 'FRCOMP_AUTH_CD', 'ITP_FORM_OPER03010_DETAIL_AUTH_TYPE', true, '선택');
 		},
 		ready: function () {
 			listObj.init();