Merged PR 69: 1. 옵션1 표기 형식 변경

1. 옵션1 표기 형식 변경
2. 팝업크기조정

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

@@ -947,7 +947,12 @@
 			mcxDialog.alert("행사 기간은 1년을 초과 할 수 없습니다.");
 			return false;
 		}
-
+		
+		if (!$("#extmallYn").is(":checked") && !$("#selfYn").is(":checked")) {
+			mcxDialog.alert("적용몰을 선택해주세요.");
+			return false;
+		}
+		
 		if ($("#extmallYn").is(":checked") && extmallCnt < 1) {
 			mcxDialog.alert("제휴몰을 선택해주세요.");
 			return false;

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

@@ -13,7 +13,7 @@
  * 1.0  2020.12.12   jsh77b       최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1400" data-height="600">
+<div class="modalPopup" data-width="1800" data-height="900">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>취소요청</h2>
@@ -331,7 +331,10 @@ var columnCancelReqList = [
 		},
 		hide: temp2
 	},
-	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 80		, cellClass: 'text-center'	, hide: temp2
+		, cellRenderer	: function (params) {
+		 return  params.data.colorNm + "[" + params.data.optCd1 +"]" ;
+	}},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 80		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"

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

@@ -13,7 +13,7 @@
  * 1.0  2021.01.15   card007     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1400" data-height="600">
+<div class="modalPopup" data-width="1800" data-height="900">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>교환요청</h2>
@@ -245,6 +245,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 var cancelRequestTargetList = [[${cancelRequestTargetList}]];				// 교환대상목록
+var cancelRequestTargetCnt 	= [[${cancelRequestTargetList.size()}]];		// 교환대상건수
 var ordNo 					= [[${ordNo}]];									// 주문번호
 var ordChgSq 				= [[${ordChgSq}]];								// 주문변경번호
 var chgStat					= [[${chgStat}]];								// 변경상태
@@ -319,7 +320,11 @@ var columnExchangeReqList = [
 			{headerName: "단품코드"		, field: "itemCd"			, width: 100	, cellClass: 'text-center'},
 			{headerName: "SKUCODE"		, field: "optCd"			, width: 100	, cellClass: 'text-center'},
 			{headerName: "단품명"			, field: "itemNm"			, width: 130	, cellClass: 'text-center'},
-			{headerName: "옵션1"			, field: "optCd1"			, width: 60		, cellClass: 'text-center'},
+			{headerName: "옵션1"			, field: "optCd1"			, width: 60		, cellClass: 'text-center',
+				cellRenderer	: function (params) {
+					 return  params.data.colorNm + "[" + params.data.optCd1 +"]" ;
+					}
+			},
 			{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'},
 			{
 				headerName		: "단품수량"
@@ -1594,6 +1599,8 @@ $(document).ready(function() {
 		$('#chgerButton').css('display', 'none');						// 회수지 수정 버튼
 		$('#recipButton').css('display', 'none');						// 교환지 수정 버튼
 	}
+	var cancelRequestTargetHeight = 80 + (40 * cancelRequestTargetCnt);
+	$("#gridOrderCancelRequestList").css("height" , cancelRequestTargetHeight+"px");
 	
 	// 글자수 제한 byte 표기
 	cfnGetTextLength($('#chgMemo'), 1000, $('#chgMemoCount'));
@@ -1603,7 +1610,7 @@ $(document).ready(function() {
 	// 수량체크
 	fnChangeQty();
 	
-	if (orderChangeDetailList != null) {
+	if ( orderChangeDetailList != null && orderChangeDetailList.length > 0) {
 		$('#exchRequestRegNm').text(orderChangeDetailList[0].regNm);
 		$('#exchRequestUpdNm').text(orderChangeDetailList[0].updNm);
 	}

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

@@ -14,7 +14,7 @@
  *******************************************************************************
  -->
  
-<div class="modalPopup" data-width="1500" data-height="700"> <!-- data-width="1500" data-height="870" -->
+<div class="modalPopup" data-width="1800" data-height="900"> <!-- data-width="1500" data-height="870" -->
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>주문상세내역</h2>
@@ -313,7 +313,11 @@ var columnDefsGoodsInfo = [
 			},
 			{ headerName: "배송구분"	, field: "shotDelvGb"	, width: 80, cellClass: 'text-center' },
 			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
-			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
+			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'
+				, cellRenderer	: function (params) {
+					 return  params.data.colorNm + "[" + params.data.optCd1 +"]" ;
+				}
+			},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},
 			{headerName: "주문상태"	, field: "ordDtlStat"	, width: 100, cellClass: 'text-center', hide: true},
 			{

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

@@ -13,7 +13,7 @@
  * 1.0  2020.12.12   jsh77b       최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1400" data-height="600">
+<div class="modalPopup" data-width="1800" data-height="900">
 	<div class="panelStyle">
 		<div class="panelTitle">
 			<h2>반품요청</h2>
@@ -352,7 +352,11 @@ var columnCancelReqList = [
 		},
 		hide: temp2
 	},
-	{headerName: "옵션1"			, field: "colorNm"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
+	{headerName: "옵션1"			, field: "colorNm"			, width: 60		, cellClass: 'text-center'	, hide: temp2,
+		cellRenderer	: function (params) {
+			 return  params.data.colorNm + "[" + params.data.optCd1 +"]";
+			}
+	},
 	{headerName: "옵션2"			, field: "optCd2"			, width: 60		, cellClass: 'text-center'	, hide: temp2},
 	{
 		headerName		: "옵션금액"