브랜드 오류 수정

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

@@ -113,8 +113,7 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_info">
-										<div class="itp_form_in">
+									<!-- <div class="itp_form_in">
 											<div class="form-group">
 												<label class="col-xs-2 itp_lb">대표자명</label>
 												<div class="col-xs-10 itp_ip">
@@ -126,7 +125,7 @@
 												</div>
 											</div>
 										</div>
-									</div>
+									</div> -->
 									<!--<div class="itp_form_info">
 										<div class="itp_form_in">
 											<div class="form-group">
@@ -203,7 +202,7 @@
 											<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_PG_ID" data-select-code="PG_ID" data-check-required="empty" class="form-control itp_input" name="pgId">
+													<select id="ITP_FORM_OPER06010_DETAIL_PG_ID" data-select-code="PG_ID" class="form-control itp_input" name="pgId">
 													</select>
 												</div>
 											</div>
@@ -215,7 +214,7 @@
 												<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_PG_AFFL_ID" data-check-required="empty" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
+														<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
 													</div>
 												</div>
 												<label class="col-xs-2 itp_lb">PG 가맹점 Key</label>
@@ -225,7 +224,7 @@
 													</div>
 												</div>
 											</div>
-										</div>
+										</div>		
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">

bin/src/main/webapp/app/popup/biz/BIZPOP_STTL_REJECT_REASON.html

@@ -0,0 +1,32 @@
+<div id="ITP_BIZPOP_STTL_REJECT_REASON" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<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 itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_STTL_REJECT_REASON_POPUP">
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">반려사유</label>
+									<div class="col-xs-10 itp_ip">
+									<input type="text" id="ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN" class="form-control itp_input" name="sttlRjctRsn" />
+									</div>									
+								</div>								
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" id="ITP_BTN_STTL_REJECT_REASON_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				<button type="button" id="ITP_BTN_STTL_REJECT_REASON_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
+			</div>
+		</div>
+	</div>
+
+	<div id="ITP_POPUP_JS"></div>
+</div>

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

@@ -218,13 +218,11 @@ let pageObj = {
 			$('#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'));
+            $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 
             $('.fnBrandId').text('(자동부여)');
             
