Explorar el Código

테스트 수정

eskim hace 4 años
padre
commit
1c8bc30530

+ 0 - 15
src/main/java/com/style24/scm/biz/web/TssGoodsController.java

@@ -176,11 +176,6 @@ public class TssGoodsController extends TssBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		if (!StringUtils.isBlank(goodsSearch.getItemkindList())) {
@@ -227,11 +222,6 @@ public class TssGoodsController extends TssBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		goodsSearch.setRegNo(TssSession.getInfo().getUserNo()); // 엑셀조회시 로그인 사용자의 엑셀 상품조회시 사용
@@ -1543,11 +1533,6 @@ public class TssGoodsController extends TssBaseController {
 		if (!StringUtils.isBlank(goodsSearch.getCondition())) {
 			goodsSearch.setConditionList(goodsSearch.getCondition().replaceAll("\r", "").trim().split("\n"));
 
-			if ("searchExtendGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("EXTEND");
-			} else if ("searchMasterGoodsCd".equals(goodsSearch.getSearch())) {
-				goodsSearch.setSearchGb("MASTER");
-			}
 		}
 
 		if (!StringUtils.isBlank(goodsSearch.getItemkindList())) {

+ 1 - 0
src/main/webapp/WEB-INF/views/goods/GoodsDealForm.html

@@ -261,6 +261,7 @@
 			}
 
 			if(!isExist){
+				idx++;
 				var data = { 
 						  compsGoodsCd: goods.goodsCd
 						, goodsType: 'G056_D'

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

@@ -178,7 +178,7 @@
 						</td>
 						<th>담당MD</th>
 						<td>
-							<select  name="mdId" id="mdId">
+							<select  name="mdNo" id="mdNo">
 								<option value="">[전체]</option>
 								<option th:if="${brandMdList}" th:each="oneData, status : ${brandMdList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
 							</select>

+ 5 - 1
src/main/webapp/WEB-INF/views/goods/GoodsRegisterForm.html

@@ -553,10 +553,14 @@
 	// 인증대상 변경시
 	$("#goodsDetailForm input[name=selCertTargetGb]").bind('click', function () {
 		var certTargetGb = $(this).val();
-		if (certTargetGb == "G083_1"){ 
+		if (certTargetGb == "G083_1"){
+			$("#goodsDetailForm select[name=certFormGb]").val('');
+			$("#goodsDetailForm select[name=certType]").val('');
+			$("#goodsDetailForm input[name=certNum]").val('');
 			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', false);
 			$("#goodsDetailForm select[name=certType]").attr('readonly', false);
 			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);
+			
 		}else{
 			$("#goodsDetailForm select[name=certFormGb]").val('');
 			$("#goodsDetailForm select[name=certType]").val('');

+ 3 - 0
src/main/webapp/WEB-INF/views/goods/GoodsSalfRegisterForm.html

@@ -440,6 +440,9 @@
 	$("#goodsDetailForm input[name=selCertTargetGb]").bind('click', function () {
 		var certTargetGb = $(this).val();
 		if (certTargetGb == "G083_1"){ 
+			$("#goodsDetailForm select[name=certFormGb]").val('');
+			$("#goodsDetailForm select[name=certType]").val('');
+			$("#goodsDetailForm input[name=certNum]").val('');
 			$("#goodsDetailForm select[name=certFormGb]").attr('readonly', false);
 			$("#goodsDetailForm select[name=certType]").attr('readonly', false);
 			$("#goodsDetailForm input[name=certNum]").attr('readonly', false);