운영관리-브랜드관리 수정-2

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

@@ -190,7 +190,7 @@
 											</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" style="padding:0 0 0 15px;">
 												<div class="col-xs-4 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">
@@ -223,6 +223,7 @@
 												<div class="col-xs-8 itp_in">
 													<select id="ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE" data-check-required="empty" data-select-code="SHMT_COL_PROC_TYPE" class="form-control itp_input" name="shmtColProcType">
 													</select>
+													<div class="col-xs-12 itp_in fn fnShmtColProcTypeNm"></div>
 												</div>
 											</div>
 										</div>
@@ -255,7 +256,7 @@
 									</div>
 									<div class="itp_form_in">
 										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">주소</label>
+											<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" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="address" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
@@ -342,7 +343,7 @@
 									</div>
 									<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" style="padding:0 0 0 15px;">
 												<select id="ITP_FORM_OPER06010_VIEW_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="bnkCd" style="display: none;">
 												</select>
@@ -360,13 +361,13 @@
 											</div>
 											<label class="col-xs-2 itp_lb">배송/수거 처리구분*</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fn fnShmtColProcType"></div>
+												<div class="col-xs-12 itp_in fn fnShmtColProcTypeNm"></div>
 											</div>
 										</div>
 									</div>
 									<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-10 itp_ip">
 												<div class="col-xs-10 itp_in">
 													<div class="col-xs-a itp_in fnZipNo"></div>

src/main/webapp/app/stinfo/STINFO06010.html

@@ -84,7 +84,7 @@
 								<label>공급사단가기준</label>
 								<input id="ITP_STINFO06010_UNIT_STDD" style="width:100px;">
 								<span>%</span>
-								<button type="button" id="ITP_BTN_STINFO06010_EXCEL" class="btn btn-warning  btn-sm Excel"><i class="glyphicon "></i>일괄적용</button>
+								<button type="button" id="ITP_BTN_STINFO06010_CALCULATE" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>일괄적용</button>
 							</div>
 				          <table id="ITP_STINFO06010_DETAIL_jqGrid"></table>
 				          <div id="ITP_STINFO06010_DETAIL_jqGridPager"></div>

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

@@ -255,6 +255,9 @@ let pageObj = {
             $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').show();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').hide();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').show();
+			
+			$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').show();
+			$('#ITP_FORM_OPER06010_DETAIL .fnShmtColProcTypeNm').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'));
@@ -279,6 +282,9 @@ let pageObj = {
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_info').show();
 			$('#ITP_FORM_OPER06010_DETAIL .itp_form_change').hide();
 
+			$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_SHMT_COL_PROC_TYPE').hide();
+			$('#ITP_FORM_OPER06010_DETAIL .fnShmtColProcTypeNm').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();
@@ -432,8 +438,8 @@ let viewObj = {
 
         $('#ITP_FORM_OPER06010_VIEW .fnPgId').text(result.pgId);
         $('#ITP_FORM_OPER06010_VIEW .fnPgAfflId').text(result.pgAfflId);
-        $('#ITP_FORM_OPER06010_VIEW .fnShmtColProcType').text(result.shmtColProcTypeNm);
-
+        $('#ITP_FORM_OPER06010_VIEW .fnShmtColProcTypeNm').text(result.shmtColProcTypeNm);
+        
         pageObj.fileUpload();
         /*
         itp_fn_attach_file.view('ITP_OPER06010_VIEW_LOGO_FILE', result.fileLogNoList
@@ -523,7 +529,8 @@ let modifyObj = {
         $('#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_SHMT_COL_PROC_TYPE').val(result.shmtColProcType);
-
+        $('#ITP_FORM_OPER06010_DETAIL .fnShmtColProcTypeNm').text(result.shmtColProcTypeNm);
+        
 		$('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_OQ_BRAND_ID').val(result.oqBrandId);
 
 		$('#ITP_FORM_OPER06010_DETAIL .fnRegId').text(result.sysRegId);

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -336,7 +336,8 @@ let pageObj = {
 						case 'ITP_BTN_STINFO06010_CANCELLIST'		: listObj.grid.search(); 		break;	// 취소/목록 버튼
 						case 'ITP_BTN_STINFO06010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
 						case 'ITP_BTN_STINFO06010_EXCEL'			: pageObj.excelDown(); 			break;	// 엑셀 다운로드 버튼
-						case 'ITP_BTN_STINFO06010_DETAIL_EXCEL'			: pageObj.excelDtlDown(); 			break;	// 엑셀 다운로드 버튼
+						case 'ITP_BTN_STINFO06010_DETAIL_EXCEL'		: pageObj.excelDtlDown(); 		break;	// 엑셀 다운로드 버튼
+						case 'ITP_BTN_STINFO06010_CALCULATE'		: pageObj.calculate();			
 					}
 				});
 			});
@@ -478,7 +479,8 @@ let pageObj = {
 			$('#ITP_FORM_STINFO06010_DETAIL #ITP_FORM_STINFO06010_DETAIL_FROM_DT').datepicker('setDate', new Date());
 			$('#ITP_FORM_STINFO06010_DETAIL #ITP_FORM_STINFO06010_DETAIL_TO_DT').datepicker('setDate', itp_fn_date_add('Y', 1));
 			
-			
+			$('#ITP_BTN_STINFO06010_DETAIL_EXCEL').show();
+			$('#ITP_BTN_STINFO06010_CALCULATE').show();
 			//return itp_fn_date_format(date.setDate(-1), 2);
 		} else if(mode == 'MODIFY') { // 수정
 			$('#ITP_AJAX_STINFO06010_DETAIL_CONTAINER').show();
@@ -491,7 +493,7 @@ let pageObj = {
 			$('#ITP_BTN_STINFO06010_DETAIL_DELETE_STORE').attr('disabled', true);
 			// $('#ITP_BTN_STINFO06010_SRH').show();
 			$('#ITP_BTN_STINFO06010_DETAIL_EXCEL').show();
-
+			$('#ITP_BTN_STINFO06010_CALCULATE').show();
 			// 브랜드그룹 정보 설정
 			$('#ITP_FORM_STINFO06010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 		} else if(mode == 'VIEW') { // 보기
@@ -525,9 +527,11 @@ let pageObj = {
 			'sheetName': '매장단가상세정보'
 		};
 		itp_fn_remote_to_excel(param);
-	}
-	
-	
+	},
+	calculate: function() {
+		var rowId = $(STINFO06010_DETAIL_GRID_ID).jqGrid("getGridParam","selarrrow");
+		console.log(rowId);
+	}	
 };
 
 /*목록화면 Object*/