Merge branch 'style' into develop

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

@@ -38,6 +38,10 @@
 				<input type="hidden" id="costPrice" name="costPrice" />
 				<input type="hidden" id="repGoodsCd" name="repGoodsCd" /> <!-- 대표상품(딜 가격) -->
 				<input type="hidden" id="frstCfrmDt" name="frstCfrmDt" /> <!-- 최초승인일 -->
+				<!-- 사용자검색어, 검색어 부분 (사용안함 히든처리) 21.11.22 -->
+				<input type="hidden" class="w60p" id="goodsSnm1" name="goodsSnm1"></input>
+				<input type="hidden" id="goodsSnm1Org" name="goodsSnm1Org"/>
+				<input type="hidden" id="goodsSnm" name="goodsSnm"></input>
 
 			<div class="panelContent">
 				<table class="frmStyle">
@@ -105,7 +109,7 @@
 									</colgroup>
 									<tbody>
 									<tr>
-										<td rowspan="4" style="text-align:center" th:with="uploadGoodsUrl=${@environment.getProperty('upload.goods.view')}">
+										<td rowspan="6" style="text-align:center" th:with="uploadGoodsUrl=${@environment.getProperty('upload.goods.view')}">
 										<img id="goodsImgUrl" src="" width="130px"/>
 										<input type="hidden" name="sysImgNm" id="sysImgNm" />
 										</td>
@@ -124,6 +128,7 @@
 											<input type="hidden" id="goodsNmOrg" name="goodsNmOrg"/>
 										</td>
 									</tr>
+									<!-- 21.11.22 사용안함으로 변경, 상단 히든으로 정의(기존데이터용)
 									<tr>
 										<th>사용자검색어</th>
 										<td colspan="5">
@@ -136,12 +141,10 @@
 										<th>검색어</th>
 										<td colspan="5">
 											<textarea class="textareaR2 w100p" id="goodsSnmTxt" name="goodsSnmTxt" disabled="disabled"></textarea>
-											<!-- <input type="text" class="w100p" id="goodsSnmTxt" name="goodsSnmTxt" disabled="disabled"></input> -->
 											<input type="hidden" id="goodsSnm" name="goodsSnm"></input>
 										</td>
-									</tr>
+									</tr> -->
 									<tr>
-										<td class="aC cRed" style="font-weight:bold;"><span id="goodsTypeNm"></span></td> <!-- 상품타입노출 -->
 										<th>정상/이월 구분<em class="required" title="필수"></em></th>
 										<td>
 											<label class="rdoBtn" th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" ><input type="radio" id="formalGb" name="formalGb" th:value="${oneData.cd}" th:text="${oneData.cdNm}" /></label>
@@ -172,7 +175,6 @@
 										</td>
 									</tr>
 									<tr>
-										<td rowspan="13">&nbsp;</td>
 										<th>시즌<em class="required" title="필수"></em></th>
 										<td >
 											<select  name="seasonCd" id="seasonCd">
@@ -230,6 +232,7 @@
 										</td>
 									</tr>
 									<tr class="chk_deal">
+										<td class="aC cRed" style="font-weight:bold;"><span id="goodsTypeNm"></span></td> <!-- 상품타입노출 -->
 										<th>상품연령대</th>
 										<td>
 											<select  name="ageGrpCd" id="ageGrpCd">
@@ -248,6 +251,7 @@
 										<td><span id="priceUpdDtTxt"></span></td>
 									</tr>
 									<tr>
+										<td rowspan="11">&nbsp;</td>
 										<th>정상가</th>
 										<td class="aR"><span id="listPriceTxt"></span> 원
 											<input type="hidden" id="listPrice" name="listPrice"/>
@@ -386,7 +390,7 @@
 											<button type="button" class="btn btn-success btn-lg" id="btnGoodsSafetyCertNum">안전인증</button>
 										</td> -->
 										<th>판매기간<em class="required" title="필수"></em></th>
-										<td colspan="3">
+										<td colspan="5">
 											<input name="sellStYMD" id="sellStYMD" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="판매시작일" />
 											<select name="sellStHH" id="sellStHH" required="required" data-valid-name="판매 시작시간">
 												<th:block th:each="num, index  : ${#numbers.sequence(0,23)}">

src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -38,11 +38,11 @@
 				<table class="frmStyle">
 					<colgroup>
 						<col width="9%"/>
-						<col width="16%"/>
+						<col width="18%"/>
 						<col width="9%"/>
-						<col width="16%"/>
+						<col width="15%"/>
 						<col width="9%"/>
-						<col width="16%"/>
+						<col width="15%"/>
 						<col width="9%"/>
 						<col/>
 					</colgroup>
@@ -57,43 +57,46 @@
 								<option value="">[전체]</option>
 							</select>
 						</td>
