주문/교환 구분값 수정

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

@@ -837,34 +837,25 @@ var columnDefsOrderChangeInfo = [
 			return (params.value == 'N') ? '미전송' : '전송';
 		}
 	},
-	/*
-	{
-		headerName		: "요청취소"
-		, field			: "ordDtlNo"
-		, width			: 100
-		, cellClass		: 'text-center'
-		, cellRenderer	: function (params) {
-			var retStr = "";
-			
-			if (params.data.chgGb == "G680_30" && params.data.chgStat == "G685_40") {
-				retStr = ' <button type="button" class="btn btn-success" onclick="fnReturnReqeustCancel(\'' + params.data.ordChgSq + '\',\'' + params.value + '\',\'' + params.node.rowIndex + '\');">반품취소</button>';
-			} else if (params.data.chgGb == "G680_40" && params.data.chgStat == "G685_30") {
-				retStr = ' <button type="button" class="btn btn-success" onclick="fnExchangeReqeustCancel(\'' + params.data.ordChgSq + '\',\'' + ordNo + '\',\'' + params.value + '\',\'' + params.node.rowIndex + '\');">교환취소</button>';
-			} else if (params.data.chgGb == "G680_20" && params.data.chgStat == "G685_20") {
-				retStr = '<button type="button" class="btn btn-success" onclick="fnCancelConfirmRequestCancel(\'' + params.data.ordChgSq + '\')">요청철회</button>';
-			}
-
-			return retStr;
-		}
-	},
-	*/
 	{
 		headerName		: "회수지시전송"
 		, field			: "wdInvoiceSendYn"
 		, width			: 120
 		, cellClass		: 'text-center'
 	},
-	{headerName: "회수송장번호", field: "wdInvoiceNo", width: 90, cellClass: 'text-center'}
+	{
+		headerName		: "회수송장번호"
+		, field			: "wdInvoiceNo"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, cellRenderer	: function (params) {
+			var retStr = '';
+			if (!gagajf.isNull(params.value)) {
+				retStr = '<a href="javascript:void(0);" onclick="fnSweetTracker(\'' + params.data.shipCompCd + '\',\'' + params.data.wdInvoiceNo + '\');">' + params.value + '</a>';
+			}
+			return retStr;
+		}
+	}
 ];
 var gridOptionsOrderChangeInfo = gagaAgGrid.getGridOptions(columnDefsOrderChangeInfo);
 

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

@@ -363,15 +363,7 @@ var columnDefsOrderList = [
 			return gagaAgGrid.lookupValue(payMeansList, params.data.payMeans); 
 		}
 	},
-	{
-		headerName		: "신규/교환"
-		, field			: "ordExchGb"
-		, width			: 100
-		, cellClass		: 'text-center',
-		valueGetter 	: function (params) {
-			return params.data.ordExchGb === 'O' ? '신규' : '교환';
-		}
-	},
+	{headerName: "원주문/교환"	, field: "exchGbNm"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{
 		headerName		: "주문상태"
 		, field			: "ordDtlStatNm"