08.04

src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -112,6 +112,9 @@
 		<!-- 리스트 영역 -->
 		<div class="panelStyle">
 			<ul class="panelBar">
+				<li class="left">
+				<font color=red> <b> ※</b></font>  <font color=#FE2E2E>추가비용, CS메모는  입력항목 입니다.</font> 
+				</li>
 				<li class="right">
 					검색결과 : <strong><span id="gridRowTotalCount">0</span> 건</strong>&nbsp;
 					쪽번호 <span id="pgNo">0</span>/ <strong id="endPgNo">0</strong>&nbsp;&nbsp;
@@ -152,7 +155,7 @@
 	var columnDefs = [
 		{headerName: "반품예외처리번호",		field: "recallExceptionNo", width: 50,	cellClass: 'text-center', hide: true},
 		//{headerName: "No.",				field: "rnum",				width: 50,	cellClass: 'text-center'},
-		{headerName: "처리완료",			field: "recall",		width: 100,	cellClass: 'text-center',
+		{headerName: "처리완료",				field: "recall",		width: 100,	cellClass: 'text-center',
 			/*
 			rowSpan: params => params.data.rowspanRank === 1 ? params.data.rowspanCnt : 1,  
 		    cellClassRules: {
@@ -170,25 +173,7 @@
 				return btnText;
 			}			
 		},
-		{headerName: "처리상태",			field: "statNm",		width: 80,	cellClass: 'text-center'
-			/*
-			rowSpan: params => params.data.rowspanRank === 1 ? params.data.rowspanCnt : 1,  
-			    cellClassRules: {
-			        'cell-span': "data.rowspanRank == 1"
-			      }, 
-				cellRenderer: function(params) {
-					var btnText = '';
-					if(params.data.recallStat == 'P') {
-						if(params.data.chgStat == 'G685_21' || params.data.chgStat == 'G685_51'){
-							btnText= '추가결제대기';
-						} else {
-							btnText= '대기';
-						}
-					} else { btnText = '완료' }
-					return btnText;
-				}	
-			      */
-			},		
+		{headerName: "처리상태",			field: "statNm",		width: 80,	cellClass: 'text-center'},
 		{headerName: "주문번호",			field: "orderNo",			width: 100,	cellClass: 'text-center', 
 			/*
 			rowSpan: params => params.data.rowspanRank === 1 ? params.data.rowspanCnt : 1,  
@@ -216,7 +201,34 @@
 			*/	
 				cellRenderer	: function(params) {
 					var rtnStr = "";
+					if(params.data.recallStat === 'P') {
+						if(params.data.chgGb == 'EXC' || params.data.chgGb == 'WEXC'){
+							rtnStr = params.value;
+						} else {
+							var paramData 	= params.data.orderNo;
+							paramData 		+= '@' + params.data.orderDtlNo;
+							paramData 		+= '@' + params.data.delvFeeCd;
+							paramData 		+= '@' + 'WMS';
+							
+							// 반품접수, 반품대기, 회수요청, 상품검수중, 결제대기, 반품진행중
+							if (params.data.chgStat == 'G685_50' || params.data.chgStat == 'G685_51' 
+									|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_33') {
+								rtnStr = '<a href="javascript:void(0);" onclick="fnReturnRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+							}
+							// 교환접수, 교환대기, 회수요청, 상품검수중, 결제대기, 교환진행중
+							else if (params.data.chgStat == 'G685_20' || params.data.chgStat == 'G685_21' 
+									|| params.data.chgStat == 'G685_30' || params.data.chgStat == 'G685_31' || params.data.chgStat == 'G685_32' || params.data.chgStat == 'G685_34') {
+								rtnStr = '<a href="javascript:void(0);" onclick="fnExchangeRequest(\'' + paramData + '\',\'' + params.value + '\');">' + params.value + '</a>';
+							} 
+							else {
+								rtnStr = params.value;
+							}
+						}
+					} else {
+						rtnStr = params.value;
+					}
 					
+					/* 
 					var paramData 	= params.data.orderNo;
 					paramData 		+= '@' + params.data.orderDtlNo;
 					paramData 		+= '@' + params.data.delvFeeCd;
@@ -235,6 +247,8 @@
 					else {
 						rtnStr = params.value;
 					}
+					 */
+					
 					return  rtnStr;
 				}		
 		},
@@ -337,13 +351,19 @@
 				}
 			}
 		},		
-		{headerName: "*추가비용",			field: "csAddFee",		width: 100,	cellClass: 'text-right',editable: true,
+		{headerName: "* 추가비용",  headerClass:'text-point',	field: "csAddFee",		width: 100,	cellClass: 'text-right',editable: true,
 			cellEditor: 'textCellEditor',
 			cellEditorParams: { maxlength: 20, validType: "numeric" }
 		},		
-		{headerName: "*CS메모",			field: "csMemo",		width: 200,	cellClass: 'text-left',editable: true,
+		{headerName: "* CS메모",    headerClass:'text-point',	field: "csMemo",		width: 200,	cellClass: 'text-left',editable: true,
 			cellEditor: 'textCellEditor',
-			cellEditorParams: { maxlength: 1000, required: true }
+			cellEditorParams: { maxlength: 1000, required: true },
+			cellStyle : function(params){
+				var color = "";
+					color = '#ff96689c';
+				return { 'text-color': color};
+			}
+			
 		},			
 		{headerName: "작업자",			field: "userNameCreated",	width: 100,	cellClass: 'text-center'},
 		{headerName: "브랜드명",			field: "brandNm",			width: 150,	cellClass: 'text-center'},
@@ -368,7 +388,7 @@
 		{headerName: "등록일시",			field: "dateCreated",		width: 150,	cellClass: 'text-center'}
 		
 	];
-
+	
 	var gridOptions = gagaAgGrid.getGridOptions(columnDefs);
 	gridOptions.suppressRowTransform =true;
 	//gridOptions.defaultColDef.editable = true;
@@ -376,7 +396,7 @@
 	//gridOptions.columnDefs[10].cellEditor=true;
 	
 	//gridOptions.rowSelection = 'multiple';
-	
+	// gagaAgGrid.columnApi.getColumn("qty").colDef.color = "#FF0000";
 	gridOptions.rowHeight = 35;
 	
 	var currOrdNo ="";

src/main/webapp/ux/plugins/summernote/summernote.css

@@ -60,6 +60,7 @@ mark,.mark{padding:0.2em;background-color:#fcf8e3;}
 .text-uppercase{text-transform:uppercase;}
 .text-capitalize{text-transform:capitalize;}
 .text-muted{color:#777777;}
+.text-point{color:#FF0000;}
 .text-primary{color:#337ab7;}
 a.text-primary:hover,a.text-primary:focus{color:#286090;}
 .text-success{color:#3c763d;}