Merge remote-tracking branch 'TSIT/ST24PRJ-22' into develop

# Conflicts:
#	src/main/webapp/WEB-INF/views/order/CnclCompleteView.html

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

@@ -183,6 +183,24 @@
 						</tbody>
 					</table>
 				</div>
+				
+				<h4>접수자 정보</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:15%;" />
+						<col style="width:35%;" />
+						<col style="width:15%;" />
+						<col />
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>접수자</th>
+							<td id="chclCompleteRegNm"></td>
+							<th>최종수정자</th>
+							<td id="chclCompleteUpdNm"></td>
+						</tr>
+					</tbody>
+				</table>
 				<br>
 			</form>
 		</div>
@@ -493,6 +511,31 @@ $(document).ready(function() {
 		$(".pgGbNm").text(pgGbNm);
 		$(".cardNm").text(cardGbNm);
 		
+		/*
+		$("#spanOrdAmt").text(spanOrdAmt.addComma());
+		$("#spanCnclRtnAmt").text(spanCnclRtnAmt.addComma());
+		$("#spanTotPntDcAmt").text(spanTotPntDcAmt.addComma());
+		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
+		$("#spanPrePntDcAmt").text(spanPrePntDcAmt.addComma());
+		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
+		$("#spanCpn1DcAmt").text(spanCpn1DcAmt.addComma());
+		$("#spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma());
+		$("#spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma());
+		$("#spanDelvCpnDcAmt").text(delvCpnDcAmt.addComma());
+		$("#spanCpnDcAmt").text(spanCpnDcAmt.addComma());
+		$("#spanTmtb1DcAmt").text(spanTmtb1DcAmt.addComma());
+		$("#spanTmtb2DcAmt").text(spanTmtb2DcAmt.addComma());
+		$("#spanTmtbDcAmt").text(spanTmtbDcAmt.addComma());
+		$("#spanGfcdUseAmt").text(spanGfcdUseAmt.addComma());
+		$("#spanRealCnclRtnAmt").text(spanRealCnclRtnAmt.addComma());
+		$("#spanRealDelvAmt").text(realDelvAmt.addComma());
+		$("#spanTotDeliveryFee").text(addPayCost.addComma());
+		$("#spanRefundAmt").text(spanRefundAmt.addComma());
+		*/
+		
+		$('#chclCompleteRegNm').text(cnclRtnCompleteList[0].regNm); // 접수자정보
+		$('#chclCompleteUpdNm').text(cnclRtnCompleteList[0].updNm); // 최종수정자정보
+		
 		// 2021.05.13 높이자동조절
 		var cancelRequestTargetHeight = 50 + (40 * cnclRtnCompleteList.length);
 		$("#gridCnclRtnCompleteList").css("height" , cancelRequestTargetHeight+"px");

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

@@ -218,6 +218,24 @@
 					</tr>
 					</tbody>
 				</table>
+				
+				<h4>접수자 정보</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:15%;" />
+						<col style="width:35%;" />
+						<col style="width:15%;" />
+						<col />
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>접수자</th>
+							<td id="exchRequestRegNm"></td>
+							<th>최종수정자</th>
+							<td id="exchRequestUpdNm"></td>
+						</tr>
+					</tbody>
+				</table>
 			</form>
 		</div>
 	</div>
@@ -1584,11 +1602,11 @@ $(document).ready(function() {
 	
 	// 수량체크
 	fnChangeQty();
+	
+	if (orderChangeDetailList != null) {
+		$('#exchRequestRegNm').text(orderChangeDetailList[0].regNm);
+		$('#exchRequestUpdNm').text(orderChangeDetailList[0].updNm);
+	}
 });
 </script>
 </html>
-
-
-
-
-

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

@@ -945,7 +945,7 @@ var columnDefsOrderChangeInfo = [
 	{
 		headerName		: "요청번호"		
 		, field			: "ordChgSq"		
-		, width			: 100	
+		, width			: 80	
 		, cellClass		: 'text-center'
 		, cellRenderer	: function(params) {
 			var rtnStr = "";
@@ -1003,6 +1003,8 @@ var columnDefsOrderChangeInfo = [
 			return  rtnStr;
 		}
 	},
+	{headerName: "접수자"		, field: "regNm"		, width: 250	, cellClass: 'text-center'},
+	{headerName: "요청구분"		, field: "chgGbNm"		, width: 80		, cellClass: 'text-center'},
 	{headerName: "요청상태"		, field: "chgStatNm"	, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품코드"		, field: "goodsCd"		, width: 100	, cellClass: 'text-center'},
 	{headerName: "상품타입"	, field: "goodsTypeNm"	, width: 100, cellClass: 'text-center',
@@ -1017,18 +1019,18 @@ var columnDefsOrderChangeInfo = [
 		}
 	},
 	{headerName: "SKUCODE"		, field: "optCd"		, width: 100	, cellClass: 'text-center'},
-	{headerName: "옵션1"			, field: "optCd1"		, width: 100	, cellClass: 'text-center', hide : true},
-	{headerName: "옵션2"			, field: "optCd2"		, width: 100	, cellClass: 'text-center', hide : true},
-	{headerName: "수량"			, field: "chgQty"		, width: 100	, cellClass: 'text-center'},
-	{
-		headerName		: "요청일자"		
-		, field			: "regDt"		
-		, width			: 150		
-		, cellClass		: 'text-center'
-		, cellRenderer	: function(params) {
-			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
-		}
-	},
+	{headerName: "옵션1"		, field: "optCd1"		, width: 100	, cellClass: 'text-center', hide : true},
+	{headerName: "옵션2"		, field: "optCd2"		, width: 100	, cellClass: 'text-center', hide : true},
+	{headerName: "수량"			, field: "chgQty"		, width: 80		, cellClass: 'text-center'},
+// 	{
+// 		headerName		: "요청일자"		
+// 		, field			: "regDt"		
+// 		, width			: 150		
+// 		, cellClass		: 'text-center'
+// 		, cellRenderer	: function(params) {
+// 			return !gagajf.isNull(params.value) ? params.value.toDate("YYYYMMDDHHmm").format("YYYY-MM-DD HH:mm") : '';
+// 		}
+// 	},
 	{headerName: "변경사유"		, field: "chgReasonNm"	, width: 100	, cellClass: 'text-center'},
 	{
 		headerName: "회수구분", field: "wdGb", width: 100, cellClass: 'text-center',

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

@@ -262,8 +262,25 @@
 						</tbody>
 					</table>
 				</div>
-				<br>
 				
+				<h4>접수자 정보</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col style="width:15%;" />
+						<col style="width:35%;" />
+						<col style="width:15%;" />
+						<col />
+					</colgroup>
+					<tbody>
+						<tr>
+							<th>접수자</th>
+							<td id="rtnRequestRegNm"></td>
+							<th>최종수정자</th>
+							<td id="rtnRequestUpdNm"></td>
+						</tr>
+					</tbody>
+				</table>
+				<br>
 			</form>
 		</div>
 	</div>
@@ -1974,6 +1991,11 @@ $(document).ready(function() {
 			fnChangeChgReason('G688_17');															// 귀책사유
 		}
 	}
+	
+	if (orderChangeDetailList != null) {
+		$('#rtnRequestRegNm').text(orderChangeDetailList[0].regNm);
+		$('#rtnRequestUpdNm').text(orderChangeDetailList[0].updNm);
+	}
 });
 
 // 2021.06.17 구성상품 내역 팝업 호출