샵링커 ui 수정

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerGoodsSendForm.html

@@ -38,23 +38,24 @@
 				<div class="panelContent">
 					<table class="frmStyle">
 						<colgroup>
-							<col style="width: 10%;"/>
-							<col style="width: 40%;"/>
-							<col style="width: 10%;"/>
-							<col style="width: 40%;"/>
-							<!-- <col style="width: 10%;"/>
-							<col style="width: 20%;"/> -->
+							<col style="width: 8%;"/>
+							<col style="width: 18%;"/>
+							<col style="width: 8%;"/>
+							<col style="width: 18%;"/>
+							<col style="width: 8%;"/>
+							<col style="width: 19%;"/>
+							<col style="width: 8%;"/>
+							<col style="width: 13%;"/>
 						</colgroup>
 						<tr>
 							<th>전송일자<em class="required" title="필수"></em></th>
 							<td colspan="5" id="sellTerms"></td>
+							<th rowspan="2">상품코드<em class="required" title="필수"></em></th>
+							<td rowspan="2">
+								<textarea class="textareaR3 w90p" name="condition" id="condition"></textarea>
+							</td>
 						</tr>
 						<tr>
-							<th>상품코드<em class="required" title="필수"></em></th>
-							<td>
-								<textarea class="textareaR3 w30p" name="condition" id="condition"></textarea>
-							</td>
-
 							<th>브랜드</th>
 							<td>
 								<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
@@ -63,8 +64,7 @@
 								<span id="brandText"></span>
 								<input type="hidden" name="brandList"/>
 							</td>
-						</tr>
-						<tr>
+
 							<th>API구분</th>
 							<td>
 								<select name="apiType" id="apiType" required="required" data-valid-name="API구분">
@@ -380,7 +380,7 @@
 		params.excelFileNm = result.excelFileNm;
 		params.sid = dateStr;
 
