Merge remote-tracking branch 'origin/master'
This commit is contained in:
이경숙
@@ -84,6 +84,14 @@
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<c:if test="${bbs.bbscttTot eq 0 }" >
|
||||
<c:choose>
|
||||
<c:when test = "${bbs.bbsTyCd eq '06' || bbs.bbsTyCd eq '07'}">
|
||||
<c:set var = "url" value = "/mngr/bbs/rvw/selectRvwListInqireForm?bbsId="/>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var = "url" value = "/mngr/bbs/gnrlsctt/selectBbscttListInqireForm?bbsId="/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<tr>
|
||||
<td colspan="4">등록된 게시글이 없습니다.</td>
|
||||
</tr>
|
||||
|
||||
@@ -33,6 +33,9 @@
|
||||
$(this).val(input.replace(/[^0-9]/g, "").replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,"));
|
||||
});
|
||||
|
||||
//실판매가 세팅
|
||||
fn_cal_selpric();
|
||||
|
||||
const expsrSetTable = document.getElementById('expsrSet');
|
||||
//노출예약 체크되어있을 경우 enable 처리
|
||||
if($("input[name='expsrDvCd']:checked").val() ==='03'){
|
||||
@@ -504,7 +507,6 @@
|
||||
<input type="hidden" id="expsrBgnDt" name="expsrBgnDt" value="${resultMap.subsvcDtl.expsrBgnDt}">
|
||||
<input type="hidden" id="expsrEndDt" name="expsrEndDt" value="${resultMap.subsvcDtl.expsrEndDt}">
|
||||
<input type="hidden" id="invntryPolicyCdAsIs" value="${resultMap.subsvcDtl.invntryPolicyCd}">
|
||||
<input type="hidden" id="usefulInvntryQy" name="usefulInvntryQy" value="${resultMap.subsvcDtl.usefulInvntryQy}">
|
||||
<spring:eval expression="@environment.getProperty('spring.servlet.multipart.max-file-size')" var="maxFileSize"/>
|
||||
<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.extensions.images')" var="acceptFileExtensions"/>
|
||||
<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
|
||||
@@ -613,7 +615,7 @@
|
||||
<th>실판매가<span class="red-7">*</span></th>
|
||||
<td>
|
||||
<div class="td-inner">
|
||||
<input class="input-text sm number text-right allow-zero" type="text" title="실판매가" id="selpric" name="selpric" maxlength="11" value="${resultMap.subsvcDtl.selpric}" required readonly> 円(엔)
|
||||
<input class="input-text sm number text-right allow-zero" type="text" title="실판매가" id="selpric" name="selpric" maxlength="11" required readonly> 円(엔)
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -633,9 +635,9 @@
|
||||
<caption>구독설정</caption>
|
||||
<colgroup>
|
||||
<col style="width: 12%;">
|
||||
<col>
|
||||
<col style="width: 38%">
|
||||
<col style="width: 12%;">
|
||||
<col>
|
||||
<col style="width: 38%">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
@@ -654,7 +656,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th>판매 상태</th>
|
||||
<td colspan="2">
|
||||
<td>
|
||||
<div class="td-inner">
|
||||
<div class="custom-radio-container">
|
||||
<c:forEach items="${resultMap.subsvcSttusList}" var="subsvcSttus" varStatus="status">
|
||||
@@ -667,6 +669,12 @@
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
<th>판매수량</th>
|
||||
<td>
|
||||
<div class="td-inner">
|
||||
<input class="input-text sm text-right" type="text" title="판매재고수량" id="usefulInvntryQy" name="usefulInvntryQy" value="${resultMap.subsvcDtl.usefulInvntryQy}" readonly>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>노출 여부</th>
|
||||
|
||||
@@ -820,6 +820,7 @@
|
||||
tr += ' <td class="left">';
|
||||
tr += ' <div class="order-number">';
|
||||
tr += ' <div class="order-number__content ' + ordrSttus + '">';
|
||||
tr += ' <p>' + data.ordrInnb + '</p></br>';
|
||||
tr += ' <button class="fs-13 under-line" onclick="fn_go_dlivy_dtl2(\'' + data.dlivyInnb + '\', \'' + data.ordrInnb + '\'); return false;">' + data.dlivyCdNb + '</button>';
|
||||
tr += ' <div class="order-number__btn-container">';
|
||||
tr += ' <button type="button" onclick="fn_go_ordr_dtstmn_dwld_popup(\'' + data.dlivyInnb + '\', \'' + data.ordrInnb + '\')">';
|
||||
@@ -1947,7 +1948,7 @@
|
||||
<th>번호</th>
|
||||
<th>원주문</th>
|
||||
<th>상태변경일시</th>
|
||||
<th>출고번호</th>
|
||||
<th>주문번호</br>출고번호</th>
|
||||
<th>출고상품</th>
|
||||
<th>수(종)</th>
|
||||
<th>받는분/주문자</th>
|
||||
|
||||
@@ -398,9 +398,16 @@
|
||||
|
||||
const currOrdrSttusCd = tr.replace('order-sttus-cd-', '');
|
||||
const chgOrdrSttusCd = $(this).attr('id').replace('ordrSttus', '');
|
||||
const hasSubsvc = $(rowCheckboxs).is(function() {
|
||||
return $(this).closest('tr').find('input[name="subsvcAt"]').val() === 'Y';
|
||||
});
|
||||
|
||||
let msg = '';
|
||||
|
||||
if (chgOrdrSttusCd === '35' && hasSubsvc) {
|
||||
alert('구독서비스의 상품준비 처리는 "구독서비스 상품준비 관리" 화면에서 처리해주세요.');
|
||||
return;
|
||||
}
|
||||
if ('35' === chgOrdrSttusCd) {
|
||||
msg = '선택된 주문의 \'' + fn_get_code_nm('sttusCd', currOrdrSttusCd) + '\' → \'' + fn_get_code_nm('sttusCd', chgOrdrSttusCd) + '\'로 변경하시겠습니까?';
|
||||
} else {
|
||||
@@ -856,6 +863,7 @@
|
||||
}else{
|
||||
tr += '일반';
|
||||
}
|
||||
tr += '<input type="hidden" name="subsvcAt" value="' + data.subsvcAt + '">';
|
||||
tr += ' </td>';
|
||||
tr += ' <td>' + data.ordrRceptDt + '</td>';
|
||||
tr += ' <td>' + fn_nvl(data.sleEnvrnNm, '') + '</td>';
|
||||
|
||||
@@ -102,9 +102,14 @@
|
||||
const ordrInnb = $('#ordrInnb').text();
|
||||
const chgOrdrSttusCd = ($(this).attr('class').split(' ')[0]).replace('btn-ordr-sttus-', '');
|
||||
const currOrdrSttusCd = '${data.dtl.ordrSttusCd}';
|
||||
const subsvcAt = '${data.dtl.subsvcAt}';
|
||||
|
||||
if (chgOrdrSttusCd === '35' && subsvcAt === 'Y') {
|
||||
alert('구독서비스의 상품준비 처리는 "구독서비스 상품준비 관리" 화면에서 처리해주세요.');
|
||||
return;
|
||||
}
|
||||
|
||||
let msg = '선택된 주문을 \'' + fn_get_code_nm('sttusCd', chgOrdrSttusCd) + '\' 처리 하시겠습니까?';
|
||||
|
||||
if (confirm(msg)) {
|
||||
fn_post_ordr_sttus([ordrInnb], chgOrdrSttusCd, currOrdrSttusCd);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user