메인전시 수정

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -561,7 +561,7 @@
 				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddBrandDescRow(this);">브랜드소개추가</button>';
 			}
 			if(contentsLoc!='SBM005' && contentsLoc!='SBMM005' && contentsLoc!='SGNB001') {
-				html += '<button type="button" class="btn btn-base btn-lg" onclick="fnAddImgPopRow(this);">이미지추가</button>';
+				html += '<button type="button" class="btn btn-base btn-lg" id="addImg'+dataIdx+'" onclick="fnAddImgPopRow(this);">이미지추가</button>';
 			}
 				html += '<button type="button" class="btn btn-base btn-lg" id="addLink'+dataIdx+'" onclick="fnAddLinkPopRow(this);">링크추가</button>';
 		}
@@ -737,6 +737,7 @@
 			$("#addTitle"+dataIdx).click();
 			$("#addSubText"+dataIdx).click();
 			$("#addLink"+dataIdx).click();
+			$("#addImg"+dataIdx).click();
 		}
 
 		if(contentsLoc=='SGNB001'){
@@ -790,6 +791,10 @@
 		$("#mcTable"+tableDataId).find("tr[name=titlePopRow]").find("input[name=title]").val(result[0].planNm);
 		$("#mcTable"+tableDataId).find("tr[name=subTextPopRow]").find("input[name=subText]").val(result[0].dtlTitle1);
 		$("#mcTable"+tableDataId).find("tr[name=linkPopRow]").find("input[name=link]").val('/planning/detail/form?planSq='+result[0].planSq);
+		$("#mcTable"+tableDataId).find("tr[name=imgPopRow]").find("input[name=newImgFile]").val(result[0].mainPimg);
+		$("#mcTable"+tableDataId).find("#bannerPreViewUrlPop_"+tableDataId).attr('src',$("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
+		$("#mcTable"+tableDataId).find("#imgViewPop_"+tableDataId).removeClass("off").addClass("on");
+
 		let stdt = result[0].dispStdt.split(" ");
 		let eddt = result[0].dispEddt.split(" ");
 		let stdtTime;

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -823,6 +823,41 @@
 		cfnOpenGoodsDispOrdChangePopup('', params);
 	};
 
+	$("#btnView").on("click", function (){
+		if(gagajf.isNull($("#viewDate").val())){
+			mcxDialog.alert("미리보기 일시를 입력해 주세요")
+			return;
+		}
+
+		var val = $("#searchForm select[name=cate1No]").val();
+		var cateNo = '';
+		var brandGroupNo = '';
+		if(val.split(',')[1]=='Y'){
+			cateNo = val.split(',')[0];
+		}else{
+			cateNo = $("#searchForm select[name=cate2No]").val().split(',')[0];
+		}
+		if(cateNo=='1711' || cateNo=='1721'){
+			brandGroupNo = $("#searchForm").find("input[name=brandGroupNo]").val();
+		}
+
+		var uriMap = new Map();
+		uriMap.set("1700", "/display/mall/main/form?mobileYn=N");
+		uriMap.set("1720", "/display/mall/main/form?mobileYn=Y");
+		uriMap.set("1712", "/display/category/main/form?mobileYn=N&cateGb=G032_101&cate1No="+cateNo);
+		uriMap.set("1722", "/display/category/main/form?mobileYn=Y&cateGb=G032_101&cate1No="+cateNo);
+		uriMap.set("1711", "/display/brand/main/form?mobileYn=N&brandGroupNo="+brandGroupNo);
+		uriMap.set("1721", "/display/brand/main/form?mobileYn=Y&brandGroupNo="+brandGroupNo);
+		//uriMap.set("22", "/display/brand/list/form?mobileYn=Y");
+		uriMap.set("1713", "/display/outlet/main/form?mobileYn=N&cateGb=G032_103&cate1No="+cateNo);
+		uriMap.set("1723", "/display/outlet/main/form?mobileYn=Y&cateGb=G032_103&cate1No="+cateNo);
+		// uriMap.set("1714", "/goods/detail/form?mobileYn=N&goodsCd=HQM72NJ60G_MT&adminYn=Y");
+		// uriMap.set("1724", "/goods/detail/form?mobileYn=Y&goodsCd=HQM72NJ60G_MT&adminYn=Y");
+		// _front = [[${@environment.getProperty('domain.front')}]];
+		window.open("about:blank").location.href= _frontUrl + uriMap.get(cateNo) + "&preview=Y&viewDt="+$("#viewDate").val().replace(/-/gi, '')+$("#viewTimeHour").val()+$("#viewTimeMin").val()+"00";
+
+	});
+
 	$(document).ready(function() {
 		var today = new Date(_today);
 		var yesterDay = new Date(today.getFullYear(), today.getMonth(), today.getDate()+1).format("YYYY-MM-DD");

src/main/webapp/WEB-INF/views/marketing/PlanPopupForm.html

@@ -184,6 +184,8 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(templateTypeList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(templateTypeList, params.newValue); }
 		},
+		{headerName: "pc이미지"		, field:'mainPimg'	, width:100, cellClass: 'text-right' , hide: true},
+		{headerName: "mobile이미지"		, field:'mainMimg'	, width:100, cellClass: 'text-right' , hide: true},
 		{headerName: "전시순서"		, field:'dispOrd'	, width:100, cellClass: 'text-right' },
 		{headerName: "진행시작일시"		, field:'dispStdt'	, width:150, cellClass: 'text-center'},
 		{headerName: "진행종료일시"		, field:'dispEddt'	, width:150, cellClass: 'text-center'},