관리자 취소기능 수정

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -203,7 +203,7 @@ var columnDefsGoodsInfo = [
 				}
 			},
 			{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center'},
-			{headerName: "브랜드"		, field: "brandEnm"		, width: 100, cellClass: 'text-center'},
+			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100, cellClass: 'text-center'},
 			{headerName: "옵션1"		, field: "colorNm"		, width: 80, cellClass: 'text-center'},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 80, cellClass: 'text-center'},
 			{

src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -381,9 +381,9 @@ var columnDefsOrderList = [
 	},
 	{headerName: "출고처", field: "delvLocNm", width: 110, cellClass: 'text-center', sortable: true, hide:true},
 	{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
-	{headerName: "브랜드"		, field: "brandEnm"		, width: 100	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
-	{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},
 	{
 		headerName		: "이미지"
 		, field			: "sysImgNm"

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -1333,6 +1333,10 @@ $(document).ready(function() {
 	
 	// 7. 환불예상금액계산
 	fnCalculateRefundAmt(null);
+	
+	// 2021.05.13 높이자동조절
+	var cancelRequestTargetHeight = 50 + (40 * cancelRequestTargetCnt);
+	$("#gridOrderCancelRequestList").css("height" , cancelRequestTargetHeight+"px");
 });
 </script>
 </html>