|
@@ -339,7 +339,7 @@
|
|
</td>
|
|
</td>
|
|
<td>${s.income}</td>
|
|
<td>${s.income}</td>
|
|
<td>
|
|
<td>
|
|
- <label class="clubFreight">
|
|
|
|
|
|
+ <label class="clubFreight" style="display: none">
|
|
<c:choose>
|
|
<c:choose>
|
|
<c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
|
|
<c:when test="${s.freight != -1 && s.freight != 0 && s.freight != -2 && s.returnedFreightFlag ne true}">
|
|
<fmt:formatNumber value="${s.freight}"/>
|
|
<fmt:formatNumber value="${s.freight}"/>
|
|
@@ -378,7 +378,7 @@
|
|
style="text-decoration: underline">${s.receiptTotalFee}</a>
|
|
style="text-decoration: underline">${s.receiptTotalFee}</a>
|
|
</td>
|
|
</td>
|
|
<td>
|
|
<td>
|
|
- <label class="discountFee">
|
|
|
|
|
|
+ <label class="discountFee" style="display: none">
|
|
<c:choose>
|
|
<c:choose>
|
|
<c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
|
|
<c:when test="${s.discountTotalFee gt 0 && s.discountTotalFee gt s.returnedPurchaseTotalFee}">
|
|
<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
|
|
<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"/>
|