Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/jsh77b' into develop

card007 5 rokov pred
rodič
commit
8eccf82f84

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

@@ -2,7 +2,7 @@
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : OrderListForm.html
+ * @source  : OrderDetailForm.html
  * @desc    : 주문상세화면
  *============================================================================
  * STYLE24
@@ -265,7 +265,7 @@ var columnDefsGoodsInfo = [
 				headerName		: "상태변경"
 				, field			: "ordDtlStatChg"
 				, width			: 120
-				, hide			: true
+				, hide			: false
 				, cellClass		: 'text-center'
 				, cellRenderer	: function (params) {				
 					var strVal 		= "";
@@ -294,6 +294,7 @@ var columnDefsGoodsInfo = [
 					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>";
 					}
@@ -312,6 +313,14 @@ var columnDefsGoodsInfo = [
 					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>";
+					strVal += "	<option value='G013_50'>배송중</option>";
+					strVal += "	<option value='G013_60'>배송완료</option>";
 					strVal += "</select>";
 					
 					return strVal;