-		// 수량체크 로직 추가(500개 초가사 알림창 표시위함)
+		// 수량체크 로직 추가(500개 초과시 알림창 표시위함)
 		var jsonData = JSON.stringify(params);
 		gagajf.ajaxJsonSubmit(actionUrl+'/chk', jsonData, function(result2) {
 

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -43,16 +43,27 @@
 					<table class="frmStyle">
 						<colgroup>
 							<col style="width:10%;"/>
-							<col/>
-							<col style="width:10%;"/>
-							<col style="width:13%;"/>
+							<col style="width:35%;"/>
 							<col style="width:10%;"/>
-							<col style="width:22%;"/>
+							<col/>
+							<col style="width:8%;"/>
+							<col style="width:12%;"/>
 						</colgroup>
 
 						<tr>
 							<th>배송시작일자</th>
-							<td colspan="5" id="sellTerms"></td>
+							<td colspan="3" id="sellTerms"></td>
+
+							<th rowspan="2">키워드</th>
+							<td rowspan="2">
+								<select name="search" id="search">
+									<option value="ordNo">스타일24주문번호</option>
+									<option value="agentOrderId">샵링커주문번호</option>
+									<option value="extmallOrderId">쇼핑몰주문번호</option>
+									<option value="deliveryInvoice">운송장번호</option>
+								</select>
+								<textarea class="textareaR3 w90p" name="condition" id="condition"></textarea>
+							</td>
 						</tr>
 						<tr>
 							<th>벤더/제휴몰</th>
@@ -77,16 +88,7 @@
 									<option value="error">오류</option>
 								</select>
 							</td>
-							<th>키워드</th>
-							<td>
-								<select name="search" id="search">
-									<option value="agentOrderId">샵링커주문번호</option>
-									<option value="extmallOrderId">쇼핑몰주문번호</option>
-									<option value="ordNo">스타일24주문번호</option>
-									<option value="deliveryInvoice">운송장번호</option>
-								</select>
-								<textarea class="textareaR3 w50p" name="condition" id="condition"></textarea>
-							</td>
+
 						</tr>
 					</table>
 

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerOrderForm.html

@@ -68,21 +68,31 @@
 						<col style="width:10%;"/>
 						<col/>
 						<col style="width:10%;"/>
-						<col style="width:17%;"/>
-						<col style="width:10%;"/>
-						<col style="width:17%;"/>
+						<col style="width:25%;"/>
+						<col style="width:8%;"/>
+						<col style="width:12%;"/>
 					</colgroup>
 
 					<tr>
 						<th>주문수집일자<em class="required" title="필수"></em></th>
-						<td colspan="5">
+						<td colspan="3">
 							<span id="terms">
 							</span>
 						</td>
+
+						<th rowspan="3">키워드</th>
+						<td rowspan="3">
+							<select name="search" id="search">
+								<option value="ordNo">스타일24주문번호</option>
+								<option value="shoplinkerOrderId">샵링커주문번호</option>
+								<option value="mallOrderId">쇼핑몰주문번호</option>
+							</select><br>
+							<textarea class="textareaR3 w90p" name="condition" id="condition"></textarea>
+						</td>
 					</tr>
 					<tr>
 						<th>벤더/제휴몰</th>
-						<td>
+						<td colspan="4">
 							<select name="vendorId" required="required" data-valid-name="벤더">
 								<option th:if="${vendorList}" th:each="oneData, status : ${vendorList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>/
@@ -91,6 +101,8 @@
 								<option th:if="${extmallList}" th:each="oneData, status : ${extmallList}" th:value="${oneData.extmallId}" th:text="${'[' + oneData.extmallId + '] ' + oneData.extmallNm}"></option>
 							</select>
 						</td>
+					</tr>
+					<tr>
 						<th>제휴몰 주문등록 상태</th>
 						<td>
 							<select name="uploadStat">
@@ -99,24 +111,13 @@
 							</select>
 						</td>
 						<th>실패사유</th>
-						<td colspan="3">
+						<td colspan="2">
 							<select name="uploadFailCd">
 								<option value="">[전체]</option>
 								<option th:if="${uploadFailList}" th:each="oneData, status : ${uploadFailList}" th:value="${oneData.cd}" th:text="${'[' + oneData.cd + '] ' + oneData.cdNm}"></option>
 							</select>
 						</td>
 					</tr>
-					<tr>
-						<th>키워드</th>
-						<td colspan="5">
-							<select name="search" id="search">
-								<option value="shoplinkerOrderId">샵링커주문번호</option>
-								<option value="mallOrderId">쇼핑몰주문번호</option>
-								<option value="ordNo">스타일24주문번호</option>
-							</select>
-							<textarea class="textareaR3 w20p" name="condition" id="condition"></textarea>
-						</td>
-					</tr>
 				</table>
 
 				<ul class="panelBar">

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerStockForm.html

@@ -44,24 +44,24 @@
 					<table class="frmStyle">
 						<colgroup>
 							<col style="width: 10%;"/>
-							<col style="width: 23%;"/>
+							<col style="width: 25%;"/>
 							<col style="width: 10%;"/>
-							<col style="width: 23%;"/>
-							<col style="width: 10%;"/>
-							<col style="width: 24%;"/>
+							<col/>
+							<col style="width: 8%;"/>
+							<col style="width: 12%;"/>
 							<col/>
 						</colgroup>
 
 						<tr>
 							<th>전송일자</th>
-							<td colspan="6" id="sellTerms"></td>
+							<td colspan="3" id="sellTerms"></td>
+
+							<th rowspan="2">상품코드<em class="required" title="필수"></em></th>
+							<td rowspan="2">
+								<textarea class="textareaR3 w90p" name="condition" id="condition"></textarea>
+							</td>
 						</tr>
 						<tr>
-							<th>상품코드<em class="required" title="필수"></em></th>
-							<td>
-								<textarea class="textareaR3 w50p" name="condition" id="condition"></textarea>
-							</td>
-
 							<th>브랜드</th>
 							<td>
 								<input type="text" class="w100" name="searchTxt" id="searchTxt" maxlength="20" />
@@ -72,7 +72,7 @@
 							</td>
 
 							<th>IF결과</th>
-							<td colspan="3">
+							<td>
 								<select name="apiResult" id="apiResult">
 									<option value="">[전체]</option>
 									<option value="true">전송완료</option>