취소신청화면 옵션 추가 커밋

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

@@ -261,8 +261,10 @@ var columnCnclRtnCompleteList = [
 	{headerName: "주문번호"		, field: "ordNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "주문상세"		, field: "ordDtlNo"			, width: 80		, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
+	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'},
+	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'},
 	{
 		headerName		: "주문"
 		, field			: "ordQty"

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

@@ -356,8 +356,10 @@ var columnCancelReqList = [
 	{headerName: "주문상세"		, field: "ordDtlStat"		, width: 80		, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 100	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품명"			, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
+	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"		
 		, field			: "optAddPrice"			

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

@@ -361,9 +361,9 @@ var columnCancelReqList = [
 	{headerName: "주문상세상태"	, field: "ordDtlStatNm"		, width: 100	, cellClass: 'text-center'	, hide: temp1},
 	{headerName: "상품코드"		, field: "goodsCd"			, width: 110	, cellClass: 'text-left'	, hide: temp2},
 	{headerName: "상품명"		, field: "goodsNm"			, width: 200	, cellClass: 'text-left'	, hide: temp2},
-	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80	, cellClass: 'text-center'	, hide: temp2},
-	{headerName: "옵션1"		, field: "optCd1"		, width: 60	, cellClass: 'text-center'	, hide: temp2},
-	{headerName: "옵션2"		, field: "optCd2"		, width: 60	, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "상품타입"		, field: "goodsTypeNm"		, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"
 		, field			: "optAddPrice"