Merge branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git into develop

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

@@ -80,7 +80,7 @@ public class TsaBusinessController extends TsaBaseController {
 		// 정산일
 		mav.addObject("settleDayList", rendererService.getAvailCommonCodeList("G075"));
 
-		mav.setViewName("business/SupplyCompanyForm");
+		mav.setViewName("/business/SupplyCompanyForm");
 
 		return mav;
 	}
@@ -602,7 +602,7 @@ public class TsaBusinessController extends TsaBaseController {
 
 	/**
 	 * 브랜드 목록 화면(팝업)
-	 * @param brandMd - 담당MD 정보
+	 * @param brand - 담당MD 정보
 	 * @return
 	 * @author gagamel
 	 * @since 2020. 11. 4
@@ -616,4 +616,19 @@ public class TsaBusinessController extends TsaBaseController {
 		return mav;
 	}
 
+	/**
+	 * 공급업체 목록 화면(팝업)
+	 * @param brandMd - 담당MD 정보
+	 * @return
+	 * @author xodud1202
+	 * @since 2020. 12. 23
+	 */
+	@GetMapping("/comapny/search/form")
+	public ModelAndView companySearchForm(SupplyCompany company) {
+		ModelAndView mav = new ModelAndView();
+
+		mav.addObject("params", company);
+		mav.setViewName("business/SupplyCompanySearchForm");
+		return mav;
+	}
 }

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

@@ -2,15 +2,13 @@ package com.style24.admin.biz.web;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.util.GagaDateUtil;
-import com.style24.admin.biz.service.TsaCommonService;
-import com.style24.admin.biz.service.TsaMarketingService;
-import com.style24.admin.biz.service.TsaRendererService;
-import com.style24.admin.biz.service.TsaSystemService;
+import com.style24.admin.biz.service.*;
 import com.style24.admin.support.controller.TsaBaseController;
 import com.style24.admin.support.security.session.TsaSession;
 import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.persistence.TsaPageRequest;
 import com.style24.persistence.domain.FreeGoodsPromotion;
