품절취소대상목록수정

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

@@ -135,9 +135,9 @@
 									<input type="checkbox" name="pgStat" id="pgStat" onclick="fnChangePgStat();"/>
 								</label>
 							</td>
-							<th>입금액</th>
+							<th>입금액(원)</th>
 							<td>
-								<input type="text" class="w150" name="depositAmt" id="depositAmt" value="0" readonly="readonly"/>원
+								<input type="text" name="depositAmt" id="depositAmt" value="0" readonly="readonly"/>
 							</td>
 						</tr>
 						<tr>

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

@@ -131,7 +131,7 @@ var columnDefs = [
 		, width			: 200
 		, cellClass		: 'text-center'
 		, cellRenderer: function (params) {
-			var retStr = "";
+			var rtnStr = "";
 			// 네이버페이 주문형은 버튼 생성X
 			if(params.data.pgGb == "NAVER_ORDER") return retStr;
 
@@ -139,17 +139,31 @@ var columnDefs = [
 			// 2021.07.08 card007 교환상품은 취소 안되게 수정
 			if (params.data.ordExchGb == 'O') {
 				if (params.value == 'G013_20' || params.value == 'G013_30' || params.value == 'G013_35' || params.value == 'G013_40') {
-					if (params.data.ordQty > (params.data.cnclRtnQty + params.data.ordReqChgQty)) {
+					// 자동품절취소실패
+					if (params.data.ordQty > (params.data.cnclRtnQty)) {
 						var paramData = params.data.ordNo;
 						paramData += '@' + params.data.ordDtlNo;
 						paramData += '@' + params.data.delvFeeCd;
 						paramData += '@' + params.data.delvFeeCdGrp;
 						paramData += '@' + params.data.ordDtlStat;
-						retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + paramData + '\', null);">취소요청</button>';
+						
+						rtnStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + paramData + '\', null);">취소요청</button>';
+					}
+				}
+				else if (params.value == 'G685_10') {
+					// 입점, 자사 핸드폰, 무통장 취소접수건 처리
+					if (params.data.ordQty > (params.data.cnclRtnQty)) {
+						var paramData = params.data.ordNo;
+						paramData += '@' + params.data.ordDtlNo;
+						paramData += '@' + params.data.delvFeeCd;
+						paramData += '@' + params.data.delvFeeCdGrp;
+						paramData += '@' + params.data.ordDtlStat;
+						
+						rtnStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + paramData + '\',\'' + params.data.ordChgSq + '\');">취소승인</button>';
 					}
 				}
 			}
-			return retStr;
+			return rtnStr;
 		}
 	},
 	{headerName: "상품코드",			field:"goodsCd",		width:100, cellClass: 'text-center'},