Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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

@@ -34,7 +34,7 @@
 				
 				<div style="text-align:right; padding-bottom:5px; padding-top:5px;">
 					<button type="button" class="btn btn-success" th:unless="${ordChgSq > 0}" id="fnExchangeRequestSubmit" onclick="fnExchange()">교환요청</button>
-					<button type="button" class="btn btn-success" th:if="${ordChgSq > 0 and ordChgGb == ''}" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
+					<button type="button" class="btn btn-success" id="fnExchangeCancelRequestSubmit" onclick="fnExchangeCancel()">교환철회</button>
 					<button type="button" class="btn btn-success" th:if="${ordChgSq > 0 and (ordChgGb == 'G681_20' or ordChgGb == 'G681_40')}" id="fnReturnToExchangeSubmit" onclick="fnExchange()">교환변경</button>
 				</div>
 				
@@ -622,6 +622,11 @@ var fnChangeChgReason = function(reasonCd){
 			$('#wdBfSendYn').attr('disabled', false);
 		}
 	}
+	
+	// 2021.05.25 반품접수, 반품대기 상태에서만 철회가능
+	if (chgStat != "G685_20" && chgStat != "G685_21" && chgStat != "G685_30" && chgStat != "G685_31") {
+		$("#fnExchangeCancelRequestSubmit").css("display", "none");
+	}
 
 	$('#exchangeRequestFrm input[name=chgReason]').val(arrReasonCd[0]);
 	$('#exchangeRequestFrm input[name=chgReasonDesc]').val(arrReasonCd[1]);

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

@@ -1465,9 +1465,9 @@ $(document).ready(function() {
 		$("#rtnReqBtn").css("display", "none");
 		
 		// 2021.05.25 반품접수, 반품대기 상태에서만 철회가능
-		if (chgStat != "G685_50" && chgStat != "G685_51") {
-			$("#rtnReqCancelBtn").css("display", "none");
-		}
+		//if (chgStat != "G685_50" && chgStat != "G685_51" && chgStat != "G685_31") {
+			//$("#rtnReqCancelBtn").css("display", "none");
+		//}
 		
 		// 반품TO교환 버튼
 		if ((chgStat != "G685_50" && chgStat != "G685_51" && chgStat != "G685_30") || pgGb == 'NAVER_ORDER') {