이태영 - 2020127 브랜드 조회 팝업 list multi check 옵션 추가

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

@@ -45,6 +45,6 @@ public class Brand extends TscBaseDomain {
 
 	// 검색조건
 	private String searchTxt;		// 검색어
-	private String callbackFn;	// 콜백함수
-
+	private String callbackFn;		// 콜백함수
+	private String multiGb;			// 멀티 셀렉트 구분
 }

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

@@ -65,14 +65,17 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
+	let headerSelection = false;
+	if([[${params.multiGb}]] == "M") headerSelection = true;
 	let columnDefsMdList = [
-		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: false, checkboxSelection: true, filter: false},
+		{width: 40, minWidth: 40, cellClass: 'text-center', headerCheckboxSelection: headerSelection, checkboxSelection: true, filter: false},
 		{headerName: "브랜드번호", field: "brandCd", width: 120, cellClass: 'text-center'},
 		{headerName: "브랜드국문명", field: "brandEnm", width: 150, cellClass: 'text-center'},
 		{headerName: "브랜드영문명", field: "brandKnm", width: 150, cellClass: 'text-center'}
 	];
 
 	let gridOptionsBrandList = gagaAgGrid.getGridOptions(columnDefsMdList);
+	if(headerSelection) {	gridOptionsBrandList.rowSelection = "multiple";	}
 
 	// Row double click
 	gridOptionsBrandList.onRowDoubleClicked = function(event) {

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

@@ -594,7 +594,7 @@
 
 		// 브랜드 추가 버튼 클릭시 (복수 브랜드때 수정 필요)
 		$('#freeGoodsPromotionForm #btnAddBrand').on('click', function() {
-			cfnOpenBrandListPopup("fnSetPopupBrandInfo");
+			cfnOpenBrandListPopup("fnSetPopupBrandInfo", "M");
 		});
 
 		// 적용 상품 추가 버튼 클릭시

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

@@ -680,10 +680,11 @@ var cfnOpenFrontGoodsPopup = function(goodsCd, siteCd) {
  * @since  : 2020/12/15
  * @author : eskim
  */
-var cfnOpenBrandListPopup = function(callbackfn, searchTxt) {
+var cfnOpenBrandListPopup = function(callbackfn, multiGb, searchTxt) {
 	var actionUrl = '/business/brand/search/form';
 	if (typeof(callbackfn) != 'undefined') actionUrl += "?callbackFn=" + callbackfn;
 	if (typeof(searchTxt) != 'undefined') actionUrl += "&searchTxt=" + encodeURIComponent(searchTxt);
+	if (typeof(multiGb) != 'undefined' && multiGb != null && multiGb == "M") actionUrl += "&multiGb=" + multiGb; else actionUrl += "&multiGb=S";
 	cfnOpenModalPopup(actionUrl, "popupBrandList");
 }