Merge branch 'develop' into bin2107

src/main/webapp/WEB-INF/views/marketing/ReviewForm.html

@@ -148,21 +148,18 @@
 		},
 		{
 			headerName: "상품평번호", field: "reviewSq", width: 90, cellClass: 'text-center',
+			cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }
+		},
+		{
+			headerName: "상품평유형", field: "reviewGb", width: 90, cellClass: 'text-center',
 			cellRenderer: function(params) {
-				return '<a href="javascript:void(0);" onclick="fnOpenReviewPopup(' + params.value + ');">' + (params.value == 'R' ? '일반' : '포토/영상') + '</a>';
+				return params.value == 'R' ? '일반' : '포토/영상';
 			}
 		},
-		{headerName: "상품평유형", field: "reviewGb", width: 90, cellClass: 'text-center'},
 		{
 			headerName: "주문상품", cellClass: 'text-center',
 			children: [
-				{
-					headerName: '주문번호', field: 'ordNo', width: 90, cellClass: 'text-center',
-					cellRenderer: function(params) {
-						if (gagajf.isNull(params.value)) return '';
-						return '<a href="javascript:void(0);">' + params.value + '</a>';
-					}
-				},
+				{headerName: '주문번호', field: 'ordNo', width: 90, cellClass: 'text-center', cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }},
 				{headerName: '주문상세번호', field: 'ordDtlNo', width: 120, cellClass: 'text-center', hide: true},
 				{headerName: "브랜드명", field: "brandKnm", width: 130, cellClass: 'text-center'},
 				{
@@ -174,7 +171,13 @@
 				{headerName: "상품코드", field: "goodsCd", width: 120, cellClass: 'text-center', cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }},
 				{headerName: "상품명", field: "goodsNm", width: 240, cellClass: 'text-center'},
 				{headerName: '회원번호', field: 'custNo', width: 100, cellClass: 'text-center', hide: true},
-				{headerName: '주문자명', field: 'orderNm', width: 100, cellClass: 'text-center', cellRenderer: function(params) { return '<a href="javascript:void(0);">' + params.value + '</a>'; }}
+				{
+					headerName: '주문자명', field: 'custNm', width: 100, cellClass: 'text-center',
+					cellRenderer: function(params) {
+						if (gagajf.isNull(params.value)) return '';
+						return '<a href="javascript:void(0);">' + params.value + '</a>';
+					}
+				}
 			]
 		},
 		{headerName: "상품평 제목", field: "reviewTitle", width: 200, cellClass: 'text-center', hide: true},
@@ -231,6 +234,25 @@
 	gridOptions.rowSelection = 'multiple';
 	gridOptions.rowHeight = 60; // 이미지가 있을경우 높이 지정해야함.
 	
+	// 셀 클릭 이벤트
+	gridOptions.onCellClicked = function(event) {
+		if (event.colDef.field == 'reviewSq') {
+			// 상품평 상세
+			alert('작업해야 함.');
+			return;
+			cfnOpenReviewDetailPopup(event.data.reviewSq);
+		} else if (event.colDef.field == 'ordNo') {
+			// 주문 상세
+			cfnOpenOrderDetailPopup(event.data.ordNo);
+		} else if (event.colDef.field == 'goodsCd') {
+			// 상품 상세
+			cfnOpenGoodsDetailPopup('U', event.data.goodsCd);
+		} else if (event.colDef.field == 'custNm') {
+			// 고객 상세
+			cfnOpenCustDetailPopup(event.data.custNo);
+		}
+	}
+	
 	// 조회
 	$('#btnSearch').on('click', function() {
 		gagaPaging.init('searchForm', fnSearchCallBack, 'pagination', $('#searchForm input[name=pageSize]').val());
@@ -285,12 +307,6 @@
 		});
 	});
 	
-	// 상품평 상세 팝업
-	var fnOpenReviewPopup = function(reviewSq) {
-		var actionUrl = "/marketing/review/detail/" + reviewSq;
-		cfnOpenModalPopup(actionUrl, "popupReviewDetail");
-	}
-	
 	$(document).ready(function() {
 		cfnCreateCalendar('#terms', 'startDt', 'endDt', true, '등록');
 		$('.btnToday').trigger('click');