관리자 수정중

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -58,20 +58,20 @@ public class TsaOrderChangeController extends TsaBaseController {
 	/**
 	 * 취소요청, 취소완료 통합 화면 (관리자)
 	 * 
-	 * @param ordNo - 주문번호
-	 * @param cncWait - 취소대기요청 구분
 	 * @return ModelAndView
 	 * @author jsh77b
 	 * @since 2020. 12. 22
 	 */
 	@GetMapping("/cncl/req/form")
-	public ModelAndView cnclReqForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordChgSq") int ordChgSq) {
+	public ModelAndView cnclReqForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordDtlNo") int ordDtlNo
+			, @RequestParam(value = "delvFeeCd") String delvFeeCd, @RequestParam(value = "ordChgSq") int ordChgSq) {
 
 		Order order = new Order();
-		ModelAndView mav = new ModelAndView();
 		order.setOrdNo(ordNo);
+		order.setOrdDtlNo(ordDtlNo);
+		order.setDelvFeeCd(delvFeeCd);
 		order.setOrdChgSq(ordChgSq);
-				
+
 		// 1. 취소가능 주문상세상탭값 설정
 		String[] ordDtlStatArr = new String[4];
 		ordDtlStatArr[0] = TscConstants.OrderDetailStat.DEPOSIT_WAIT.value();
@@ -87,6 +87,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		
 		// 3. 화면으로 데이타 전송
 		// 2021.01.26 취소요청 화면, 취소요청정보확인 화면 통합
+		ModelAndView mav = new ModelAndView();
 		mav.addObject("chgReasonList"				, rendererService.getAvailCommonCodeList("G686"));				// 취소사유
 		mav.addObject("cancelRequestTargetList"		, cancelRequestTargetList);										// 변경신청대상목록 (취소/반품/교환)
 		mav.addObject("orderInfoList"				, orderInfoList);												// 주문정보

src/main/java/com/style24/admin/biz/web/TsaOrderController.java

@@ -85,11 +85,9 @@ public class TsaOrderController extends TsaBaseController {
 		
 		// 2021.05.11 프론트기준으로 상태값 정리
 		mav.addObject("ordDtlStatList"	, rendererService.getCommonCodeList("G013", "Y", new String[] {"G013_10", "G013_11", "G013_25", "G013_35", "G013_55", "G013_97", "G013_98", "G013_99"}));
-		//mav.addObject("ordStatList"		, rendererService.getAvailCommonCodeList("G012"));		// 주문상태코드
-		//mav.addObject("ordDtlStatList"	, rendererService.getAvailCommonCodeList("G013"));		// 주문상세상태코드
-
 		mav.addObject("chgStatList"		, rendererService.getAvailCommonCodeList("G685"));		// 주문변경요청상태코드
 		mav.addObject("chgGbList"		, rendererService.getAvailCommonCodeList("G680"));		// 주문변경구분코드
+		mav.addObject("pgGbList"		, rendererService.getAvailCommonCodeList("G015"));		// 결제타입
 		mav.addObject("payMeansList"	, rendererService.getAvailCommonCodeList("G014"));		// 결제수단
 		mav.addObject("siteCdList"		, rendererService.getAvailCommonCodeList("G000"));		// 사이트구분
 		mav.addObject("formalGbList"	, rendererService.getAvailCommonCodeList("G009"));		// 정상/이월

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

@@ -44,7 +44,23 @@ var columnDefs4OrderDetailChangeHstList = [
 			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
 		}
 	},
-	{headerName: "변경아이디"		, field: "updId"		, width: 120	, cellClass: 'text-center'},
+	{
+		headerName		: "변경아이디"		
+		, field			: "userId"
+		, width			: 120
+		, cellClass		: 'text-center'
+		, cellRenderer	: function (params) {
+			var rtnStr = "";
+			
+			if (params.value != null && params.value != '') {
+				rtnStr += params.value;
+			} else {
+				rtnStr += params.data.custId;
+			}
+			
+			return rtnStr;
+		}
+	},
 	{headerName: "변경내용"		, field: "ordDtlStatNm"	, width: 130	, cellClass: 'text-center'},
 	{headerName: "주문수량"		, field: "ordQty"		, width: 80		, cellClass: 'text-center'},
 	{headerName: "취소수량"		, field: "cnclRtnQty"	, width: 80		, cellClass: 'text-center'},

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

@@ -166,11 +166,7 @@ var orderChangeInfo 		= [[${orderChangeInfo}]];				// 취소/반품/교환요청
 var orderRefundInfo 		= [[${orderRefundInfo}]];				// 환불정보
 var orderCounselInfo 		= [[${orderCounselInfo}]];				// 상담내역
 var orderAdminMemoInfo 		= [[${orderAdminMemoInfo}]];			// 관리자메모
-
-var canChgDelvOrdStat		= ['G013_10', 'G013_11', 'G013_17', 'G013_20', 'G013_30', 'G013_40'];
-var canChgDelvChgStat		= ['G685_30', 'G685_33', 'G685_40'];
 var allCanYn				= [[${allCanYn}]];						// 배송지수정가능여부
-
 var orderGoodsCnt 			= [[${orderGoodsInfo.size()}]];			// 주문상세정보
 var orderFreeGiftCnt		= [[${orderFreeGiftInfo.size()}]];		// 주문사은품정보
 var orderDeliveryAddrCnt	= [[${orderDeliveryAddrInfo.size()}]];	// 배송정보
@@ -179,28 +175,23 @@ var orderRefundCnt 			= [[${orderRefundInfo.size()}]];		// 환불정보
 
 // 2021.05.12 
 var hiddenTemp				= true;
-if (userNo == "24" || userNo == "8") {
+if (userNo == "24") {
 	hiddenTemp				= false;
 }
 
 </script>
 
 <!-- AgGrid 컬럼 세팅 -->
-<script>
+<script th:inline="javascript">
 
 // 1.주문기본정보 그리드 바인딩
 // 2.상품별 상세정보
 var columnDefsGoodsInfo = [
 	{
-		headerName	: "주문상세",
+		headerName	: "주문상세정보",
 		children	: [
-			{headerName: "번호"		, field: "ordDtlNo"		, width: 80, cellClass: 'text-center'},
+			{headerName: "상세번호"	, field: "ordDtlNo"		, width: 80, cellClass: 'text-center'},
 			{headerName: "주문구분"	, field: "exchGbNm"		, width: 80, cellClass: 'text-center'},
-		],
-	},
-	{
-		headerName	: "상품정보",
-		children	: [
 			{headerName: "상품코드"	, field: "goodsCd"		, width: 80, cellClass: 'text-center'},
 			{
 				headerName		: "상품명"
@@ -241,12 +232,7 @@ var columnDefsGoodsInfo = [
 				, cellRenderer	: function (params) {
 					return params.value.addComma();
 				}
-			}
-		]
-	},
-	{
-		headerName	: "주문상세",
-		children	: [
+			},
 			{headerName: "주문수량"	, field: "ordQty"		, width: 80, cellClass: 'text-center'},
 			{headerName: "취소수량"	, field: "cnclRtnQty"	, width: 80, cellClass: 'text-center'},
 			{headerName: "변경요청수량"	, field: "ordReqChgQty"	, width: 100, cellClass: 'text-center'},
@@ -279,49 +265,9 @@ var columnDefsGoodsInfo = [
 					var strVal 		= "";
 					var strCheck	= "";
 					
-					// 현재상태에 따라서 갈수 있는 상태 정리
-					// @ 자사 : 결제완료, 배송준비중, 배송중, 배송완료
-					// @ 입점 : 결제완료, 상품준비중, 출고완료
-					// @ 모든상태값 변경 기준 (상세내역의 상택값 이력으로만 이동가능)
-					// G013_00	주문접수
-					// G013_10	입금대기
-					// G013_18	발주대기-가격차이
-					// G013_19	발주대기-우편번호상이
-					// G013_20	결제완료
-					// G013_30	상품준비중
-					// G013_40	배송준비중
-					// G013_50	배송중
-					// G013_55	출고완료
-					// G013_60	배송완료
-					// G013_98	결제전주문취소
-					// G013_99	결제후주문취소
-					// 2020.12.22 추가적인 개발은 추후 물류개발이 완료된 후 추가할 예정
-					// To Do List
-					// @ 재고정보수정
-					// @ 정산정보수정
+					// 2021.04.30 상태값 임시 기능
 					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>";
-					}
-					if (!gagajf.isNull(params.data.g30)) {
-						strVal += "	<option value='G013_30'>상품준비중</option>";
-					}
-					if (!gagajf.isNull(params.data.g40)) {
-						strVal += "	<option value='G013_40'>배송준비중</option>";
-					}
-					if (!gagajf.isNull(params.data.g50)) {
-						strVal += "	<option value='G013_50'>배송중</option>";
-					}
-					if (!gagajf.isNull(params.data.g55)) {
-						strVal += "	<option value='G013_55'>출고완료</option>";
-					}
-					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>";
 					strVal += "	<option value='G013_40'>배송준비중</option>";
@@ -333,7 +279,7 @@ var columnDefsGoodsInfo = [
 				}
 			},
 			{
-				headerName		: "변경"
+				headerName		: "변경요청"
 				, field			: "ordDtlStat"
 				, width			: 200
 				, cellClass		: 'text-center'
@@ -343,7 +289,7 @@ var columnDefsGoodsInfo = [
 					// 결제완료, 상품준비중, 출고처지정, 배송준비중 (주문취소) 
 					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)) {
-							retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\'' + params.data.delvFeeCd + '\');">취소요청</button>';
+							retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnCancelRequest(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\'' + params.data.delvFeeCd + '\', null);">취소요청</button>';
 						}
 					}
 					
@@ -351,17 +297,17 @@ var columnDefsGoodsInfo = [
 					if (params.value == 'G013_50' || params.value == 'G013_60') {
 						if (params.data.ordQty > (params.data.cnclRtnQty + params.data.ordReqChgQty)) {
 							if (params.data.changeableYn == 'Y') {
-								retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnReturnRequest(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\'' + params.data.delvFeeCd + '\');">교환요청</button>';
+								retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnReturnRequest(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\'' + params.data.delvFeeCd + '\', null);">교환요청</button>';
 							}
 							if (params.data.returnableYn == 'Y') {
-								retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnExchangeRequest(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\'' + params.data.delvFeeCd + '\');">반품요청</button>';
+								retStr += '<button type="button" class="btn btn-base btn-sm" onclick="fnExchangeRequest(\'' + params.data.ordNo + '\',\'' + params.data.ordDtlNo + '\',\'' + params.data.delvFeeCd + '\', null);">반품요청</button>';
 							}
 						}
 					}
 					return retStr;
 				}
 			},
-		]
+		],
 	},
 	{
 		headerName	: "금액",
@@ -384,6 +330,15 @@ var columnDefsGoodsInfo = [
 					return params.value.addComma();
 				}
 			},
+			{
+				headerName		: "실결제"
+				, field			: "realOrdAmt"
+				, width			: 80
+				, cellClass		: 'text-right'
+				, valueFormatter: function (params) {
+					return params.value.addComma();
+				}
+			}
 		]
 	},
 	{
@@ -395,7 +350,7 @@ var columnDefsGoodsInfo = [
 				, width			: 80
 				, cellClass		: 'text-right'
 				, cellRenderer: function (params) {
-					return "<a href=\"javascript:void(0);\" onclick=\"fnOrderCouponHst('" + params.data.ordNo + "');\">" + params.value.addComma() + "</a>";
+					return params.value.addComma();
 				}
 			},
 			{
@@ -487,24 +442,10 @@ var columnDefsGoodsInfo = [
 			}
 		]
 	},
-	{
-		headerName	: "금액",
-		children	: [
-			{
-				headerName		: "실결제"
-				, field			: "realOrdAmt"
-				, width			: 80
-				, cellClass		: 'text-right'
-				, valueFormatter: function (params) {
-					return params.value.addComma();
-				}
-			}
-		]
-	},
-	//{headerName: "결품", field: "soldoutYn", width: 60, cellClass: 'text-center'},
 	{
 		headerName	: "배송",
 		children	: [
+			{headerName: "품절여부", field: "soldoutYn", width: 90, cellClass: 'text-center'},
 			{
 				headerName		: "송장번호"
 				, field			: "invoiceNo"
@@ -580,7 +521,7 @@ var columnDefsDeliveryInfo = [
 		, width			: 220
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
-			var rtnStr = ""
+			var rtnStr = "";
 			
 			if (allCanYn == 'Y') {
 				rtnStr += params.value;
@@ -601,9 +542,33 @@ var gridOptionsDeliveryInfo = gagaAgGrid.getGridOptions(columnDefsDeliveryInfo);
 
 // 4.결제정보
 var columnDefsPaymentInfo = [
-	{headerName: "결제수단"		, field: "payMeansNm"	, width: 100	, cellClass: 'text-center'},
+	{headerName: "결제방법"		, field: "pgGb"			, width: 100	, cellClass: 'text-center'},
+	{headerName: "결제수단"		, field: "payMeansNm"	, width: 120	, cellClass: 'text-center'},
 	{headerName: "카드(은행)"		, field: "cardNm"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "할부(입금계좌)"	, field: "cardMips"		, width: 150	, cellClass: 'text-center'},
+	{
+		headerName		: "할부(입금계좌)"
+		, field			: "cardMips"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, cellRenderer	: function (params) {
+			var retStr = '';
+			// 무통장입금
+			if (params.data.payMeans == 'G014_20') {
+				retStr = params.data.vaNo;
+			} else {
+				if (params.value == '00' || params.value == '0') {
+					retStr = "일시불";
+				} else {
+					if (parseInt(params.value) > 0) {
+						retStr = parseInt(params.value) + "개월할부";
+					} else {
+						retStr = params.value;
+					}
+				}
+			}
+			return retStr;
+		}
+	},
 	{
 		headerName		: "승인번호"
 		, field			: "pgTradeNo"
@@ -611,7 +576,8 @@ var columnDefsPaymentInfo = [
 		, cellClass		: 'text-center'
 		, cellRenderer	: function (params) {
 			var retStr = '';
-
+			
+			/*
 			if (!gagajf.isNull(params.value)) {
 				retStr = '<a href="javascript:void(0);" onclick="fnReceiptPage(\'' + params.data.pgTid + '\');">' + params.value + '</a>';
 			}
@@ -619,6 +585,9 @@ var columnDefsPaymentInfo = [
 			if (gagajf.isNull(params.value) && !gagajf.isNull(params.data.pgTid)) {
 				retStr = '<a href="javascript:void(0);" onclick="fnReceiptPage(\'' + params.data.pgTid + '\');">' + '거래내역' + '</a>';
 			}
+			*/
+			
+			retStr = params.value;
 
 			return retStr;
 		}
@@ -757,13 +726,16 @@ var columnDefsOrderChangeInfo = [
 			var rtnStr = ""
 			
 			// 회수지수정가능(교환요청, 반품요청)
-			if (params.data.wdGb != 'D' && (params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_33' || params.data.chgStat == 'G685_40')) {
-				
+			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>";
 			} else {
-				rtnStr = "";
+				if (params.data.chgGb == 'G680_30' || params.data.chgGb == 'G680_40') {
+					rtnStr += params.value;
+				} else {
+					rtnStr += "";
+				}
 			}
 			
 			return rtnStr;
@@ -813,6 +785,7 @@ var gridOptionsOrderChangeInfo = gagaAgGrid.getGridOptions(columnDefsOrderChange
 
 // 7.환불정보
 var columnDefsRefundInfo = [
+	{headerName: "요청번호"		, field: "ordChgSq"		, width: 80		, cellClass: 'text-center'},
 	{headerName: "환불수단"		, field: "payMeansNm"	, width: 80		, cellClass: 'text-center'},
 	{headerName: "환불은행(카드)"	, field: "cardNm"		, width: 120	, cellClass: 'text-center'},
 	{headerName: "환불은행계좌번호"	, field: "raNo"			, width: 150	, cellClass: 'text-center'},
@@ -835,7 +808,23 @@ var columnDefsRefundInfo = [
 			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
 		}
 	},
-	{headerName: "환불처리자"		, field: "updNm"		, width: 120		, cellClass: 'text-center'}
+	{
+		headerName		: "변경아이디"		
+		, field			: "userId"
+		, width			: 120
+		, cellClass		: 'text-center'
+		, cellRenderer	: function (params) {
+			var rtnStr = "";
+			
+			if (params.value != null && params.value != '') {
+				rtnStr += params.value;
+			} else {
+				rtnStr += params.data.custId;
+			}
+			
+			return rtnStr;
+		}
+	}
 ];
 var gridOptionsRefundInfo = gagaAgGrid.getGridOptions(columnDefsRefundInfo);
 
@@ -916,20 +905,8 @@ var columnDefsOrderMemoInfo = [
 var gridOptionsOrderMemoInfo = gagaAgGrid.getGridOptions(columnDefsOrderMemoInfo);
 </script>
 
-<script>
-var fnSetGridHeightInit = function () {
-	if (_windowWidth < 1780) {
-		_girdRowH1 = 33 + _scrollH;
-		_girdRowH2 = 80 + _scrollH;
-	} else {
-		_girdRowH1 = 33
-		_girdRowH2 = 80;
-	}
-}
-</script>
-
 <!-- 버튼 이벤트 바인딩 -->
-<script>
+<script th:inline="javascript">
 var _windowWidth 	= $(window).width();		/* 위도우창 넓이 */
 var _girdRowH 		= 33;						/* 그리드 Row 줄 높이 */
 var _girdRowH1 		= 33;						/* 그리드 타이틀 1줄 짜리 높이*/
@@ -941,9 +918,18 @@ $(window).resize(function () {
 	fnSetGridHeightInit();
 });
 
+var fnSetGridHeightInit = function () {
+	if (_windowWidth < 1780) {
+		_girdRowH1 = 33 + _scrollH;
+		_girdRowH2 = 80 + _scrollH;
+	} else {
+		_girdRowH1 = 33
+		_girdRowH2 = 80;
+	}
+}
 </script>
 <!-- AgGrid 생성 -->
-<script>
+<script th:inline="javascript">
 // 팝업닫기
 var fnOrderDetailClose = function(){
 	uifnPopupClose('popupOrderDetail');
@@ -1028,7 +1014,8 @@ $(document).ready(function () {
 	// G685_40	반품요청
 	// G685_41	반품요청취소
 	// G685_42	반품완료
-
+	
+	/*
 	var addrBtnChkCnt = 0;
 	gridOptionsGoodsInfo.api.forEachNode(function (rowNode, index) {
 		
@@ -1057,15 +1044,16 @@ $(document).ready(function () {
 	if (addrBtnChkCnt > 0) {
 		$("#btnUpdateOrderAddr").removeClass("off");
 	}
+	*/
 });
 
 $(document).ready(function () {
 	// 2021.05.11 그리드 높이정보 수정
 	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);
+	var orderFreeGiftHeight 		= 40 + (38 * orderFreeGiftCnt);
+	var orderDeliveryAddrHeight 	= 40 + (38 * orderDeliveryAddrCnt);
+	var orderChangeHeight 			= 40 + (38 * orderChangeCnt);
+	var orderRefundHeight 			= 40 + (38 * orderRefundCnt);
 	
 	$("#gridOrderGoodsInfo").css("height"		, orderGoodsHeight+"px");
 	$("#gridOrderFreeGiftInfo").css("height"	, orderFreeGiftHeight+"px");
@@ -1103,7 +1091,7 @@ $(document).ready(function () {
 </script>
 
 <!-- function -->
-<script>
+<script th:inline="javascript">
 var gridOrderChangeInfoSelectedIdx = '';
 
 // 배송지변경
@@ -1128,15 +1116,23 @@ var fnUpdateOrderAddr = function (rowIdx) {
 
 // 2021.01.25 추가
 // 취소요청, 교환요청, 반품요청 일때는 요청 정보 확인 팝업 정보
-var fnCancelRequest = function (ordNo, ordDtlNo, delvFeeCd) {
+var fnCancelRequest = function (ordNo, ordDtlNo, delvFeeCd, ordChgSq) {
 	// 취소요청 구분 (orChgSq null 이면 취소요청화면 있으면 취소요청정보화면)
 	if (ordChgSq == null) {
 		ordChgSq = 0;
 	}
 	
-	var actionUrl = "/orderChange/cncl/req/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq;
+	var param = "";
+	param += "&ordNo=" 		+ ordNo;
+	param += "&ordDtlNo=" 	+ ordDtlNo;
+	param += "&delvFeeCd="	+ delvFeeCd;
+	param += "&ordChgSq=" 	+ ordChgSq;
+	
+	var actionUrl = "/orderChange/cncl/req/form?" + param;
 	
 	cfnOpenModalPopup(actionUrl, 'popupCancelRequestForm');
+	
+	return false;
 };
 
 //2021.01.25 추가

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

@@ -90,8 +90,8 @@
 						</td>
 					</tr>
 					<tr>
-						<th>주문상세상태</th>
-						<td colspan="5">
+						<th>주문상태</th>
+						<td>
 							<div class="multiCheckBox" style="width:270px">
 								<button type="button" class="sltBtn" style="overflow-x: hidden; padding-right:5px;">[전체]</button>
 								<ul style="display: none; box-shadow: 3px 3px 3px; overflow-y: scroll; height: 112px;">
@@ -112,6 +112,22 @@
 								</ul>
 							</div>
 						</td>
+						<th>결제타입</th>
+						<td>
+							<select name="pgGb">
+								<option value="">[전체]</option>
+								<option th:if="${pgGbList}" th:each="oneData, status : ${pgGbList}" th:value="${oneData.cd}"
+										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
+							</select>
+						</td>
+						<th>결제수단</th>
+						<td>
+							<select name="payMeans">
+								<option value="">[전체]</option>
+								<option th:if="${payMeansList}" th:each="oneData, status : ${payMeansList}" th:value="${oneData.cd}"
+										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
+							</select>
+						</td>
 						<th rowspan="5">키워드<i class="star"></i></th>
 						<td rowspan="5">
 							<select name="search" id="search">
@@ -135,7 +151,7 @@
 							</select>
 						</td>
 						<th>변경요청처리상태</th>
-						<td>
+						<td colspan="3">
 							<select name="chgStat">
 								<option value="">[전체]</option>
 								<option value="9999">[품절취소]</option>
@@ -143,14 +159,6 @@
 										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
 							</select>
 						</td>
-						<th>결제수단</th>
-						<td>
-							<select name="payMeans">
-								<option value="">[전체]</option>
-								<option th:if="${payMeansList}" th:each="oneData, status : ${payMeansList}" th:value="${oneData.cd}"
-										th:text="|[${oneData.cd}] ${oneData.cdNm}|"></option>
-							</select>
-						</td>
 					</tr>
 					<tr>
 						<th>주문자명</th>
@@ -228,7 +236,7 @@
 			<ul class="panelBar">
 				<li>
 					<button type="button" class="btn btn-info btn-lg" onclick="fnOrderExcelList();">엑셀다운로드</button>
-					<!-- <button type="button" class="btn btn-info btn-lg" th:if="${userNo == 8 or userNo == 14 or userNo == 11}" onclick="fnCreateSampleOrder();">주문생성</button> -->
+					<button type="button" class="btn btn-info btn-lg" th:if="${userNo == 8 or userNo == 14 or userNo == 11}" onclick="fnCreateSampleOrder();">주문생성</button>
 				</li>
 				<li class="aR">
 					검색결과 : <strong><span id="rowCntOrderList">0</span> 건</strong>&nbsp;
@@ -279,273 +287,260 @@ var uploadGoodsUrl 	= [[${@environment.getProperty('upload.goods.view')}]];
 // 1. 주문기본정보
 var columnDefsOrderList = [
 	{
-		headerName	: "주문기본정보"
-		, cellClass	: 'text-center'
-		, children	: [
-			{
-				headerName		: "주문번호"
-				, field			: 'ordNo'
-				, width			: 80
-				, cellClass		: 'text-center'
-				, sortable		: true
-				, cellRenderer	: function (params) {
-					var roleCd = [[${sessionInfo.roleCd}]];
-					if (!roleCd.startsWith("C")) {
-						return "<a href=\"javascript:void(0);\" onclick=\"fnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
-					} else {
-						return params.value;
-					}
-				}
-			},
-			{
-				headerName		: "주문자"
-				, field			: "ordNm"
-				, width			: 100
-				, cellClass		: 'text-left'
-				, sortable		: true
-				, cellRenderer	: function (params) {
-					var custNo = '';
-					if (!gagajf.isNull(params.data.custNo)) {
-						custNo = params.data.custNo;
-					}
-					
-					var roleCd = [[${sessionInfo.roleCd}]];
-					if (!roleCd.startsWith("C") && !gagajf.isNull(params.data.custNo)  && params.data.mallGb === '10' ) {
-						return '<a href="javascript:void(0);" onclick=\"cfnOpenCustDetailPopup(' + params.data.custNo + ');\">' + params.value + '(' + custNo + ')' + '</a>';
-					} else {
-						return params.value + '(' + custNo + ')';
-					}
-				}
-			},
-			{headerName: "고객고유번호"	, field: "custNo"		, width: 120, cellClass: 'text-center', hide: true},
-			{headerName: "외부몰"		, field: "extmallNm"	, width: 100, cellClass: 'text-center', sortable: true},
-			{headerName: "휴대폰번호"	, field: "orderPhnno"	, width: 120, cellClass: 'text-center', hide: true},
-			{
-				headerName		: "사이트"
-				, field			: "siteCd"
-				, width			: 80
-				, cellClass		: 'text-center'
-				, hide			: true
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.lookupValue(siteCdList, params.data.siteCd); 
-				}
-			},
-			{
-				headerName		: "프론트"
-				, field			: "frontGb"
-				, width			: 80
-				, cellClass		: 'text-center'
-				, sortable		: true
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.lookupValue(frontGbList, params.data.frontGb); 
-				}
-			},
-			{
-				headerName		: "몰구분"
-				, field			: "mallGb"
-				, width			: 60
-				, cellClass		: 'text-center'
-				, hide			: true
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.lookupValue(mallGbList, params.data.mallGb); 
-				}
-			},
-			{
-				headerName		: "주문일시"
-				, field			: "ordDt"
-				, width			: 140
-				, cellClass		: 'text-center'
-				, sortable		: true
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.toDateTimeFormat(params.data.ordDt); 
-				}
-			},
-			{
-				headerName		: "결제수단"
-				, field			: "payMeans"
-				, width			: 100
-				, cellClass		: 'text-center'
-				, hide			: true
-				, valueGetter	: function (params) { 
-					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			: "ordDtlStatNm"
-				, width			: 120
-				, cellClass		: 'text-center'
-				, sortable		: true
-			},
-			{headerName: "출고처", field: "delvLocNm", width: 110, cellClass: 'text-center', sortable: true, hide:true},
-		]
+		headerName		: "주문번호"
+		, field			: 'ordNo'
+		, width			: 80
+		, cellClass		: 'text-center'
+		, sortable		: true
+		, cellRenderer	: function (params) {
+			var roleCd = [[${sessionInfo.roleCd}]];
+			if (!roleCd.startsWith("C")) {
+				return "<a href=\"javascript:void(0);\" onclick=\"fnOpenOrderDetailPopup('" + params.value + "');\">" + params.value + "</a>";
+			} else {
+				return params.value;
+			}
+		}
 	},
 	{
-		headerName	: "상품정보"
-		, cellClass	: 'text-center'
-		, children	: [
-			{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
-			{headerName: "브랜드"		, field: "brandEnm"		, width: 100	, cellClass: 'text-center'	, sortable: true},
-			{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
-			{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-center'	, sortable: true},
-			{
-				headerName		: "이미지"
-				, field			: "sysImgNm"
-				, width			: 100
-				, height		: 60
-				, cellClass		: 'text-center'
-				,cellRenderer	: function(params) {
-					return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
-				}
-			},
-			{headerName: "옵션1"		, field: "colorNm"		, width: 120	, cellClass: 'text-center'	, sortable: true},
-			{headerName: "옵션2"		, field: "optCd2"		, width: 120	, cellClass: 'text-center'	, sortable: true},
-			{
-				headerName		: "외부몰벤더"
-				, field			: "vendorId"
-				, width			: 110
-				, cellClass		: 'text-center'
-				, hide			: true
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.lookupValue(vendorList, params.data.vendorId); 
-				}
-			},
-			{headerName: "외부몰주문번호"	, field: "extmallOrderId"	, width: 150, cellClass: 'textFormat', sortable: true},
-			{headerName: "외부몰부주문번호"	, field: "agentOrderId"		, width: 120, cellClass: 'textFormat', sortable: true},
-			{
-				headerName		: "주문수량"
-				, field			: "ordQty"
-				, width			: 80
-				, cellClass		: 'text-center'
-				, valueGetter: function (params) { 
-					return params.data.ordQty.addComma(); 
-				}
-			},
-			{
-				headerName		: "취소수량"
-				, field			: "cnclRtnQty"
-				, width			: 80
-				, cellClass		: 'text-center'
-				, valueGetter	: function (params) { 
-					return params.data.cnclRtnQty.addComma(); 
-				}
-			},
-			{
-				headerName		: "주문금액"
-				, field			: "ordAmt"
-				, width			: 80
-				, cellClass		: 'text-right'
-				, valueGetter	: function (params) { 
-					return params.data.ordAmt.addComma(); 
-				}
-			},
-			{
-				headerName		: "취소반품금액"
-				, field			: "cnclRtnAmt"
-				, width			: 120
-				, cellClass		: 'text-right'
-				, valueGetter	: function (params) { 
-					return params.data.cnclRtnAmt.addComma(); 
-				}
-			},
-			{
-				headerName		: "총할인금액"
-				, field			: "totDcAmt"
-				, width			: 120
-				, cellClass		: 'text-right'
-				, valueGetter: function (params) { 
-					return params.data.totDcAmt.addComma(); 
-				}
-			},
-			{
-				headerName		: "실판매금액"
-				, field			: "realOrdAmt"
-				, width			: 100
-				, cellClass		: 'text-right'
-				, valueGetter	: function (params) { 
-					return params.data.realOrdAmt.addComma(); 
-				}
-			},
-			{headerName: "원코드"		, field: "supplyGoodsCd"	, width: 130, cellClass: 'text-center', sortable: true},
-			{
-				headerName		: "정상/이월"
-				, field			: "formalGb"
-				, width			: 100
-				, cellClass		: 'text-center'
-				, sortable		: true 
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.lookupValue(formalGbList, params.data.formalGb); 
-				}
-			},
-			{
-				headerName		: "출고처지정일시"
-				, field			: "delvAssignDt"
-				, width			: 150
-				, cellClass		: 'text-center'
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.toDateTimeFormat(params.data.delvAssignDt); 
-				}
-			},
-			{
-				headerName		: "송장출력일시"
-				, field			: "invoiceDt"
-				, width			: 150
-				, cellClass		: 'text-center'
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.toDateTimeFormat(params.data.invoiceDt); 
-				}
-			},
-			{headerName: "출고택배사"		, field: "shipCompNm"	, width: 150, cellClass: 'text-center'},
-			{headerName: "출고송장"		, field: "invoiceNo"	, width: 150, cellClass: 'text-center'},
-			{
-				headerName		: "출고일시"
-				, field			: "delvResDt"
-				, width			: 150
-				, cellClass		: 'text-center'
-				, valueGetter: function (params) { 
-					return gagaAgGrid.toDateTimeFormat(params.data.delvResDt); 
-				}
-			},
-			{headerName: "품절여부"		, field: "soldoutYn"	, width: 90		, cellClass: 'text-center', sortable: true},
-			{headerName: "품절메모"		, field: "soldoutMemo"	, width: 120	, cellClass: 'text-left'},
-			{
-				headerName		: "품절일시"
-				, field			: "soldoutRegDt"
-				, width			: 150
-				, cellClass		: 'text-center'
-				, valueGetter	: function (params) { 
-					return gagaAgGrid.toDateTimeFormat(params.data.soldoutRegDt); 
-				}
-			},
-			{headerName: "품절처리자", field: "soldoutRegId", width: 120, cellClass: 'text-center'},
-			{headerName: "수취인명"		, field: "recipNm"				, width: 100, cellClass: 'text-center'},
-			{headerName: "수취인연락처"		, field: "recipPhnno"			, width: 120, cellClass: 'text-center'},
-			{headerName: "수취인주소"		, field: "recipAddr"			, width: 500, cellClass: 'text-left'},
-			{
-				headerName		: "배송메모"
-				, field			: "delvMemo"
-				, width			: 200
-				, cellClass		: 'left'
-				, valueGetter: function (params) {
-					var delvMemo = '';
-					if (!gagajf.isNull(params.data.delvMemo)) {
-						delvMemo = fnRemoveEmojis(params.data.delvMemo);
-					}
-					return delvMemo;
-				}
-			},
-			{headerName: "출고메모", field: "dstrbtNote", width: 200, cellClass: 'left'}
-		]
-	}
+		headerName		: "주문자"
+		, field			: "ordNm"
+		, width			: 140
+		, cellClass		: 'text-left'
+		, sortable		: true
+		, cellRenderer	: function (params) {
+			var custNo = '';
+			if (!gagajf.isNull(params.data.custNo)) {
+				custNo = params.data.custNo;
+			}
+			
+			var roleCd = [[${sessionInfo.roleCd}]];
+			if (!roleCd.startsWith("C") && !gagajf.isNull(params.data.custNo)  && params.data.mallGb === '10' ) {
+				return '<a href="javascript:void(0);" onclick=\"cfnOpenCustDetailPopup(' + params.data.custNo + ');\">' + params.value + ' (' + params.data.custId + ')' + '</a>';
+			} else {
+				return params.value + ' (' + params.data.custId + ')';
+			}
+		}
+	},
+	{headerName: "고객고유번호"	, field: "custNo"		, width: 120, cellClass: 'text-center', hide: true},
+	{headerName: "외부몰"		, field: "extmallNm"	, width: 100, cellClass: 'text-center', sortable: true},
+	{headerName: "휴대폰번호"	, field: "orderPhnno"	, width: 120, cellClass: 'text-center', hide: true},
+	{
+		headerName		: "사이트"
+		, field			: "siteCd"
+		, width			: 80
+		, cellClass		: 'text-center'
+		, hide			: true
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.lookupValue(siteCdList, params.data.siteCd); 
+		}
+	},
+	{
+		headerName		: "프론트"
+		, field			: "frontGb"
+		, width			: 80
+		, cellClass		: 'text-center'
+		, sortable		: true
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.lookupValue(frontGbList, params.data.frontGb); 
+		}
+	},
+	{
+		headerName		: "몰구분"
+		, field			: "mallGb"
+		, width			: 60
+		, cellClass		: 'text-center'
+		, hide			: true
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.lookupValue(mallGbList, params.data.mallGb); 
+		}
+	},
+	{
+		headerName		: "주문일시"
+		, field			: "ordDt"
+		, width			: 140
+		, cellClass		: 'text-center'
+		, sortable		: true
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.toDateTimeFormat(params.data.ordDt); 
+		}
+	},
+	{
+		headerName		: "결제수단"
+		, field			: "payMeans"
+		, width			: 100
+		, cellClass		: 'text-center'
+		, hide			: true
+		, valueGetter	: function (params) { 
+			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			: "ordDtlStatNm"
+		, width			: 120
+		, cellClass		: 'text-center'
+		, sortable		: true
+	},
+	{headerName: "출고처", field: "delvLocNm", width: 110, cellClass: 'text-center', sortable: true, hide:true},
+	{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "브랜드"		, field: "brandEnm"		, width: 100	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-center'	, sortable: true},
+	{
+		headerName		: "이미지"
+		, field			: "sysImgNm"
+		, width			: 100
+		, height		: 60
+		, cellClass		: 'text-center'
+		,cellRenderer	: function(params) {
+			return '<img width="60" src="'+ _goodsUrl+ "/" + params.value + '" alt=""  onerror="this.src=\'/image/no.gif\';"/>';
+		}
+	},
+	{headerName: "옵션1"		, field: "colorNm"		, width: 120	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "옵션2"		, field: "optCd2"		, width: 120	, cellClass: 'text-center'	, sortable: true},
+	{
+		headerName		: "외부몰벤더"
+		, field			: "vendorId"
+		, width			: 110
+		, cellClass		: 'text-center'
+		, hide			: true
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.lookupValue(vendorList, params.data.vendorId); 
+		}
+	},
+	{headerName: "외부몰주문번호"	, field: "extmallOrderId"	, width: 120, cellClass: 'textFormat', sortable: true},
+	{headerName: "에이전트주문번호"	, field: "agentOrderId"		, width: 120, cellClass: 'textFormat', sortable: true},
+	{
+		headerName		: "주문수량"
+		, field			: "ordQty"
+		, width			: 80
+		, cellClass		: 'text-center'
+		, valueGetter: function (params) { 
+			return params.data.ordQty.addComma(); 
+		}
+	},
+	{
+		headerName		: "취소수량"
+		, field			: "cnclRtnQty"
+		, width			: 80
+		, cellClass		: 'text-center'
+		, valueGetter	: function (params) { 
+			return params.data.cnclRtnQty.addComma(); 
+		}
+	},
+	{
+		headerName		: "주문금액"
+		, field			: "ordAmt"
+		, width			: 80
+		, cellClass		: 'text-right'
+		, valueGetter	: function (params) { 
+			return params.data.ordAmt.addComma(); 
+		}
+	},
+	{
+		headerName		: "취소/반품금액"
+		, field			: "cnclRtnAmt"
+		, width			: 120
+		, cellClass		: 'text-right'
+		, valueGetter	: function (params) { 
+			return params.data.cnclRtnAmt.addComma(); 
+		}
+	},
+	{
+		headerName		: "총할인금액"
+		, field			: "totDcAmt"
+		, width			: 120
+		, cellClass		: 'text-right'
+		, valueGetter: function (params) { 
+			return params.data.totDcAmt.addComma(); 
+		}
+	},
+	{
+		headerName		: "실판매금액"
+		, field			: "realOrdAmt"
+		, width			: 100
+		, cellClass		: 'text-right'
+		, valueGetter	: function (params) { 
+			return params.data.realOrdAmt.addComma(); 
+		}
+	},
+	{
+		headerName		: "정상/이월"
+		, field			: "formalGb"
+		, width			: 100
+		, cellClass		: 'text-center'
+		, sortable		: true 
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.lookupValue(formalGbList, params.data.formalGb); 
+		}
+	},
+	{
+		headerName		: "출고처지정일시"
+		, field			: "delvAssignDt"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.toDateTimeFormat(params.data.delvAssignDt); 
+		}
+	},
+	{
+		headerName		: "송장출력일시"
+		, field			: "invoiceDt"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.toDateTimeFormat(params.data.invoiceDt); 
+		}
+	},
+	{headerName: "출고택배사"		, field: "shipCompNm"	, width: 150, cellClass: 'text-center'},
+	{headerName: "출고송장"		, field: "invoiceNo"	, width: 150, cellClass: 'text-center'},
+	{
+		headerName		: "출고일시"
+		, field			: "delvResDt"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, valueGetter: function (params) { 
+			return gagaAgGrid.toDateTimeFormat(params.data.delvResDt); 
+		}
+	},
+	{headerName: "품절여부"		, field: "soldoutYn"	, width: 90		, cellClass: 'text-center', sortable: true},
+	{headerName: "품절메모"		, field: "soldoutMemo"	, width: 120	, cellClass: 'text-left'},
+	{
+		headerName		: "품절일시"
+		, field			: "soldoutRegDt"
+		, width			: 150
+		, cellClass		: 'text-center'
+		, valueGetter	: function (params) { 
+			return gagaAgGrid.toDateTimeFormat(params.data.soldoutRegDt); 
+		}
+	},
+	{headerName: "품절처리자", field: "soldoutRegId", width: 120, cellClass: 'text-center'},
+	{headerName: "수취인명"		, field: "recipNm"				, width: 100, cellClass: 'text-center'},
+	{headerName: "수취인연락처"		, field: "recipPhnno"			, width: 120, cellClass: 'text-center'},
+	{headerName: "수취인주소"		, field: "recipAddr"			, width: 400, cellClass: 'text-left'},
+	{
+		headerName		: "배송메모"
+		, field			: "delvMemo"
+		, width			: 200
+		, cellClass		: 'left'
+		, valueGetter: function (params) {
+			var delvMemo = '';
+			if (!gagajf.isNull(params.data.delvMemo)) {
+				delvMemo = fnRemoveEmojis(params.data.delvMemo);
+			}
+			return delvMemo;
+		}
+	},
+	{headerName: "출고메모", field: "dstrbtNote", width: 200, cellClass: 'left'}
 ];
 
 var gridOptionsOrderList = gagaAgGrid.getGridOptions(columnDefsOrderList);
@@ -557,6 +552,7 @@ var currOrdNo = '';
 
 // 조회
 $('#btnOrderSearch').on('click', function () {
+	$("#searchForm input[name=pageNo]").val('1');
 	fnSearchList();
 });
 
@@ -664,7 +660,7 @@ $('#searchForm select[name=supplyCompCd]').on('change', function() {
 // 페이징
 $('#searchForm select[name=pageSize]').on('change', function() {
 	$("#searchForm input[name=pageNo]").val('1');
-	fnGoodsListSearch($("#searchForm input[name=searchGb]").val());
+	fnSearchList($("#searchForm input[name=searchGb]").val());
 });
 
 // 초기설정
@@ -685,6 +681,19 @@ var fnRemoveEmojis = function (str) {
 	var regex = /(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g;
 	return str.replace(regex, '');
 };
+
+// 엔터키 조회
+$('#searchForm input[name=orderPhnno], #searchForm input[name=condition]').on('keypress' ,function (event) {
+	if (event.which === 13) {
+		$("#searchForm input[name=pageNo]").val('1');
+		fnSearchList();
+	}
+});
+
+// 휴대폰 자동 하이픈
+$('#searchForm input[name=orderPhnno]').on('input keyup keydown paste change', function () {
+	cfnCellPhonnHypen(this);
+});
 </script>
 
 </html>