Главная Обзор Помощь
Вход
style24
/
style24.admin
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

취소완료정보개발중

tsit14 4 лет назад
Родитель
419d6a4aa7
Сommit
7dd4d89f55
4 измененных файлов с 484 добавлено и 15 удалено
Единый вид Показать статистику Diff
  1. 34 0
      src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java
  2. 411 0
      src/main/webapp/WEB-INF/views/order/CnclCompleteView.html
  3. 1 1
      src/main/webapp/WEB-INF/views/order/CnclReqForm.html
  4. 38 14
      src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

+ 34 - 0
src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java
Просмотреть файл 

@@ -299,6 +299,40 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		return super.ok("성공");
 
 		return super.ok("성공");
 
 	}
 
 	}
 
 	
 	
+	/**
 
+	 * 취소완료 상세 화면 (관리자)
 
+	 * 
+	 * @return ModelAndView
 
+	 * @author jsh77b
 
+	 * @since 2021. 06. 30
 
+	 */
 
+	@GetMapping("/cnclRtn/complete/view")
 
+	public ModelAndView cnclCompleteView(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordDtlNo") int ordDtlNo
 
+			, @RequestParam(value = "delvFeeCd") String delvFeeCd, @RequestParam(value = "delvFeeCdGrp") String delvFeeCdGrp
 
+			, @RequestParam(value = "chgStat") String chgStat, @RequestParam(value = "ordChgSq") int ordChgSq) {
 
+		
+		ModelAndView mav = new ModelAndView();
 
+		
+		// 2021.01.26 취소요청 화면, 취소요청정보확인 화면 통합
 
+		Order order = new Order();
 
+		order.setOrdChgSq(ordChgSq);
 
+		order.setOrdNo(ordNo);
 
+		
+		// 결제전취소, 결제후취소 일때 상태값 환입 취소완료 변경
 
+		if ("G685_17".equals(chgStat) || "G685_18".equals(chgStat)) {
 
+			order.setChgStat("G720_30");
 
+		}
 
+		
+		List<Order> cnclRtnCompleteList 	= coreOrderChangeService.getCnclRtnCompleteList(order);
 
+		Collection<Order> orderInfoList 	= coreOrderService.getOrderInfoList(order);
 
+		
+		mav.addObject("cnclRtnCompleteList"		, cnclRtnCompleteList);			// 취소완료목록
 
+		mav.addObject("orderInfoList"			, orderInfoList);				// 주문기본정보
 
+		mav.setViewName("order/CnclCompleteView");
 
+		
+		return mav;
 
+	}
 
