브랜드 상세 수정중

src/main/webapp/WEB-INF/views/business/BrandForm.html

@@ -135,9 +135,15 @@
 					<tr>	
 						<th>공급업체<i class="required" title="필수"></i></th>
 						<td>
-							<select name="supplyCompCd" required="required" data-valid-name="공급업체">
+
+<!-- 							<select name="supplyCompCd" required="required" data-valid-name="공급업체">
 								<option value="">[선택]</option>
 							</select>
+ -->							
+							<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
+							<button type="button" class="btn icn" id="btnSearchSupplyComp"><i class="fa fa-search"></i></button>
+							<input type="text" class="w100" name="supplyCompNm" readonly="readonly"/>
+							<input type="hidden" class="w100" name="supplyCompCd" />
 						</td>
 						<th>유통구분<i class="required" title="필수"></i></th>
 						<td>
@@ -339,7 +345,9 @@
 		$("#detailForm input[name=brandGrpNm]").val(event.data.brandGrpNm);
 		$("#detailForm input[name=erpBrandCd]").val(event.data.erpBrandCd);
 		$("#detailForm select[name=distributionGb]").val(event.data.distributionGb);
-		fnGetSupplyCompCdList(event.data.supplyCompCd, event.data.delvFeeCd);
+		$("#detailForm input[name=supplyCompCd]").val(event.data.supplyCompCd);
+		$("#detailForm input[name=supplyCompNm]").val(event.data.supplyCompNm);
+		//fnGetSupplyCompCdList(event.data.supplyCompCd, event.data.delvFeeCd);
 		
 		// 출고처 정보
 		$.getJSON('/renderer/delvloc/list/' + event.data.supplyCompCd
@@ -354,6 +362,9 @@
 			}
 		);
 		
+		// 배송비 정책
+		cfnCreateCombo('/renderer/delvFee/list/' + event.data.supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]", event.data.delvFeeCd);
+		
 		$("#detailForm input[name=delvFee]").val(Number(event.data.delvFee).addComma());
 		$("#detailForm input[name=minOrdAmt]").val(Number(event.data.minOrdAmt).addComma());
 		$("#detailForm input[name=sellFeeRate]").val(event.data.sellFeeRate);
@@ -415,7 +426,7 @@
 	$('#detailForm select[name=brandGb]').on('change', function() {
 		// 구매포인트적립율 설정
 		fnSetPntRate($(this).val());
-		
+/*		
 		$.getJSON('/renderer/supply/company/list/' + $(this).val()
 			, function(result, status) {
 				$('#detailForm select[name=supplyCompCd]').empty().append('<option value="">[선택]</option>');
@@ -425,10 +436,11 @@
 				});
 				$('#detailForm select[name=supplyCompCd]').trigger('change');
 			});
+*/			
 	});
 	
 	// 공급업체 변경 시
-	$('#detailForm select[name=supplyCompCd]').on('change', function() {
+/*	$('#detailForm select[name=supplyCompCd]').on('change', function() {
 		if (gagajf.isNull($(this).val())) {
 			$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
 			return;
@@ -463,9 +475,9 @@
 			
 		});
 	});
-	
+*/	
 	// 해당공급업체 조회
-	var fnGetSupplyCompCdList = function(supplyCompCd, delvFeeCd){
+/*	var fnGetSupplyCompCdList = function(supplyCompCd, delvFeeCd){
 		$.getJSON('/renderer/supply/company/list/' + $('#detailForm select[name=brandGb]').val()
 			, function(result, status) {
 				$('#detailForm select[name=supplyCompCd]').empty().append('<option value="">[선택]</option>');
@@ -478,7 +490,37 @@
 		
 		cfnCreateCombo('/renderer/delvFee/list/' + supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]", delvFeeCd);
 	}
+*/	
+	// 공급업체 선택시
+	$('#btnSearchSupplyComp').on('click', function() {
+/*
+		if (gagajf.isNull($("#detailForm input[name=searchTxt]").val())){
+			mcxDialog.alert('공급업체 검색어를 입력하세요.');
+			return false;
+		}
+*/		
+		cfnOpenCompanyListPopup('fnSetSupplyCompInfo', 'S', $("#detailForm input[name=searchTxt]").val());
+		
+	});
 	
+	// 공급업체 조회 팝업에서 호출
+	var fnSetSupplyCompInfo = function(result) {
+		$("#detailForm input[name=supplyCompCd]").val(result[0].supplyCompCd);
+		$("#detailForm input[name=supplyCompNm]").val(result[0].supplyCompNm);
+		
+		// 출고처 정보
+		$.getJSON('/renderer/delvloc/list/' + result[0].supplyCompCd
+			, function(delvLocList, status) {
+				$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
+				$.each(delvLocList, function(idx, item) {
+					var optionHtml = '<option value="' + item.cd + '">[' + item.cd + '] '+ item.cdNm + '</option>\n';
+					$('#detailForm select[name=delvLocCd]').append(optionHtml);
+				});
+			}
+		);
+		
+		cfnCreateCombo('/renderer/delvFee/list/' + result[0].supplyCompCd, $('#detailForm select[name=delvFeeCd]'), "[선택]");
+	}
 	
 	// 브랜드담당MD 목록
 	var fnGetBrandMdList = function(brandCd) {
@@ -645,6 +687,7 @@
 		$("#detailForm select[name=brandGb]").trigger('change');
 		$("#detailForm select[name=brandGb]").removeAttr("disabled");
 		$('#detailForm select[name=delvLocCd]').empty().append('<option value="">[선택]</option>');
+		$('#detailForm select[name=delvFeeCd]').empty().append('<option value="">[선택]</option>');
 		
 		$("#detailForm input[type=checkbox]").removeClass("checked");
 		$("#detailForm input[type=checkbox]").parent("label").removeClass("checked");

src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -1079,10 +1079,10 @@
 	// 브랜드 조회 선택시
 	$('#btnSearchBrand').on('click', function() {
 
-		if (gagajf.isNull($("#searchForm input[name=searchTxt]").val())){
+		/* if (gagajf.isNull($("#searchForm input[name=searchTxt]").val())){
 			mcxDialog.alert('브랜드 검색어를 입력하세요.');
 			return false;
-		}
+		} */
 		
 		cfnOpenBrandListPopup('fnSetBrandInfo', 'S', $("#searchForm input[name=searchTxt]").val());