|
@@ -319,7 +319,7 @@
|
|
<c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
|
|
</td>
|
|
</td>
|
|
<td> <%-- <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}(${cmDiscernReceipt.orderID})</a>--%>
|
|
<td> <%-- <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNo}(${cmDiscernReceipt.orderID})</a>--%>
|
|
- <c:if test="${cmDiscernReceipt.receiptType eq 2}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}(${cmDiscernReceipt.orderID})</a></c:if>
|
|
|
|
|
|
+ <c:if test="${cmDiscernReceipt.newReceiptType eq 2 && not empty cmDiscernReceipt.shopOrderNos}"><a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}">${cmDiscernReceipt.shopOrderNos}(${cmDiscernReceipt.orderID})</a></c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
|
|
<c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>
|