Просмотр исходного кода

카테고리별상품전시관리 leaf 카테고리일 경우 상품 조회 처리

eskim 5 лет назад
Родитель
Сommit
2fe3524cd6

+ 25 - 9
src/main/java/com/style24/admin/biz/web/TsaDisplayController.java

@@ -2,27 +2,43 @@ package com.style24.admin.biz.web;
 
 import java.util.Collection;
 
-import com.gagaframework.web.parameter.GagaMap;
-import com.gagaframework.web.util.GagaDateUtil;
-import com.style24.admin.biz.service.TsaBusinessService;
-import com.style24.admin.support.security.session.TsaSession;
-import com.style24.core.biz.service.TscLookbookService;
-import com.style24.core.biz.service.TscPopupService;
-import com.style24.persistence.TscPageRequest;
-import com.style24.persistence.domain.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.style24.admin.biz.service.TsaBusinessService;
 import com.style24.admin.biz.service.TsaDisplayService;
 import com.style24.admin.biz.service.TsaRendererService;
 import com.style24.admin.support.controller.TsaBaseController;
+import com.style24.admin.support.security.session.TsaSession;
+import com.style24.core.biz.service.TscLookbookService;
+import com.style24.core.biz.service.TscPopupService;
 import com.style24.core.support.message.TscMessageByLocale;
+import com.style24.persistence.TscPageRequest;
+import com.style24.persistence.domain.Brand;
+import com.style24.persistence.domain.Category;
+import com.style24.persistence.domain.CategoryGoods;
+import com.style24.persistence.domain.Contents;
+import com.style24.persistence.domain.GnbTab;
+import com.style24.persistence.domain.GoodsCategory;
+import com.style24.persistence.domain.ItemkindCategory;
+import com.style24.persistence.domain.Lookbook;
+import com.style24.persistence.domain.LookbookGoods;
+import com.style24.persistence.domain.MainDisplay;
+import com.style24.persistence.domain.Popup;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
+import com.gagaframework.web.util.GagaDateUtil;
 
 /**
  * 전시 Controller

+ 44 - 9
src/main/webapp/WEB-INF/views/display/CategoryGoodsForm.html

@@ -460,7 +460,7 @@
 	 * 검색폼의 카테고리 선택 시
 	 */
 	var fnChangeSearchCondition = function(val, selLvl) {
-		if (gagajf.isNull(val)) {
+		/* if (gagajf.isNull(val)) {
 			if (selLvl > 1) {
 				selLvl = selLvl - 1;
 				if(gagajf.isNull($("#selCate2").val())){
@@ -481,7 +481,7 @@
 				$("#goodsSearch").hide();
 				$("#btnGoodsEdit").hide();
 			}
-		}
+		} */
 		$('#searchForm input[name=selLvl]').val(selLvl);
 		$("#searchForm input[name=searchGb]").val("BASIC");
 
@@ -508,26 +508,47 @@
 			}
 		}
 
+		let leafYn = "Y";
 		let tag = '';
 		for (let i = 0; i < data.length; i++) {
 			if (data[i].useYn == 'Y') {
 				tag += '<option value="' + data[i].cateNo + '">[' + data[i].cateNo + '] ' + data[i].cateNm + '</option>';
+				leafYn = "N";
 			}
 		}
-
+		
 		$("#selCate" + selLvl).append(tag);
 
 		// 대카테고리 이상이면 상품 조회해서 그리드
 		if(selLvl > 2){
-			if(data.length<1){
+			/* if(data.length<1){
 				$("#cateLeafYn").val('Y');
 				$("#cateCd").val($("#selCate"+(selLvl-1)).val());
 			}else{
 				$("#cateLeafYn").val('N');
 				$("#cateCd").val('');
-			}
+			} 
 			$('#searchForm input[name=selLvl]').val(selLvl);
 			fnCategoryGoodsListSearch();
+			*/
+			
+			if(leafYn == "Y"){
+				$("#cateLeafYn").val('Y');
+				$("#cateCd").val($("#selCate"+(selLvl-1)).val());
+				$('#searchForm input[name=selLvl]').val(selLvl);
+				$("#btnGoodsEdit").show();
+				$("#addCategory").show();
+				$("#goodsSearch").show();
+				fnCategoryGoodsListSearch();
+			}else{
+				$("#cateLeafYn").val('N');
+				$("#cateCd").val('');
+				$("#btnGoodsEdit").hide();
+				$("#addCategory").hide();
+				$("#goodsSearch").hide();
+				fnGridInit();
+				
+			}
 		}
 	}
 
@@ -536,13 +557,16 @@
 		gagaPaging.init('searchForm', fnSearchCallBack, 'categoryGoodsListPagination', $('#searchForm').find('#pageSize').val());
 		gagaPaging.load(1);
 		if($("#cateLeafYn").val()=='Y'){
-			$("#addCategory").show();	// 상품이동/복사 show
+			/* $("#addCategory").show();	// 상품이동/복사 show
 			$("#btnAddGoods").show();	// [상품추가] show
-			$("#btnDispChange").show();	// [순서변경] show
+			$("#btnDispChange").show();	// [순서변경] show */
+			$("#btnGoodsEdit").show();
+			$("#addCategory").show();
+			$("#goodsSearch").show();
 		}else{
-			$("#addCategory").hide();	// 상품이동/복사 hide
+			/* $("#addCategory").hide();	// 상품이동/복사 hide
 			$("#btnAddGoods").hide();	// [상품추가] hide
-			$("#btnDispChange").hide();	// [순서변경] hide
+			$("#btnDispChange").hide();	// [순서변경] hide */
 		}
 	}
 
@@ -715,6 +739,17 @@
 			}
 		});
 	});
+	
+	// 그리드 초기화
+	var fnGridInit = function() {
+		$("#gridList").html('');
+		gagaAgGrid.createGrid('gridList', gridOptions);
+		$("#categoryGoodsListPagination").html('');
+		$("#gridRowTotalCount").html('0');
+		$("#pgNo").html('0');
+		$("#endPgNo").html('0');
+		$(window).scrollTop(0);
+	}
 
 	$(document).ready(function() {
 		// Create a agGrid