Pārlūkot izejas kodu

Merge branch 'develop' into jmh

jmh 4 gadi atpakaļ
vecāks
revīzija
172f1e282b

+ 21 - 6
src/main/webapp/WEB-INF/views/customer/LmsPopupForm2.html

@@ -45,7 +45,9 @@
 						<tr>
 							<th>발신자번호<em class="required" title="필수"></em></th>
 							<td>
-								<input type="text" class="w150" name="callcenterTelNo" data-valid-name="발신자번호" readonly="readonly" th:value="${callBack}" maxlength="11" />
+								<input type="text" class="w150" name="callcenterTelNo" readonly="readonly" data-valid-name="발신자번호"  th:value="${callBack}" maxlength="11" />
+								<label class="rdoBtn"><input type="radio" name="selfYn" value="Y" checked="checked">자사몰 대표번호</label>
+								<label class="rdoBtn"><input type="radio" name="selfYn" value="N">제휴몰 대표번호</label>
 							</td>
 						</tr>
 						<tr>
@@ -53,8 +55,8 @@
 							<td>
 								<span name="topStr">[STYLE24]안녕하세요. 스타일24입니다.</span>
 								<textarea class="textareaR4"  style="resize: none;" name ="content" ></textarea>
-								스타일24 바로가기 : https://www.style24.com<br>
-								스타일24 고객센터 : 1544-5336<br>
+								<span name="topStr2">스타일24 바로가기 : https://www.style24.com <br>스타일24 고객센터 : 1544-5336<br></span> 
+								
 								<span name="count">0</span> / 2000 byte
 							</td>
 						</tr>
@@ -111,8 +113,6 @@
 			return;
 		}
 		
-
-		
 		mcxDialog.confirm("저장하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
@@ -146,7 +146,22 @@
 			$('#lmsForm input[name=maskingCellPhnno]').val(mkCellPhno);
 		}
 	}
-
+	// 자사/입점 변경여부
+	$("#lmsForm input[name=selfYn]").bind('change', function () {
+		var selfYn = $(this).val();
+		if (selfYn == "Y"){
+			 $('#lmsForm input[name=callcenterTelNo]').val("1544-5336");
+			 $('#lmsForm span[name=topStr]').show();
+			 $('#lmsForm span[name=topStr2]').show();
+		}else{
+			 $('#lmsForm input[name=callcenterTelNo]').val("1644-5309");
+			 $('#lmsForm span[name=topStr]').hide();
+			 $('#lmsForm span[name=topStr2]').hide();
+		}
+		
+	});
+	
+	
 	$(document).ready(function() {
 		fnInitDataSet();
 	

+ 2 - 0
src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -197,6 +197,8 @@
 					<option value="100">100개씩 보기</option>
 					<option value="500">500개씩 보기</option>
 					<option value="1000">1000개씩 보기</option>
+					<option value="3000">3000개씩 보기</option>
+					<option value="5000">5000개씩 보기</option>
 				</select>
 				<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 			</li>

+ 1 - 1
src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -289,7 +289,7 @@ var columnDefsGoodsInfo = [
 					}
 				}
 			},
-			{headerName: "SKUCODE"	, field: "skuModelNo"		, width: 140, cellClass: 'text-center'},
+			{headerName: "SKUCODE"	, field: "optCd"		, width: 100, cellClass: 'text-center'},
 			{
 				headerName		: "상품명"
 				, field			: "goodsNm"

+ 1 - 0
src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -376,6 +376,7 @@ var columnDefsOrderList = [
 	},
 	{headerName: "출고처"		, field: "delvLocNm"	, width: 110	, cellClass: 'text-center'	, sortable: true, hide:true},
 	{headerName: "상품코드"	, field: "goodsCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
+	{headerName: "SKUCODE"	, field: "optCd"		, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "브랜드"		, field: "brandGroupNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "구성유형"	, field: "goodsTypeNm"	, width: 100	, cellClass: 'text-center'	, sortable: true},
 	{headerName: "상품명"		, field: "goodsNm"		, width: 200	, cellClass: 'text-left'	, sortable: true},

+ 2 - 0
src/main/webapp/WEB-INF/views/withdraw/RefundRegisterListForm.html

@@ -133,6 +133,8 @@
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
 						<option value="1000">1000개씩 보기</option>
+						<option value="3000">3000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>

+ 2 - 0
src/main/webapp/WEB-INF/views/withdraw/WithdrawDirectiveListForm.html

@@ -136,6 +136,8 @@
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
 						<option value="1000">1000개씩 보기</option>
+						<option value="3000">3000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>

+ 2 - 0
src/main/webapp/WEB-INF/views/withdraw/WithdrawExceptionListForm.html

@@ -124,6 +124,8 @@
 						<option value="100">100개씩 보기</option>
 						<option value="500">500개씩 보기</option>
 						<option value="1000">1000개씩 보기</option>
+						<option value="3000">3000개씩 보기</option>
+						<option value="5000">5000개씩 보기</option>
 					</select>
 					<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
 				</li>