+	
 	/**
 
 	/**
 
 	 * 반품신청화면 (관리자)
 
 	 * 반품신청화면 (관리자)
 
 	 * 
 	 *

+ 411 - 0
src/main/webapp/WEB-INF/views/order/CnclCompleteView.html
Просмотреть файл 

@@ -0,0 +1,411 @@
 
+<!DOCTYPE html>
 
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
 
+<!--
 
+ *******************************************************************************
 
+ * @source  : CnclCompleteView.html
 
+ * @desc    : 취소완료정보화면
 
+ *============================================================================
 
+ * STYLE24
 
+ * Copyright(C) 2019 TSIT, All rights reserved.
 
+ *============================================================================
 
+ * VER  DATE         AUTHOR      DESCRIPTION
 
+ * ===  ===========  ==========  =============================================
 
+ * 1.0  2021.06.30   jsh77b       최초 작성
 
+ *******************************************************************************
 
+ -->
 
+<div class="modalPopup" data-width="1400" data-height="600">
 
+	<div class="panelStyle">
 
+		<div class="panelTitle">
 
+			<h2>취소완료</h2>
 
+			<button type="button" class="close" onclick="uifnPopupClose('popupCancelRequestForm');"><i class="fa fa-times"></i></button>
 
+		</div>
 
+			
+		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
 
+			<form id="cancelRequestFrm" name="cancelRequestFrm">
 
+			
+				<h4 id="orderInfoTitle">취소완료정보</h4>
 
+				<div id="gridCnclRtnCompleteList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 
+
 
+				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 
+					<button type="button" class="btn btn-success" id="cnclCompleteBtn" onclick="fnCnclReq('cnclComplete');">확인</button>
 
+				</div>
 
+				
+				<table class="frmStyle">
 
+					<colgroup>
 
+						<col style="width:160px;" />
 
+						<col style="width:320px;" />
 
+						<col style="width:160px;" />
 
+						<col />
 
+					</colgroup>
 
+					<tbody>
 
+						<tr>
 
+							<th>취소사유 <i class="star"></i></th>
 
+							<td id="chgReasonNm"></td>
 
+							<th>귀책사유</th>
 
+							<td><span id="imputeReason"></span></td>
 
+						</tr>
 
+						<tr>
 
+							<th>요청메모</th>
 
+							<td colspan="3">
 
+								<textarea id="chgMemo" name="chgMemo" style="height:80px;" placeholder="취소사유를 300자내외로 작성해 주세요"></textarea>
 
+							</td>
 
+						</tr>
 
+					</tbody>
 
+				</table>
 
+				
+				<h4>환불예정금액</h4>
 
+				<table class="frmStyle">
 
+					<colgroup>
 
+						<col style="width:20%;"/>
 
+						<col style="width:30%;"/>
 
+						<col style="width:20%;"/>
 
+						<col style="width:30%;"/>
 
+					</colgroup>
 
+					<tbody>
 
+						<tr>
 
+							<th>상품 주문 금액</th>
 
+							<td><span id="spanOrdAmt"></span>원</td>
 
+							<th>상품 취소 금액</th>
 
+							<td><span id="spanCnclRtnAmt"></span>원</td>
 
+						</tr>
 
+						<tr>
 
+							<th>포인트 취소 금액</th>
 
+							<td colspan="3"><span id="spanTotPntDcAmt"></span>원 (고객 포인트 : <span id="spanPntDcAmt"></span>원 + 상품 선포인트 : <span id="spanPrePntDcAmt"></span>원) </td>
 
+						</tr>
 
+						<tr>
 
+							<th>쿠폰 취소 금액</th>
 
+							<td colspan="3"><span id="spanCpnDcAmt"></span>원 (즉시할인쿠폰 : <span id="spanCpn1DcAmt"></span>원 + 상품쿠폰 : <span id="spanGoodsCpnDcAmt"></span>원 + 장바구니쿠폰 : <span id="spanCartCpnDcAmt"></span>원 + 배송비쿠폰 : <span id="spanDelvCpnDcAmt"></span>원)</td>
 
+						</tr>
 
+						<tr>
 
+							<th>다다익선 취소 금액</th>
 
+							<td colspan="3"><span id="spanTmtbDcAmt"></span>원 (수량할인 : <span id="spanTmtb1DcAmt"></span>원 + 금액할인 : <span id="spanTmtb2DcAmt"></span>원)</td>
 
+						</tr>
 
+						<tr>
 
+							<th>상품권 취소 금액</th>
 
+							<td colspan="3"><span id="spanGfcdUseAmt"></span>원</td>
 
+						</tr>
 
+						<tr>
 
+							<th>상품 실결제 취소 금액</th>
 
+							<td><span id="spanRealCnclRtnAmt"></span>원</td>
 
+							<th>추가 배송비 금액</th>
 
+							<td><span id="spanTotDeliveryFee"></span>원 </td>
 
+						</tr>
 
+						
+						<tr>
 
+							<th>환불 예정 금액</th>
 
+							<td colspan="3"><span id="spanRefundAmt"></span>원</td>
 
+						</tr>
 
+					</tbody>
 
+				</table>
 
+				
+				<div id="refundAccount" style="width:100%">
 
+					<h4>환불계좌정보</h4>
 
+					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
 
+					
+					<!-- TABLE -->
 
+					<table class="tableStyle">
 
+						<colgroup>
 
+							<col width="">
 
+							<col width="">
 
+							<col width="">
 
+							<col width="">
 
+							<col width="">
 
+						</colgroup>
 
+						<thead>
 
+							<tr>
 
+								<th>은행명</th>
 
+								<th>은행코드</th>
 
+								<th>계좌번호</th>
 
+								<th>예금주</th>
 
+								<th>기본여부</th>
 
+							</tr>
 
+						</thead>
 
+						<tbody>
 
+							<tr style="height:30px;">
 
+								<td class="bankNm"></td>
 
+								<td class="bankCd"></td>
 
+								<td class="accountNo"></td>
 
+								<td class="accountNm"></td>
 
+								<td class="defaultYn"></td>
 
+							</tr>
 
+						</tbody>
 
+					</table>
 
+				</div>
 
+				<br>
 
+			</form>
 
+		</div>
 
+	</div>
 
+</div>
 
+
 
+<!-- data -->
 
+<script th:inline="javascript">
 
+/*<![CDATA[*/
 