-//            $("#ITP_FORM_OPER06010_DETAIL_PG_ID option:eq(0)").prop("selected", true) {
-//                $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
-//            };
-            
+            //pg사아이디 선택시 보이게함
             $('#ITP_FORM_OPER06010_DETAIL_PG_ID').on('change', function() {
             	if($(this).val() === '') {
                 	$('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
@@ -232,16 +230,10 @@ let pageObj = {
                     $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
             	}
             });
-//            $pgid = $("ITP_FORM_OPER06010_DETAIL_PG_ID")
-//            if($pgid.first(select).selected == true) {
-//                $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
-//            }else {
-//            	$('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
-//            };
 			
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
-            fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE', '#ITP_BTN_OPER06010_RESET_PW']);
+            fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE']);
 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_ID').attr('readonly', true);
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').attr('readonly', true);
@@ -253,8 +245,8 @@ let pageObj = {
             $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').hide();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').show();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
-			
-			$('#ITP_BTN_OPER06010_RESET_PW').show();
+
+            $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
         } else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_OPER06010_VIEW_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_MODIFY', '#ITP_BTN_OPER06010_CANCELLIST']);
@@ -280,6 +272,10 @@ let listObj = {
             $(OPER06010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         },
         create: function() {
+            if($('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val() === '') {
+                itp_fn_modal_alert('가맹점 정보가 존재하지 않습니다.');
+                return;
+            }
             pageObj.switchScreen('ADD');
             itp_fn_form_clear_validate(null, '#ITP_FORM_OPER06010_DETAIL');
             // 권한정보 리스트 조회
@@ -551,6 +547,7 @@ let afflShopObj = {
             var _this = this;
             this.afflShopId 	= fn_make_user_info.get('afflShopId');
             this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
+            $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(_this.afflShopId);
             $('#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);

bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_STTL_REJECT_REASON.js

@@ -0,0 +1,53 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+var popPageObj = {
+	init: function () {
+		this.button();
+		this.change();
+	},
+	parentPopFn: null,
+	args: null,
+	returnType: null,
+	button: function() {
+		$('#ITP_BTN_STTL_REJECT_REASON_CLOSE_POP').on('click', function () {
+			$('#ITP_BIZPOP_STTL_REJECT_REASON').modal('hide'); // 팝업닫기
+		});
+		$('#ITP_BTN_STTL_REJECT_REASON_CONFIRM_POP').on('click', function () {
+			popPageObj.fnRjctRsnConfirm();
+		});
+	}, 
+	change: function() {
+	}, 	
+	fnRjctRsnConfirm: function() {
+		const formId = '#ITP_FORM_STTL_REJECT_REASON_POPUP';
+		itp_fn_form_clear_validate(null, formId);
+		
+		var vali_sttlRjctRsn = itp_fn_form_validate(formId, formId + '_STTL_RJCT_RSN', ['empty'], undefined);
+		
+		if (vali_sttlRjctRsn) {		
+			var sttlRjctRsn = $('#ITP_FORM_STTL_REJECT_REASON_POPUP_STTL_RJCT_RSN').val();	
+			
+			popPageObj.parentPopFn(sttlRjctRsn);
+			$('#ITP_BIZPOP_STTL_REJECT_REASON').modal('hide'); // 팝업닫기
+		}
+	} 
+};
+
+function itp_fn_BIZPOP_STTL_REJECT_REASON(parentPopFn, args, returnType) {
+	$('#ITP_BIZPOP_STTL_REJECT_REASON').one('shown.bs.modal', function(e) {
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_STTL_REJECT_REASON').remove();
+	}).modal('show');
+
+	popPageObj.parentPopFn = parentPopFn;
+	popPageObj.args = args;
+	popPageObj.returnType = returnType;
+	popPageObj.init();
+}

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

@@ -113,8 +113,7 @@
 											</div>
 										</div>
 									</div>
-									<div>
-										<div class="itp_form_in">
+									<!-- <div class="itp_form_in">
 											<div class="form-group">
 												<label class="col-xs-2 itp_lb">대표자명</label>
 												<div class="col-xs-10 itp_ip">
@@ -126,7 +125,7 @@
 												</div>
 											</div>
 										</div>
-									</div>
+									</div> -->
 									<!--<div class="itp_form_info">
 										<div class="itp_form_in">
 											<div class="form-group">
@@ -215,13 +214,8 @@
 												<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_PG_AFFL_ID" data-check-required="empty" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
+														<input type="text" id="ITP_FORM_OPER06010_DETAIL_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
 													</div>
-										<div class="form-group">
-											<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_PG_AFFL_ID" class="form-control itp_input" name="pgAfflId" value="" placeholder="PG 가맹점 id">
 												</div>
 												<label class="col-xs-2 itp_lb">PG 가맹점 Key</label>
 												<div class="col-xs-4 itp_ip">
@@ -230,7 +224,7 @@
 													</div>
 												</div>
 											</div>
-										</div>
+										</div>		
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">

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

@@ -222,10 +222,7 @@ let pageObj = {
 
             $('.fnBrandId').text('(자동부여)');
             
-//            $("#ITP_FORM_OPER06010_DETAIL_PG_ID option:eq(0)").prop("selected", true) {
-//                $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
-//            };
-            
+            //pg사아이디 선택시 보이게함
             $('#ITP_FORM_OPER06010_DETAIL_PG_ID').on('change', function() {
             	if($(this).val() === '') {
                 	$('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
@@ -233,12 +230,6 @@ let pageObj = {
                     $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
             	}
             });
-//            $pgid = $("ITP_FORM_OPER06010_DETAIL_PG_ID")
-//            if($pgid.first(select).selected == true) {
-//                $('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').hide();
-//            }else {
-//            	$('#ITP_FORM_OPER06010_DETAIL .itp_form_pg').show();
-//            };
 			
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();