주문상세수정

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

@@ -83,14 +83,16 @@
 				<!-- //TABLE -->
 									
 				<h4>주문상품정보</h4>
-				<button type="button" class="btn btnRight btn-base btn-sm off" id="btnExchange" style="margin-left:10px;" >교환요청</button>
-				<button type="button" class="btn btnRight btn-base btn-sm off" id="btnReturn">반품요청</button>
-				<button type="button" class="btn btnRight btn-base btn-sm off" id="btnCancel">취소요청</button>
+				<!-- <button type="button" class="btn btnRight btn-base btn-sm off" id="btnExchange" style="margin-left:10px;" >교환요청</button> -->
+				<!-- <button type="button" class="btn btnRight btn-base btn-sm off" id="btnReturn">반품요청</button> -->
+				<!-- <button type="button" class="btn btnRight btn-base btn-sm off" id="btnCancel">취소요청</button> -->
 				<div id="gridOrderGoodsInfo" style="width:100%; height:200px;" class="ag-theme-balham"></div>
 				
-				<h4>주문사은품정보</h4>
-				<button type="button" class="btn btnRight btn-base btn-sm off" id="btnFreeGiftCancel" style="margin-left:10px;" >사은품취소</button>
-				<div id="gridOrderFreeGiftInfo" style="width:100%; height:120px;" class="ag-theme-balham"></div>
+				<div id="wrapOrderFregift">
+					<h4>주문사은품정보</h4>
+					<!-- <button type="button" class="btn btnRight btn-base btn-sm off" id="btnFreeGiftCancel" style="margin-left:10px;" >사은품취소</button> -->
+					<div id="gridOrderFreeGiftInfo" style="width:100%; height:120px;" class="ag-theme-balham"></div>
+				</div>
 				
 				<h4>배송정보</h4>
 				<div id="gridDeliveryAddrInfo" style="width:100%; height:100px;" class="ag-theme-balham"></div>
@@ -175,10 +177,17 @@ var orderDeliveryAddrCnt	= [[${orderDeliveryAddrInfo.size()}]];	// 배송정보
 var orderChangeCnt 			= [[${orderChangeInfo.size()}]];		// 취소/반품/교환요청 정보
 var orderRefundCnt 			= [[${orderRefundInfo.size()}]];		// 환불정보
 
+// 2021.05.12 
+var hiddenTemp				= true;
+if (userNo == "24" || userNo == "8") {
+	hiddenTemp				= false;
+}
+
 </script>
 
 <!-- AgGrid 컬럼 세팅 -->
 <script>
+
 // 1.주문기본정보 그리드 바인딩
 // 2.상품별 상세정보
 var columnDefsGoodsInfo = [
@@ -260,14 +269,13 @@ var columnDefsGoodsInfo = [
 					return "<a href=\"javascript:void(0);\" onclick=\"fnOrderDetailChangeHst('" + params.data.ordDtlNo + "');\">" + params.value + retVal + "</a>";
 				}
 			},
-			/*
 			{
 				headerName		: "상태변경"
 				, field			: "ordDtlStatChg"
 				, width			: 120
-				, hide			: false
+				, hide			: hiddenTemp
 				, cellClass		: 'text-center'
-				, cellRenderer	: function (params) {				
+				, cellRenderer	: function (params) {
 					var strVal 		= "";
 					var strCheck	= "";
 					
@@ -293,8 +301,7 @@ var columnDefsGoodsInfo = [
 					// @ 정산정보수정
 					strVal += "<select class='ordDtlStatChg' name='ordDtlStatChg' ordDtlNo='"+params.data.ordDtlNo+"' ordNo='"+params.data.ordNo+"' onChange='fnChangOrdDtlStat(this);'>";
 					strVal += "	<option value=''>선택</option>";
-					
-					/*
+
 					if (!gagajf.isNull(params.data.g20)) {
 						strVal += "	<option value='G013_20'>결제완료</option>";
 					}
@@ -313,8 +320,7 @@ var columnDefsGoodsInfo = [
 					if (!gagajf.isNull(params.data.g60)) {
 						strVal += "	<option value='G013_60'>배송완료</option>";
 					}
-					
-					
+
 					// 2021.04.30 상태값 임시 기능
 					strVal += "	<option value='G013_20'>결제완료</option>";
 					strVal += "	<option value='G013_30'>상품준비중</option>";
@@ -326,7 +332,6 @@ var columnDefsGoodsInfo = [
 					return strVal;
 				}
 			}
-			*/
 		]
 	},
 	{
@@ -689,14 +694,11 @@ var columnDefsOrderChangeInfo = [
 			return  rtnStr;
 		}
 	},
-	/*{headerName: "요청구분"		, field: "chgGbNm"		, width: 100	, cellClass: 'text-center'},*/
 	{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"		, width: 100	, cellClass: 'text-center'},
-	//{headerName: "옵션1"			, field: "optCd1"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "옵션1"			, field: "colorNm"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "수량"			, field: "chgQty"		, width: 100	, cellClass: 'text-center'},
-	/*{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},*/
 	{
 		headerName		: "요청일자"		
 		, field			: "regDt"		
@@ -959,6 +961,11 @@ $(document).ready(function () {
 	fnSetGridHeightInit();
 	
 	// 4. 그리드 숨김 처리
+	
+	if (orderFreeGiftInfo == null || orderFreeGiftInfo.length === 0) {
+		$("#wrapOrderFregift").addClass("off");
+	}
+	
 	if (orderChangeInfo == null || orderChangeInfo.length === 0) {
 		$("#wrapOrderChange").addClass("off");
 	}
@@ -967,6 +974,8 @@ $(document).ready(function () {
 		$("#wrapRefund").addClass("off");
 	}
 	
+	// 
+	
 	// 5. 버튼처리
 	// G013_00	주문접수
 	// G013_10	입금대기
@@ -1023,11 +1032,11 @@ $(document).ready(function () {
 
 $(document).ready(function () {
 	// 2021.05.11 그리드 높이정보 수정
-	var orderGoodsHeight 			= 170 + (30 * orderGoodsCnt);
-	var orderFreeGiftHeight 		= 100 + (30 * orderFreeGiftCnt);
-	var orderDeliveryAddrHeight 	= 100 + (30 * orderDeliveryAddrCnt);
-	var orderChangeHeight 			= 100 + (30 * orderChangeCnt);
-	var orderRefundHeight 			= 100 + (30 * orderRefundCnt);
+	var orderGoodsHeight 			= 90 + (33 * orderGoodsCnt);
+	var orderFreeGiftHeight 		= 38 + (33 * orderFreeGiftCnt);
+	var orderDeliveryAddrHeight 	= 38 + (33 * orderDeliveryAddrCnt);
+	var orderChangeHeight 			= 38 + (33 * orderChangeCnt);
+	var orderRefundHeight 			= 38 + (33 * orderRefundCnt);
 	
 	$("#gridOrderGoodsInfo").css("height"		, orderGoodsHeight+"px");
 	$("#gridOrderFreeGiftInfo").css("height"	, orderFreeGiftHeight+"px");