Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-4(회수상품정보,금액정보노출)

src/main/webapp/WEB-INF/views/business/SupplyVendorPopupForm.html

@@ -136,6 +136,14 @@
 		
 		$('#btnSearchSupplyVendor').trigger('click');
 	});
+
+	// 엔터키 처리
+	$('#searchSupplyVendorForm input[name=supplyVendorNm]').keypress(function (event) {
+		if (event.which === 13) {
+			event.preventDefault();
+			$('#btnSearchSupplyVendor').trigger('click');
+		}
+	});
 /*]]>*/
 </script>
 

src/main/webapp/WEB-INF/views/customer/CustomerActiveListForm.html

@@ -134,6 +134,9 @@
 		<!-- 리스트 영역 -->
 		<div class="panelStyle">
 			<ul class="panelBar">
+				<li>
+					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
+				</li>
 				<li class="right">
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
 					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
@@ -193,6 +196,10 @@
 			headerName: "관리대상", field:'managedRsn', width:230, cellClass: 'text-center',
 			valueGetter: function (params) { return gagaAgGrid.lookupValue(managedRsnList, params.data.managedRsn); }
 		},
+		{
+			headerName: "생년월일", field:'birthYmd', width:90, cellClass: 'text-center',
+			valueGetter: function (params) { return gagaAgGrid.toDateFormat(params.data.birthYmd); }
+		},
 		{
 			headerName: "가입일자", field:'joinDt', width:120, cellClass: 'text-center',
 			valueGetter: function (params) { return gagaAgGrid.toDateFormat(params.data.joinDt); }
@@ -321,6 +328,11 @@
 		gagaPaging.createPagination(result.pageing.pageable);
 	};
 
+	// 엑셀다운로드
+	$('#btnExcel').on('click', function() {
+		gagaAgGrid.exportToExcel('활동회원 목록', gridOptions);
+	});
+	
 	$(document).ready(function() {
 		// 공통 달력 생성
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '기간', 'X');

src/main/webapp/WEB-INF/views/customer/CustomerDormantListForm.html

@@ -83,6 +83,7 @@
 			<div class="panelStyle">
 				<ul class="panelBar">
 					<li>
+						<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
 						<button type="button" class="btn btn-danger btn-lg" id="btnRelease">휴면해제</button>
 					</li>
 					<li class="right">
@@ -265,6 +266,11 @@
 		gagaPaging.createPagination(result.pageing.pageable);
 	};
 
+	// 엑셀다운로드
+	$('#btnExcel').on('click', function() {
+		gagaAgGrid.exportToExcel('휴면회원 목록', gridOptions);
+	});
+	
 	$(document).ready(function() {
 		// 공통 달력 생성
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '기간', 'X');

src/main/webapp/WEB-INF/views/customer/CustomerSecedeListForm.html

@@ -89,6 +89,7 @@
 		<div class="panelStyle">
 			<ul class="panelBar">
 				<li>
+					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
 					<button type="button" class="btn btn-danger btn-lg" id="btnDelete">탈퇴이력삭제</button>
 				</li>
 				<li class="right">
@@ -269,6 +270,11 @@
 		gagaPaging.createPagination(result.pageing.pageable);
 	};
 
+	// 엑셀다운로드
+	$('#btnExcel').on('click', function() {
+		gagaAgGrid.exportToExcel('탈퇴회원 목록', gridOptions);
+	});
+	
 	$(document).ready(function() {
 		// 공통 달력 생성
 		cfnCreateCalendar('#terms', 'stDate', 'edDate', true, '기간', 'X');