+var cnclRtnCompleteList 	= [[${cnclRtnCompleteList}]];				// 취소,반품 완료 정보 목록
 
+var orderInfoList 			= [[${orderInfoList}]];						// 취소,반품 완료 정보 목록
 
+var pgGb 					= orderInfoList[0].pgGb;					// 결제수단
 
+var payMeans 				= orderInfoList[0].payMeans;				// 결제방법
 
+var addPayCost				= cnclRtnCompleteList[0].addPayCost;		// 추가배송비
 
+var realDelvAmt				= cnclRtnCompleteList[0].realDelvAmt;		// 환불배송비
 
+var delvCpnDcAmt			= cnclRtnCompleteList[0].delvCpnDcAmt;		// 배송비쿠폰환불
 
+var chgReason				= cnclRtnCompleteList[0].chgReason;			// 변경사유코드
 
+var chgReasonNm				= cnclRtnCompleteList[0].chgReasonNm;		// 변경사유코드명
 
+var chgMemo					= cnclRtnCompleteList[0].chgMemo;			// 변경사유메모
 
+var raBankNm				= cnclRtnCompleteList[0].raBankNm;			// 환불계좌은행명
 
+var raBank					= cnclRtnCompleteList[0].raBank;			// 환불계좌은행코드
 
+var raNo					= cnclRtnCompleteList[0].raNo;				// 환불계좌번호
 
+var raNm					= cnclRtnCompleteList[0].raNm;				// 환불계좌명
 
+
 
+// 1. 취솨,반품완료 정보 목록 조회
 
+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: "goodsTypeNm"		, width: 100	, cellClass: 'text-center'},
 
+	{
 
+		headerName		: "주문"
 
+		, field			: "ordQty"
 
+		, width			: 80
 
+		, cellClass		: 'text-center'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "취소"
 
+		, field			: "cnclRtnQty"
 
+		, width			: 80
 
+		, cellClass		: 'text-center'
 
+		, cellRenderer	: function (params) {
 
+			var cnclRtnReqQty = parseInt(params.data.cnclRtnQty) + parseInt(params.data.ordReqChgQty);
 
+			return cnclRtnReqQty;
 
+		}
 
+	},
 
+	{
 
+		headerName		: "주문"
 
+		, field			: "ordAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "취소"
 
+		, field			: "cnclRtnAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "즉시할인"
 
+		, field			: "cpn1DcAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "다다익선1"
 
+		, field			: "tmtb1DcAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "다다익선2"
 
+		, field			: "tmtb2DcAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "상품쿠폰"		
+		, field			: "goodsCpnDcAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "장바구니쿠폰"
 
+		, field			: "cartCpnDcAmt"
 
+		, width			: 100		
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "포인트"
 
+		, field			: "pntDcAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "선포인트"
 
+		, field			: "prePntDcAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "상품권"
 
+		, field			: "gfcdUseAmt"
 
+		, width			: 80
 
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	},
 
+	{
 
+		headerName		: "실결제금액"
 
+		, field			: "realOrdAmt"
 
+		, width			: 100		
+		, cellClass		: 'text-right'
 
+		, cellRenderer	: function (params) {
 
+			return params.value.addComma();
 
+		}
 
+	}
 
+];
 
+var gridOptionsCnclRtnCompleteList = gagaAgGrid.getGridOptions(columnCnclRtnCompleteList);
 
+
 
+// Add on options
 
+gridOptionsCnclRtnCompleteList.suppressRowClickSelection = true;
 
+gridOptionsCnclRtnCompleteList.rowSelection = 'multiple';
 
+</script>
 
+
 
+<script>
 
+// 현재 사유는 고객 입니다.
 
+var isCustomer = true;
 
+
 
+//  사유
 