-						<th>품목</th>
-						<td colspan="3">
-							<select name="itemkindCd" id="itemkindCd">
+						
+						<th>정상/이월 구분</th>
+						<td>
+							<select  name="formalGb" id="formalGb">
 								<option value="">[전체]</option>
-								<option th:if="${itemkindList}" th:each="oneData, status : ${itemkindList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-					</tr>
-					<tr>
-						<th>키워드<em class="required" title="필수"></em></th>
-						<td colspan="3">
+						<th rowspan="4">키워드<em class="required" title="필수"></em></th>
+						<td rowspan="4">
 							<select name="search" id="search">
 								<option value="searchGoodsCd">상품코드</option>
 								<option value="searchGoodsNm">상품명</option>
 								<option value="searchGoodsNum">품번</option>
 								<option value="searchSupplyGoodsCd">업체상품코드</option>
 							</select>
-							<input type="text" class="w150" name="condition" id="condition" maxlength="50"/>
+							<textarea class="textareaR3 w150" name="condition" id="condition"></textarea>
 						</td>
-						<th>상품상태</th>
-						<td>
-							<select  name="goodsStat" id="goodsStat">
+					</tr>
+					<tr>
+						<th>품목</th>
+						<td colspan="3">
+							<select name="itemkindCd" id="itemkindCd">
 								<option value="">[전체]</option>
-								<option th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${itemkindList}" th:each="oneData, status : ${itemkindList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
-						<th>정상/이월 구분</th>
+						
+						<th>상품상태</th>
 						<td>
-							<select  name="formalGb" id="formalGb">
+							<select  name="goodsStat" id="goodsStat">
 								<option value="">[전체]</option>
-								<option th:if="${formalGbList}" th:each="oneData, status : ${formalGbList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
+								<option th:if="${goodsStatList}" th:each="oneData, status : ${goodsStatList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
+						
 					</tr>
 					<tr>	
 						<th>년도/시즌</th>
-						<td colspan="3">
+						<td>
 							<select  name="styleYear" id="styleYear">
 								<option value="">[전체]</option>
 								<option th:if="${styleYearList}" th:each="oneData, status : ${styleYearList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
@@ -132,7 +135,7 @@
 							</select>
 						</td>
 						<th>재고수량</th>
-						<td colspan="3">
+						<td>
 							<input type="text" class="w70" name="stockQtySt" id="stockQtySt" maxlength="5" data-valid-type="numeric"/> ~ <input type="text" class="w70" name="stockQtyEd" id="stockQtyEd" maxlength="5" data-valid-type="numeric"/>
 						</td>
 					</tr>
@@ -204,7 +207,15 @@
 			valueGetter: function(params) { return cfnGridNumner('goodsSizeStockForm',params.node.rowIndex, 'A');}
 		},
 		{headerName: "브랜드명", field: "brandEnm", width: 130, cellClass: 'text-center'},
-		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
+		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left',
+			cellRenderer: function(params) {
+				if (params.data.sizeSoldoutYn == "Y"){
+					return '<a href="javascript:void(0);" style="color:red">' + params.value + '</a>';
+				}else{
+					return '<a href="javascript:void(0);">' + params.value + '</a>';	
+				}
+			}
+		},
 		{headerName: "품목", field: "itemkindNm", width: 180, cellClass: 'text-left',
 			cellRenderer: function (params) {
 				if (gagajf.isNull( params.value)){
@@ -219,15 +230,7 @@
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsStatList, params.value); },
 			valueParser: function (params) { return gagaAgGrid.lookupKey(goodsStatList, params.newValue); }
 		},
-		{headerName: "상품코드", field: "goodsCd", width: 140, cellClass: 'text-center',
-			cellRenderer: function(params) {
-				if (params.data.sizeSoldoutYn == "Y"){
-					return '<a href="javascript:void(0);" style="color:red">' + params.value + '</a>';
-				}else{
-					return '<a href="javascript:void(0);">' + params.value + '</a>';	
-				}
-			}	
-		},
+		{headerName: "상품코드", field: "goodsCd", width: 140, cellClass: 'text-center'},
 		{headerName: "색상", field: "optCd1", width: 100, cellClass: 'text-center'},
 		{headerName: "사이즈", field: "optCd2", width: 100, cellClass: 'text-center'},
 		{headerName: "품절여부", field: "soldoutYn", width: 100, cellClass: 'text-center',
@@ -272,7 +275,7 @@
 	// Row Click
 	gridOptions.onCellClicked = function(event) {
 		var goodsCd = event.data.goodsCd;
-		if (event.colDef.field == "goodsCd"){
+		if (event.colDef.field == "goodsNm"){
 			cfnOpenGoodsDetailPopup('U',goodsCd);
 		}
 	}