|
@@ -339,8 +339,10 @@
|
|
|
<%-- <c:if test="${cmDiscernReceipt.receiptType != 6}">${cmDiscernReceipt.orders}</c:if>--%>
|
|
|
<%-- <c:if test="${cmDiscernReceipt.receiptType == 6}">-----</c:if>--%>
|
|
|
<%-- <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>--%>
|
|
|
-<%-- <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>--%>
|
|
|
- <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}&shopOrderID=${cmDiscernReceipt.shopOrderId}">子订单${cmDiscernReceipt.shopOrderNo}(${cmDiscernReceipt.shopOrderId})</a>
|
|
|
+ <c:if test="${cmDiscernReceipt.shopOrderId == null}">-----</c:if>
|
|
|
+ <c:if test="${cmDiscernReceipt.shopOrderId != null}">
|
|
|
+ <a href="${ctx}/order/detail?id=${cmDiscernReceipt.orderID}&shopOrderID=${cmDiscernReceipt.shopOrderId}">子订单${cmDiscernReceipt.shopOrderNo}(${cmDiscernReceipt.shopOrderId})</a>
|
|
|
+ </c:if>
|
|
|
</td>
|
|
|
<shiro:hasPermission name="order:cmDiscernReceipt:edit">
|
|
|
<td>
|