+var fnChangeChgReason = function(reasonCd){
 
+	var customerReasonArr = ['G686_10', 'G686_20'];
 
+
 
+	isCustomer = false;
 
+	
+	// 귀책사유체크(취소,반품,교환)
 
+	for (i=0 ; i<customerReasonArr.length ; i++) {
 
+		if (customerReasonArr[i] == reasonCd) {
 
+			isCustomer = true;
 
+		}
 
+	}
 
+	
+	// 귀책사유설정
 
+	if (isCustomer) {
 
+		$("#imputeReason").text("고객");
 
+	} else {
 
+		$("#imputeReason").text("회사");
 
+	}
 
+
 
+	$('#cancelRequestFrm input[name=chgReason]').val(reasonCd);
 
+}
 
+
 
+$(document).ready(function() {
 
+	
+	// 1. 그리드생성
 
+	gagaAgGrid.createGrid('gridCnclRtnCompleteList'		, gridOptionsCnclRtnCompleteList);			// 주문정보
 
+	
+	// 2. 그리드 데이타 싱크작업
 
+	gridOptionsCnclRtnCompleteList.api.setRowData(cnclRtnCompleteList);								// 주문정보
 
+	
+	// 2.1 TOTAL ROWS 없애기
 
+	gagaAgGrid.hideStatusBar('gridCnclRtnCompleteList');
 
+
 
+	// 3. 무통장입금아닌경우 환불계좌 그리드 숨김처리
 
+	if (payMeans !== 'G014_20') {
 
+		$('#refundAccount').addClass("off");
 
+	} else {
 
+		$("#refundAccount .bankNm").text(raBankNm);
 
+		$("#refundAccount .bankCd").text(raBank);
 
+		$("#refundAccount .accountNo").text(raNo);
 
+		$("#refundAccount .accountNm").text(raNm);
 
+	}
 
+	
+	// 4. 변경사유설정
 
+	$("#chgReasonNm").text(chgReasonNm);
 
+	$("#chgMemo").text(chgMemo);
 
+	$("#chgMemo").attr("disabled", "true");
 
+	fnChangeChgReason(chgReason);
 
+	
+	// 5. 환불에정금액 
+	var spanOrdAmt 			= 0;
 
+	var spanCnclRtnAmt 		= 0;
 
+	var spanTotPntDcAmt		= 0;
 
+	var spanPntDcAmt		= 0;
 
+	var spanPrePntDcAmt		= 0;
 
+	var spanCpnDcAmt		= 0;
 
+	var spanCpn1DcAmt		= 0;
 
+	var spanGoodsCpnDcAmt	= 0;
 
+	var spanCartCpnDcAmt	= 0;
 
+	var spanTmtbDcAmt		= 0;
 
+	var spanTmtb1DcAmt		= 0;
 
+	var spanTmtb2DcAmt		= 0;
 
+	var spanGfcdUseAmt		= 0;
 
+	var spanRealCnclRtnAmt	= 0;
 
+	var spanTotDeliveryFee	= addPayCost;
 
+	var spanRefundAmt		= 0;
 
+	
+	for (i=0 ; i<cnclRtnCompleteList.length ; i++) {
 
+		spanOrdAmt 				= spanOrdAmt 			+ cnclRtnCompleteList[i].ordAmt;
 
+		spanCnclRtnAmt 			= spanCnclRtnAmt 		+ cnclRtnCompleteList[i].cnclRtnAmt;
 
+		spanPntDcAmt			= spanPntDcAmt			+ cnclRtnCompleteList[i].pntDcAmt;
 
+		spanPrePntDcAmt			= spanPrePntDcAmt		+ cnclRtnCompleteList[i].prePntDcAmt;
 
+		spanCpn1DcAmt 			= spanCpn1DcAmt 		+ cnclRtnCompleteList[i].cpn1DcAmt;
 
+		spanGoodsCpnDcAmt 		= spanGoodsCpnDcAmt 	+ cnclRtnCompleteList[i].goodsCpnDcAmt;
 
+		spanCartCpnDcAmt 		= spanCartCpnDcAmt 		+ cnclRtnCompleteList[i].cartCpnDcAmt;
 
+		spanTmtb1DcAmt 			= spanTmtb1DcAmt 		+ cnclRtnCompleteList[i].tmtb1DcAmt;
 
+		spanTmtb2DcAmt 			= spanTmtb1DcAmt 		+ cnclRtnCompleteList[i].tmtb2DcAmt;
 
+		spanGfcdUseAmt 			= spanGfcdUseAmt 		+ cnclRtnCompleteList[i].gfcdUseAmt;
 
+		spanRealCnclRtnAmt 		= spanRealCnclRtnAmt 	+ cnclRtnCompleteList[i].realOrdAmt;
 
+	}
 
+	
+	spanTotPntDcAmt	= spanPntDcAmt + spanPrePntDcAmt;
 
+	spanCpnDcAmt	= spanCpn1DcAmt + spanGoodsCpnDcAmt + spanCartCpnDcAmt + delvCpnDcAmt;
 
+	spanTmtbDcAmt	= spanTmtb1DcAmt + spanTmtb2DcAmt;
 
+	spanRefundAmt	= spanRealCnclRtnAmt + realDelvAmt;
 
+	
+	$("#spanOrdAmt").text(spanOrdAmt.addComma());
 
+	$("#spanCnclRtnAmt").text(spanCnclRtnAmt.addComma());
 
+	$("#spanTotPntDcAmt").text(spanTotPntDcAmt.addComma());
 
+	$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
 
+	$("#spanPrePntDcAmt").text(spanPrePntDcAmt.addComma());
 
+	$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
 
+	$("#spanCpn1DcAmt").text(spanCpn1DcAmt.addComma());
 
+	$("#spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma());
 
+	$("#spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma());
 
+	$("#spanDelvCpnDcAmt").text(delvCpnDcAmt.addComma());
 
+	$("#spanCpnDcAmt").text(spanCpnDcAmt.addComma());
 
+	$("#spanTmtb1DcAmt").text(spanTmtb1DcAmt.addComma());
 
+	$("#spanTmtb2DcAmt").text(spanTmtb2DcAmt.addComma());
 
+	$("#spanTmtbDcAmt").text(spanTmtbDcAmt.addComma());
 
+	$("#spanGfcdUseAmt").text(spanGfcdUseAmt.addComma());
 
+	$("#spanRealCnclRtnAmt").text(spanRealCnclRtnAmt.addComma());
 
+	$("#spanTotDeliveryFee").text(addPayCost.addComma());
 
+	$("#spanRefundAmt").text(spanRefundAmt.addComma());
 
+	
+	// 2021.05.13 높이자동조절
 
+	var cancelRequestTargetHeight = 50 + (40 * cnclRtnCompleteList.length);
 
+	$("#gridCnclRtnCompleteList").css("height" , cancelRequestTargetHeight+"px");
 
+});
 
+</script>
 
+</html>
 
+
 
+
 
+
 
+
 
+

+ 1 - 1
src/main/webapp/WEB-INF/views/order/CnclReqForm.html
Просмотреть файл 

@@ -847,7 +847,7 @@ var gridOptionsDelvCdList = gagaAgGrid.getGridOptions(columnDelvCdList);
 
 
 
 <script>
 
 <script>
 
 // 현재 사유는 고객 입니다.
 
 // 현재 사유는 고객 입니다.
 
-var isCustomer = true;
 
+var isCustomer 	= true;
 
 var pgGb		= orderInfoList[0].pgGb;	// PG구분
 
 var pgGb		= orderInfoList[0].pgGb;	// PG구분
 
 
 
 // 환불예상금액계산
 
 // 환불예상금액계산

+ 38 - 14
src/main/webapp/WEB-INF/views/order/OrderDetailForm.html
Просмотреть файл 

@@ -319,6 +319,7 @@ var columnDefsGoodsInfo = [
 
 							paramData 		+= '@' + params.data.ordDtlNo;
 
 							paramData 		+= '@' + params.data.ordDtlNo;
 
 							paramData 		+= '@' + params.data.delvFeeCd;
 
 							paramData 		+= '@' + params.data.delvFeeCd;
 
 							paramData 		+= '@' + params.data.delvFeeCdGrp;
 
 							paramData 		+= '@' + params.data.delvFeeCdGrp;
 
+							paramData 		+= '@' + params.data.ordDtlStat;
 
 							retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + paramData + '\', null);">취소요청</button>';
 
 							retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + paramData + '\', null);">취소요청</button>';
 
 						}
 
 						}
 
 					}
 
 					}
 
