kaick преди 1 година
родител
ревизия
fbd1488273
променени са 1 файла, в които са добавени 4 реда и са изтрити 2 реда
  1. 4 2
      src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

+ 4 - 2
src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

@@ -339,8 +339,10 @@
 <%--                <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>--%>
-<%--                <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>
             </td>
             <shiro:hasPermission name="order:cmDiscernReceipt:edit">
             <shiro:hasPermission name="order:cmDiscernReceipt:edit">
                 <td>
                 <td>