+import com.style24.persistence.domain.SupplyCompany;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -40,6 +38,9 @@ public class TsaMarketingController extends TsaBaseController {
 	@Autowired
 	private TsaMarketingService marketingService;
 
+	@Autowired
+	private TsaBusinessService businessService;
+
 	@Autowired
 	private TsaRendererService rendererService;
 
@@ -98,7 +99,7 @@ public class TsaMarketingController extends TsaBaseController {
 	public ModelAndView freeGoodsRegiForm(FreeGoodsPromotion param) {
 		ModelAndView mav = new ModelAndView();
 
-		mav.addObject("params", param);
+		mav.addObject("param", param);
 		mav.setViewName("marketing/FreeGoodsPromotionRegiForm");
 		return mav;
 	}

style24.admin/src/main/java/com/style24/persistence/domain/FreeGoodsPromotion.java

@@ -14,13 +14,14 @@ import lombok.Data;
 @Data
 public class FreeGoodsPromotion extends TscBaseDomain {
 	// 사은품 프로모션
-	private int freeGiftSq;		// 프로모션ID
+	private int freeGiftSq;			// 프로모션ID
 	private String freeGiftName;	// 프로모션명
 	private String freeGiftStat;	// 프로모션 상태
 	private String freeGiftStdt;	// 프로모션 시작일
 	private String freeGiftEddt;	// 프로모션 종료일
 	private String promotionGubun;	// 프로모션 조회 검색 구분
 	private String searchTxt;		// 프로모션 검색 조건
+	private String gbn;				// 팝업 구분 : C=등록, U=수정
 
 	// Pagination
 	private TsaPageRequest pageable;

style24.admin/src/main/java/com/style24/persistence/domain/SupplyCompany.java

@@ -50,9 +50,10 @@ public class SupplyCompany extends TscBaseDomain {
 	private String econtractYn;			// 전자계약여부
 	private String remarks;				// 비고
 	private String useYn;				// 사용여부
+	private String supplyStatNm;		// 입점상태명
 
 	// 검색조건
 	private String searchGb;			// 검색구분
 	private String searchTxt;			// 검색어
-
+	private String callbackFn;			// 콜백함수
 }

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaBusiness.xml

@@ -5,39 +5,40 @@
 	<!-- 공급업체 목록 -->
 	<select id="getSupplyCompanyList" parameterType="SupplyCompany" resultType="SupplyCompany">
 		/* TsaBusiness.getSupplyCompanyList */
-		SELECT SUPPLY_COMP_CD       /*공급업체코드*/
-		     , SUPPLY_COMP_NM       /*공급업체명*/
-		     , BIZ_GB               /*사업자구분*/
-		     , BIZ_NO               /*사업자등록번호*/
-		     , BIZ_KIND             /*업종*/
-		     , BIZ_TYPE             /*업태*/
-		     , OWNER_NM             /*대표자명*/
-		     , BIZ_ZIPCODE          /*사업장우편번호*/
-		     , BIZ_BASE_ADDR        /*사업장기본주소*/
-		     , BIZ_DTL_ADDR         /*사업장상세주소*/
-		     , MAIN_TELNO           /*대표전화번호*/
-		     , MAIN_FAXNO           /*대표팩스번호*/
-		     , HOMEPAGE_URL         /*홈페이지URL*/
-		     , DISTRIBUTION_GB      /*유통구분*/
-		     , SHOT_DELV_YN         /*총알배송여부*/
-		     , SUPPLY_STAT          /*입점상태*/
-		     , MIN_ORD_AMT          /*무료배송비최소주문금액*/
-		     , DELV_FEE             /*배송비*/
-		     , SELL_FEE_RATE        /*판매수수료율*/
-		     , SETTLE_DAY           /*정산일*/
-		     , BANK_CD              /*은행코드*/
-		     , ACCOUNT_NO           /*계좌번호*/
-		     , DEPOSITOR_NM         /*예금주명*/
-		     , CS_CHARGE_NM         /*CS담당자명*/
-		     , CS_CHARGE_TELNO      /*CS담당자전화번호*/
-		     , SETTLE_CHARGE_NM     /*정산담당자명*/
-		     , SETTLE_CHARGE_TELNO  /*정산담당자전화번호*/
-		     , SETTLE_CHARGE_EMAIL  /*정산담당자이메일*/
-		     , BILL_EMAIL           /*계산서이메일*/
-		     , ECONTRACT_YN         /*전자계약여부*/
-		     , REMARKS              /*비고*/
-		     , USE_YN               /*사용여부*/
-		FROM   TB_SUPPLY_COMPANY
+		SELECT SC.SUPPLY_COMP_CD       /*공급업체코드*/
+		     , SC.SUPPLY_COMP_NM       /*공급업체명*/
+		     , SC.BIZ_GB               /*사업자구분*/
+		     , SC.BIZ_NO               /*사업자등록번호*/
+		     , SC.BIZ_KIND             /*업종*/
+		     , SC.BIZ_TYPE             /*업태*/
+		     , SC.OWNER_NM             /*대표자명*/
+		     , SC.BIZ_ZIPCODE          /*사업장우편번호*/
+		     , SC.BIZ_BASE_ADDR        /*사업장기본주소*/
+		     , SC.BIZ_DTL_ADDR         /*사업장상세주소*/
+		     , SC.MAIN_TELNO           /*대표전화번호*/
+		     , SC.MAIN_FAXNO           /*대표팩스번호*/
+		     , SC.HOMEPAGE_URL         /*홈페이지URL*/
+		     , SC.DISTRIBUTION_GB      /*유통구분*/
+		     , SC.SHOT_DELV_YN         /*총알배송여부*/
+		     , SC.SUPPLY_STAT          /*입점상태*/
+		     , (SELECT CD_NM FROM TB_COMMON_CODE CC WHERE SC.SUPPLY_STAT = CC.CD AND CC.CD_GB = 'G010') AS SUPPLY_STAT_NM
+		     , SC.MIN_ORD_AMT          /*무료배송비최소주문금액*/
+		     , SC.DELV_FEE             /*배송비*/
+		     , SC.SELL_FEE_RATE        /*판매수수료율*/
+		     , SC.SETTLE_DAY           /*정산일*/
+		     , SC.BANK_CD              /*은행코드*/
+		     , SC.ACCOUNT_NO           /*계좌번호*/
+		     , SC.DEPOSITOR_NM         /*예금주명*/
+		     , SC.CS_CHARGE_NM         /*CS담당자명*/
+		     , SC.CS_CHARGE_TELNO      /*CS담당자전화번호*/
+		     , SC.SETTLE_CHARGE_NM     /*정산담당자명*/
+		     , SC.SETTLE_CHARGE_TELNO  /*정산담당자전화번호*/
+		     , SC.SETTLE_CHARGE_EMAIL  /*정산담당자이메일*/
+		     , SC.BILL_EMAIL           /*계산서이메일*/
+		     , SC.ECONTRACT_YN         /*전자계약여부*/
+		     , SC.REMARKS              /*비고*/
+		     , SC.USE_YN               /*사용여부*/
+		FROM   TB_SUPPLY_COMPANY SC
 		WHERE  1 = 1
 		<if test="supplyStat != null and supplyStat != ''">
 		AND    SUPPLY_STAT = #{supplyStat}

style24.admin/src/main/webapp/WEB-INF/views/business/SupplyCompanySearchForm.html

@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : SupplyCompanySearchForm.html
+ * @desc    : 공급업체 목록 페이지
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2020.12.23   xodud1202   최초 작성
+ *******************************************************************************
+ -->
+<div class="modalPopup" data-width="500" id="popupCompanyList">
+	<div class="panelStyle">
+		<!-- TITLE -->
+		<div class="panelTitle">
+			<strong>공급업체 목록</strong>
+			<button type="button" class="close" onclick="uifnPopupClose('popupCompanyList');"><em class="fa fa-times"></em></button>
+		</div>
+		<!-- //TITLE -->
+
+		<!-- 검색 조건 -->
+		<div class="panelContent">
+			<form id="searchCompanyListForm" name="searchCompanyListForm" action="#" th:action="@{'/business/supply/company/list'}" onsubmit="$('#btnSearchCompanyList').trigger('click'); return false;">
+
+				<table class="frmStyle" aria-describedby="검색조건">
+					<colgroup>
+						<col style="width:15%;"/>
+						<col/>
+					</colgroup>
+					<tbody>
+					<tr>
+						<th>공급업체명</th>
+						<td>
+							<input type="text" name="searchTxt" th:value="${params.searchTxt}" maxlength="20" onkeypress="if (event.keyCode == 13) { $('#btnSearchCompanyList').trigger('click'); }"/>
+						</td>
+					</tr>
+					</tbody>
+				</table>
+				<ul class="panelBar">
+					<li class="center">
+						<button type="button" class="btn btn-base btn-lg" id="btnSearchCompanyList">조회</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<!-- //검색 조건 -->
+
+		<!-- 리스트 영역 -->
+		<div class="panelContent">
+			<div id="gridComapnyList" style="width: 100%; height: 470px" class="ag-theme-balham"></div>
+		</div>
+		<!-- //리스트 영역 -->
+
+		<!-- 버튼 배치 영역 -->
+		<ul class="panelBar">
+			<li class="right">
+				<button type="button" class="btn btn-info btn-lg" id="btnConfirmCompany">확인</button>
+			</li>
+		</ul>
+	</div>
+
+	<script th:inline="javascript">
+		/*<![CDATA[*/
+		let columnDefsList = [
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{headerName: "공급업체번호", field: "supplyCompCd", width: 120, cellClass: 'text-center'},
+			{headerName: "공급업체국문명", field: "supplyCompNm", width: 150, cellClass: 'text-center'},
+			{headerName: "입점상태", field: "supplyStatNm", width: 150, cellClass: 'text-center'}
+		];
+
+		let gridOptionsCompanyList = gagaAgGrid.getGridOptions(columnDefsList);
+
+		// Row double click
+		gridOptionsCompanyList.onRowDoubleClicked = function(event) {
+			$('#btnConfirmCompany').trigger('click');
+		}
+
+		// 조회
+		$('#btnSearchCompanyList').on('click', function() {
+			// Fetch data
+			gagaAgGrid.fetch($('#searchCompanyListForm').prop('action'), gridOptionsCompanyList, '#searchCompanyListForm');
+		});
+
+		// 확인
+		$('#btnConfirmCompany').on('click', function() {
+			var selectedData = gagaAgGrid.selectedRowData(gridOptionsCompanyList);
+
+			if (selectedData.length == 0) {
+				mcxDialog.alert('선택된 공급업체가 없습니다.');
+				return false;
+			}
+
+			var callbackFn = [[${params.callbackFn}]];
+
+			var jsonData = JSON.stringify(selectedData);
+
+			if (typeof callbackFn != 'undefined' && callbackFn) {
+				if (typeof callbackFn == 'function') {
+					callbackFn(jsonData);
+				} else {
+					if (callbackFn) {
+						if (callbackFn.indexOf("(") == -1) {
+							eval(callbackFn + "(" + jsonData + ")");
+						} else {
+							eval(callbackFn(jsonData));
+						}
+					}
+				}
+				uifnPopupClose('popupCompanyList');
+			}
+		});
+
+		$(document).ready(function() {
+			// Create a agGrid
+			gagaAgGrid.createGrid('gridComapnyList', gridOptionsCompanyList);
+		});
+		/*]]>*/
+	</script>
+
+</div>
+
+</html>

style24.admin/src/main/webapp/WEB-INF/views/marketing/FreeGoodsPromotionRegiForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.11.04   eskim       최초 작성
  *******************************************************************************
  -->	
-	<div class="modalPopup" data-width="1100">
+	<div class="modalPopup frGoodsPro" data-width="1100">
 		<div class="panelStyle" style="max-height:900px;overflow-y:scroll;">
 			<div class="panelTitle">
 				<h2>사은품 프로모션 관리</h2>
@@ -22,6 +22,7 @@
 			</div>
 
 			<form id="freeGoodsPromotionForm" name="freeGoodsPromotionForm" th:method="post" >
+				<input type="hidden" name="gbn" th:value="${param.gbn}" />
 				<div class="panelContent">
 					<ul class="notice">
 						<li>구성상품 등록시 기본값&nbsp;
@@ -47,7 +48,7 @@
 							<col width="10%"/>
 							<col width="50%"/>
 							<col width="10%"/>
-							<col/>
+							<col width="40%"/>
 						</colgroup>
 						<tr>
 							<th>프로모션명<em class="required" title="필수"></em></th>
@@ -95,38 +96,69 @@
 					</div>
 					<!-- //TITLE -->
 					<div class="inner-panelContent">
-						<div><i class="fa fa-info-circle"></i>브랜드/공급업체/상품 중 1가지는 필수로 지정하셔야 합니다.</div>
-						<div><i class="fa fa-info-circle"></i>브랜드와 공급업체는 지정 시, 해당 브랜드의 공급처와 같은 AND조건으로 적용됩니다.(예시:A브랜드 상품 중 B업체 상품만)</div>
-						<div><i class="fa fa-info-circle"></i>공급업체와 브랜드를 적용하시더라도 적용상품은 별개로 등록된 상품을 기준으로 사은품 지급기준으로 적용하실 수 있습니다.</div>
+						<div><i class="fa fa-info-circle"></i> 브랜드/공급업체/상품 중 1가지는 필수로 지정하셔야 합니다.</div>
+						<div><i class="fa fa-info-circle"></i> 브랜드와 공급업체는 지정 시, 해당 브랜드의 공급처와 같은 AND조건으로 적용됩니다.(예시:A브랜드 상품 중 B업체 상품만)</div>
+						<div><i class="fa fa-info-circle"></i> 공급업체와 브랜드를 적용하시더라도 적용상품은 별개로 등록된 상품을 기준으로 사은품 지급기준으로 적용하실 수 있습니다.</div>
 
 						<div class="panelContent">
 							<table class="frmStyle">
 								<colgroup>
 									<col width="10%"/>
-									<col/>
+									<col width="90%"/>
 								</colgroup>
 								<tr>
 									<th>공급업체/브랜드</th>
 									<td>
 										<!-- 수정시 프로모션명 입력 : before -->
-										<div style="width:45%;display:inline-block;">
+										<div class="padding10 wid45">
 											<span>공급업체 설정</span>
-											<div>
-												<input type="button" value="업체 추가" />
-												<input type="button" value="선택 삭제" />
+											<div class="padding10 inner-tb-solid">
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddCompany">업체 추가</button>
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteCompany">선택삭제</button>
 												<span>선택 : 00개</span>
 												<br/>
-												<div style="border:solid 1px black;width:200px;height:200px;"></div>
+												<div id="gridCompanyList" style="width:100%; height:300px;" class="ag-theme-balgam lh60"></div>
+												<table class="frmStyle aC">
+													<thead>
+														<tr>
+															<th style="width:5%;"><label class="chkBox"><input type="checkbox" id="companyAll"/></label></th>
+															<th style="width:30%;">공급처ID</th>
+															<th style="width:55%;">공급업체명</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td><label class="chkBox"><input type="checkbox" class="brand_idx" value="company_idx"/></label></td>
+															<td>1211</td>
+															<td>업체이름</td>
+														</tr>
+													</tbody>
+												</table>
 											</div>
 										</div>
-										<div style="width:45%;display:inline-block;">
+										<div class="padding10 wid45">
 											<span>브랜드 설정</span>
-											<div>
-												<input type="button" value="브랜드 추가" />
-												<input type="button" value="선택 삭제" />
+											<div class="padding10 inner-tb-solid">
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddBrand">브랜드 추가</button>
+												<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteBrand">선택삭제</button>
 												<span>선택 : 00개</span>
 												<br/>
-												<div style="border:solid 1px black;width:200px;height:200px;"></div>
+												<table class="frmStyle aC">
+													<thead>
+														<tr>
+															<th style="width:5%;"><label class="chkBox"><input type="checkbox" id="brandAll"/></label></th>
+															<th style="width:30%;">브랜드ID</th>
+															<th style="width:55%;">브랜드명</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td><label class="chkBox"><input type="checkbox" class="brand_idx" value="brand_idx"/></label></td>
+															<td>1211</td>
+															<td>브랜드이름</td>
+														</tr>
+													</tbody>
+												</table>
 											</div>
 										</div>
 									</td>
@@ -134,11 +166,38 @@
 								<tr>
 									<th>적용상품</th>
 									<td>
-										<input type="button" value="상품 추가" />
-										<input type="button" value="선택 삭제" />
-										<span>선택 : 00개</span>
-										<br/>
-										<div style="border:solid 1px black;width:200px;height:200px;"></div>
+										<div class="padding10">
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddGoods">상품 추가</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteGoods">선택삭제</button>
+											<span>선택 : 00개</span>
+											<br/>
+											<div class="padding10 inner-tb-solid">
+												<table class="frmStyle aC">
+													<thead>
+														<tr>
+															<th style="width:5%;"><label class="chkBox"><input type="checkbox" id="goodsAll"/></label></th>
+															<th style="width:15%;">Product ID</th>
+															<th style="width:15%;">브랜드명</th>
+															<th style="width:35%;">상품명</th>
+															<th style="width:10%;">판매상태</th>
+															<th class="cRed" style="width:10%;">정상가</th>
+															<th class="cRed" style="width:10%;">판매가</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td><label class="chkBox"><input type="checkbox" class="brand_idx" value="brand_idx"/></label></td>
+															<td>1211</td>
+															<td>브랜드이름</td>
+															<td>덕다운패딩</td>
+															<td>판매중</td>
+															<td>202,000</td>
+															<td>199,000</td>
+														</tr>
+													</tbody>
+												</table>
+											</div>
+										</div>
 									</td>
 								</tr>
 							</table>
@@ -160,17 +219,42 @@
 							<table class="frmStyle">
 								<colgroup>
 									<col width="10%"/>
-									<col/>
+									<col width="90%"/>
 								</colgroup>
 								<tr>
 									<th>제외 대상</th>
 									<td>
-										<div>
-											<input type="button" value="상품 추가" />
-											<input type="button" value="선택 삭제" />
+										<div class="padding10">
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddExtGoods">상품 추가</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteExtGoods">선택삭제</button>
 											<span>선택 : 00개</span>
 											<br/>
-											<div style="border:solid 1px black;width:200px;height:200px;"></div>
+											<div class="padding10 inner-tb-solid">
+												<table class="frmStyle aC">
+													<thead>
+														<tr>
+															<th style="width:5%;"><label class="chkBox"><input type="checkbox" id="ExtGoodsAll"/></label></th>
+															<th style="width:15%;">Product ID</th>
+															<th style="width:15%;">브랜드명</th>
+															<th style="width:35%;">상품명</th>
+															<th style="width:10%;">판매상태</th>
+															<th class="cRed" style="width:10%;">정상가</th>
+															<th class="cRed" style="width:10%;">판매가</th>
+														</tr>
+													</thead>
+													<tbody>
+														<tr>
+															<td><label class="chkBox"><input type="checkbox" class="brand_idx" value="brand_idx"/></label></td>
+															<td>1211</td>
+															<td>브랜드이름</td>
+															<td>덕다운패딩</td>
+															<td>판매중</td>
+															<td>202,000</td>
+															<td>199,000</td>
+														</tr>
+													</tbody>
+												</table>
+											</div>
 										</div>
 									</td>
 								</tr>
@@ -193,15 +277,14 @@
 							<table class="frmStyle">
 								<colgroup>
 									<col width="10%"/>
-									<col/>
+									<col width="90%"/>
 								</colgroup>
 								<tr>
 									<th>지급 방법<em class="required" title="필수"></em></th>
 									<td>
 										<div>
-											<span>아래 내용으로 라디오 박스 2개</span>
-											<span>모두 지급 (설정한 사은품을 모두 지급합니다)</span>
-											<span>선택 사은품 (목록 중 1개를 선택하게 합니다)</span>
+											<span><label class="rdoBtn"><input type="radio" name="sendBox"/>모두 지급 (설정한 사은품을 모두 지급합니다)</label></span>
+											<span><label class="rdoBtn"><input type="radio" name="sendBox"/>선택 사은품 (목록 중 1개를 선택하게 합니다)</label></span>
 										</div>
 									</td>
 								</tr>
@@ -209,14 +292,40 @@
 									<th>사은품 조건1<em class="required" title="필수"></em><br/>(최대 2개)</th>
 									<td>
 										<div>
-											<div><i class="fa fa-info-circle"></i>사은품은 최대 <font color="red">5</font>개까지 설정하실 수 있습니다.</div>
-											<div><i class="fa fa-info-circle"></i>구매 금액 조건을 추가하시면 구매 금액 충족 조건에 맞는 것으로 지급됩니다. 구매금액 조건은 최대 2개까지만등록 하실 수 있습니다.</div>
-											<div><i class="fa fa-info-circle"></i>장바구니에 담았을 때의 가격 기준으로 적용됩니다.(주문상품쿠폰(다운로드쿠폰)/장바구니 쿠폰 할인 적용 전 판매가)</div>
+											<div><i class="fa fa-info-circle"></i> 사은품은 최대 <font color="red">5</font>개까지 설정하실 수 있습니다.</div>
+											<div><i class="fa fa-info-circle"></i> 구매 금액 조건을 추가하시면 구매 금액 충족 조건에 맞는 것으로 지급됩니다. 구매금액 조건은 최대 2개까지만등록 하실 수 있습니다.</div>
+											<div><i class="fa fa-info-circle"></i> 장바구니에 담았을 때의 가격 기준으로 적용됩니다.(주문상품쿠폰(다운로드쿠폰)/장바구니 쿠폰 할인 적용 전 판매가)</div>
 											<label for="saleAmt">구매금액</label><input type="text" class="w300" id="saleAmt" /> <br/>
-											<label for="goodsList">사은품 목록</label><input type="button" value="+ 사은품 선택" id="goodsList" /> <!-- 선택 시 팝업 노출 -->
+											<span>사은품 목록</span>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddFreeGoods1">+ 사은품 선택</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteFreeGoods1">선택삭제</button>
+											<input type="button" value="+ 사은품 선택" id="goodsList" /> <!-- 선택 시 팝업 노출 -->
 											<input type="button" value="선택삭제" id="deleteGoodsList" />
 											<br/>
-											<div style="border:solid 1px black;width:200px;height:200px;"></div>
+											<table class="frmStyle aC">
+												<thead>
+													<tr>
+														<th style="width:5%;"><label class="chkBox"><input type="checkbox" id="freeGoodsAll1"/></label></th>
+														<th style="width:15%;">사은품 코드</th>
+														<th style="width:40%;">사은품명</th>
+														<th style="width:10%;">포인트액</th>
+														<th style="width:10%;">지급수량</th>
+														<th style="width:10%;">한정수량</th>
+														<th style="width:10%;">잔여수량</th>
+													</tr>
+												</thead>
+												<tbody>
+													<tr>
+														<td><label class="chkBox"><input type="checkbox" class="brand_idx" value="brand_idx"/></label></td>
+														<td>1211</td>
+														<td>사은품목도리</td>
+														<td><input type="text" class="w100" placeholder="0" /></td>
+														<td><input type="text" class="w100" placeholder="1" /></td>
+														<td><input type="text" class="w100" placeholder="0" /></td>
+														<td>88</td>
+													</tr>
+												</tbody>
+											</table>
 										</div>
 									</td>
 								</tr>
@@ -225,10 +334,34 @@
 									<td>
 										<div>
 											<label for="saleAmt2">구매금액</label><input type="text" class="w300" id="saleAmt2" /> <br/>
-											<label for="goodsList2">사은품 목록</label><input type="button" value="+ 사은품 선택" id="goodsList2" /> <!-- 선택 시 팝업 노출 -->
-											<input type="button" value="선택삭제" id="deleteGoodsList2" />
+											<span>사은품 목록</span>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnAddFreeGoods2">+ 사은품 선택</button>
+											<button type="button" class="btn btnRight btn-success btn-lg" id="btnDeleteFreeGoods2">선택삭제</button>
 											<br/>
-											<div style="border:solid 1px black;width:200px;height:200px;"></div>
+											<table class="frmStyle aC">
+												<thead>
+													<tr>
+														<th style="width:5%;"><label class="chkBox"><input type="checkbox" id="freeGoodsAll2"/></label></th>
+														<th style="width:15%;">사은품 코드</th>
+														<th style="width:40%;">사은품명</th>
+														<th style="width:10%;">포인트액</th>
+														<th style="width:10%;">지급수량</th>
+														<th style="width:10%;">한정수량</th>
+														<th style="width:10%;">잔여수량</th>
+													</tr>
+												</thead>
+												<tbody>
+													<tr>
+														<td><label class="chkBox"><input type="checkbox" class="brand_idx" value="brand_idx"/></label></td>
+														<td>1211</td>
+														<td>사은품목도리</td>
+														<td><input type="text" class="w100" placeholder="0" /></td>
+														<td><input type="text" class="w100" placeholder="1" /></td>
+														<td><input type="text" class="w100" placeholder="0" /></td>
+														<td>88</td>
+													</tr>
+												</tbody>
+											</table>
 										</div>
 									</td>
 								</tr>
@@ -246,7 +379,7 @@
 									<col width="10%"/>
 									<col width="40%"/>
 									<col width="10%"/>
-									<col/>
+									<col width="40%"/>
 								</colgroup>
 								<tr>
 									<th>등록자</th>
@@ -279,10 +412,29 @@
 	</div>
 
 	<script th:inline="javascript">
+		let columnCompanyList = [
+			{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
+			{headerName: "공급처ID", field: "supplyCompCd", width: 120, cellClass: 'text-center'},
+			{headerName: "공급업체명", field: "supplyCompNm", width: 150, cellClass: 'text-center'}
+		];
+		let gridOptionsCompanyList = gagaAgGrid.getGridOptions(columnCompanyList);
+		gridOptionsCompanyList.rowSelection = "multiple";
+
 		$(document).ready(function() {
+			gagaAgGrid.createGrid("gridCompanyList", gridOptionsCompanyList);
 			cfnCreateCalendar('#promotionTerms', 'freegoodsStdt', 'freegoodsEddt', true, '행사기간', 'X');
 		});
 
+		var fnSetPopupBrandInfo = function(result) {
+			// $("#goodsPopupForm input[name=brandCd]").val(result[0].brandCd);
+
+		}
+
+		// 공급업체 설정 업체 추가 버튼 클릭시
+		$('#btnAddCompany').on('click', function() {
+			cfnOpenCompanyListPopup('fnSetPopupBrandInfo');
+		});
+
 		//패널영역 줄이기
 		$(document).on("click",".panelControl .inner-fa-chevron-up", function() {
 			$(this).parent().parent().parent().find(".inner-panelContent").slideUp(100);

style24.admin/src/main/webapp/ux/css/admin.ui.css

@@ -340,6 +340,11 @@ td[rowspan] {border-bottom:1px solid #eee;}
 .qnaClaim .email em {border-bottom:1px solid #aaa;}
 .lineRound {border:2px solid #ccc; border-radius:15px; padding:4px 14px; font-weight:bold;}
 
+/* 사은품 프로모션 등록창 style */
+.frGoodsPro .padding10 {padding:10px;}
+.frGoodsPro .wid45 {width:45%;display:inline-block;}
+.frGoodsPro .inner-tb-solid {border:solid 1px #eee;}
+
 /* 내부 테이블 디자인 */
 .subTable {display:table; width:100%;}
 .subTable dl {display:table; width:100%;}
@@ -876,4 +881,5 @@ table.mtz-monthpicker {border:1px solid #ddd; border-top:none;}
   input[type="date"], input[type="month"], input[type="time"],
   input[type="week"], input[type="number"], input[type="email"],
   input[type="url"]{ font-size:16px;}
-}
+}
+

style24.admin/src/main/webapp/ux/js/admin.popup.js

@@ -698,8 +698,25 @@ var cfnOpenBrandListPopup = function(callbackfn, searchTxt) {
  * @author : xodud1202
  */
 var cfnOpenFreeGoodsPromotionSetPopup = function() {
-	var actionUrl = "/marketing/freeGoodsRegiPopup/form";
+	var actionUrl = "/marketing/freeGoodsRegiPopup/form?gbn=C";
 
 	uifnPopupClose('popupFreeGoodsPromotionRegi');
 	cfnOpenModalPopup(actionUrl, 'popupFreeGoodsPromotionRegi');
+}
+
+/**
+ * @type   : function
+ * @access : public
+ * @desc   : 공급업체 조회 팝업
+ * <pre>
+ *     cfnOpenCompanyListPopup();
+ * </pre>
+ * @since  : 2020/12/23
+ * @author : xodud1202
+ */
+var cfnOpenCompanyListPopup = function(callbackfn) {
+	var actionUrl = "/business/comapny/search/form";
+	if (typeof(callbackfn) != 'undefined') actionUrl += "?callbackFn=" + callbackfn;
+	uifnPopupClose('popupCompanyList');
+	cfnOpenModalPopup(actionUrl, 'popupCompanyList');
 }