Duan_xu 2 سال پیش
والد
کامیت
574f7f94ca
1فایلهای تغییر یافته به همراه1 افزوده شده و 1 حذف شده
  1. 1 1
      src/main/webapp/WEB-INF/views/modules/order/cmDiscernReceiptList.jsp

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

@@ -319,7 +319,7 @@
                 <c:if test="${cmDiscernReceipt.receiptType == 8}">-----</c:if>
             </td>
            <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}">-----</c:if>
                 <c:if test="${cmDiscernReceipt.receiptType == 7}">-----</c:if>