@@ -330,6 +331,7 @@ var columnDefsGoodsInfo = [
 
 							paramData 		+= '@' + params.data.ordDtlNo;
 
 							paramData 		+= '@' + params.data.ordDtlNo;
 
 							paramData 		+= '@' + params.data.delvFeeCd;
 
 							paramData 		+= '@' + params.data.delvFeeCd;
 
 							paramData 		+= '@' + params.data.delvFeeCdGrp;
 
 							paramData 		+= '@' + params.data.delvFeeCdGrp;
 
+							paramData 		+= '@' + params.data.ordDtlStat;
 
 														
 														
 							if (params.data.changeableYn == 'Y') {
 
 							if (params.data.changeableYn == 'Y') {
 
 								retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnReturnRequest(\'' + paramData + '\', null);">반품요청</button>';
 
 								retStr 			+= '<button type="button" class="btn btn-base btn-sm" onclick="fnReturnRequest(\'' + paramData + '\', null);">반품요청</button>';
 
@@ -449,7 +451,7 @@ var columnDefsGoodsInfo = [
 
 				, width			: 80
 
 				, width			: 80
 
 				, cellClass		: 'text-right'
 
 				, cellClass		: 'text-right'
 
 				, cellRenderer	: function (params) {
 
 				, cellRenderer	: function (params) {
 
-					return "<a href=\"javascript:void(0);\" onclick=\"fnOrderPointHst('" + params.data.ordNo + "');\">" + params.value.addComma() + "</a>";
 
+					return params.value.addComma();
 
 				}
 
 				}
 
 			},
 
 			},
 
 			{
 
 			{
 
@@ -722,7 +724,9 @@ var columnDefsOrderChangeInfo = [
 
 			paramData 		+= '@' + params.data.ordDtlNo;
 
 			paramData 		+= '@' + params.data.ordDtlNo;
 
 			paramData 		+= '@' + params.data.delvFeeCd;
 
 			paramData 		+= '@' + params.data.delvFeeCd;
 
 			paramData 		+= '@' + params.data.delvFeeCdGrp;
 
 			paramData 		+= '@' + params.data.delvFeeCdGrp;
 
+			paramData 		+= '@' + params.data.chgStat;
 
 			
 			
+			/*
 
 			// 취소접수, 취소대기
 
 			// 취소접수, 취소대기
 
 			if (params.data.chgStat == 'G685_10' || params.data.chgStat == 'G685_11') {
 
 			if (params.data.chgStat == 'G685_10' || params.data.chgStat == 'G685_11') {
 
 				rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
 
 				rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
 
@@ -740,6 +744,25 @@ var columnDefsOrderChangeInfo = [
 
 			else {
 
 			else {
 
 				rtnStr = params.value;
 
 				rtnStr = params.value;
 
 			}
 
 			}
 
+			*/
 
+			
+			// 2021.06.29 변경구분값으로 변경
 
+			// 취소요청
 
+			if (params.data.chgGb == "G680_20") {
 
+				rtnStr = '<a href="javascript:void(0);" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
 
+			}
 
+			// 반품요청
 
+			else if (params.data.chgGb == "G680_30") {
 
+				rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
 
+			}
 
+			// 교환요청
 
+			else if (params.data.chgGb == "G680_40") {
 
+				rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
 
+			}
 
+			else {
 
+				rtnStr = params.value;
 
+			}
 
+			
 			return  rtnStr;
 
 			return  rtnStr;
 
 		}
 
 		}
 
 	},
 
 	},
 
@@ -776,19 +799,13 @@ var columnDefsOrderChangeInfo = [
 
 		, cellRenderer	: function (params) {
 
 		, cellRenderer	: function (params) {
 
 			var rtnStr = ""
 
 			var rtnStr = ""
 
 			
 			
-			// 회수지수정가능(교환요청, 반품요청)
 
-			if (params.data.wdGb != 'D' && (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_21' || params.data.chgStat == 'G685_50' || params.data.chgStat == 'G685_51')) {
 
-				rtnStr += params.value;			
-				rtnStr += "<button type=\"button\" style=\"margin-left:10px\" class=\"btn btn-info\" onclick=\"fnOpenDaumAddr('" + params.node.rowIndex + "', 'CLAIM');\">POST</button>";
 
-				rtnStr += "<button type=\"button\" class=\"btn btn-info\" onclick=\"fnSaveChgerAddr('" + params.node.rowIndex + "');\">저장</button>";
 
+			// 2021.06.29 회수지, 배송지 정보 수정 교환, 반품 상세화면 수정 변경
 
+			if (params.data.wdGb == 'W' && (params.data.chgGb == 'G680_30' || params.data.chgGb == 'G680_40')) {
 
+				rtnStr += params.value;
 
 			} else {
 
 			} else {
 
-				if (params.data.chgGb == 'G680_30' || params.data.chgGb == 'G680_40') {
 
-					rtnStr += params.value;
 
-				} else {
 
-					rtnStr += "";
 
-				}
 
+				rtnStr += "";
 
 			}
 
 			}
 
-			
+
 
 			return rtnStr;
 
 			return rtnStr;
 
 		}
 
 		}
 
 	},
 
 	},
 
@@ -1111,10 +1128,16 @@ var fnCancelRequest = function (paramData, ordChgSq) {
 
 	param += "&ordDtlNo=" 		+ paramArr[1];
 
 	param += "&ordDtlNo=" 		+ paramArr[1];
 
 	param += "&delvFeeCd="		+ paramArr[2];
 
 	param += "&delvFeeCd="		+ paramArr[2];
 
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 
+	param += "&chgStat="		+ paramArr[4];
 
 	param += "&ordChgSq=" 		+ ordChgSq;
 
 	param += "&ordChgSq=" 		+ ordChgSq;
 
 	
 	
 	var actionUrl = "/orderChange/cncl/req/form?" + param;
 
 	var actionUrl = "/orderChange/cncl/req/form?" + param;
 
 	
 	
+	// 2021.06.30 취소완료일때 취소완료정보 조회
 
+	if (paramArr[4] == "G685_17" || paramArr[4] == "G685_18") {
 
+		actionUrl = "/orderChange/cnclRtn/complete/view?" + param;	
+	}
 
+
 
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
 
 	
 	
 	return false;
 
 	return false;
 
@@ -1135,9 +1158,9 @@ var fnReturnRequest = function (paramData, ordChgSq) {
 
 	param += "&ordDtlNo=" 		+ paramArr[1];
 
 	param += "&ordDtlNo=" 		+ paramArr[1];
 
 	param += "&delvFeeCd="		+ paramArr[2];
 
 	param += "&delvFeeCd="		+ paramArr[2];
 
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 
-	
+	param += "&chgStat="		+ paramArr[4];
 
 	param += "&ordChgSq=" 		+ ordChgSq;
 
 	param += "&ordChgSq=" 		+ ordChgSq;
 
-	//param += "&ordChgGb=G681_30";
 
+
 
 	var actionUrl = "/orderChange/rtn/req/form?" + param;
 
 	var actionUrl = "/orderChange/rtn/req/form?" + param;
 
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 
 	cfnOpenModalPopup(actionUrl, 'popupReturnRequestForm');
 
 };
 
 };
 
@@ -1155,6 +1178,7 @@ var fnExchangeRequest = function (paramData, ordChgSq) {
 
 	param += "&ordDtlNo=" 		+ paramArr[1];
 
 	param += "&ordDtlNo=" 		+ paramArr[1];
 
 	param += "&delvFeeCd="		+ paramArr[2];
 
 	param += "&delvFeeCd="		+ paramArr[2];
 
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 
 	param += "&delvFeeCdGrp="	+ paramArr[3];
 
+	param += "&chgStat="		+ paramArr[4];
 
 	param += "&ordChgSq=" 		+ ordChgSq;
 
 	param += "&ordChgSq=" 		+ ordChgSq;
 
 	//param += "&ordChgGb=G681_20";
 
 	//param += "&ordChgGb=G681_20";
 
 	var actionUrl = "/orderChange/exchange/request/form?" + param;
 
 	var actionUrl = "/orderChange/exchange/request/form?" + param;