|
|
@@ -127,7 +127,7 @@
|
|
|
<div class="operation-block ${order.shopOrderID}" style="position: sticky;">
|
|
|
<shiro:hasPermission name="order:order:edit">
|
|
|
<%--包含订单充值商品就不显示--%>
|
|
|
- <c:if test="${order.status == 0}">
|
|
|
+ <c:if test="${order.status == 0 and order.organizeId != 4}">
|
|
|
<a href="${ctx}/order/confirmOrder?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}"
|
|
|
onclick="return confirmx('是否确认订单?', this.href)">确认订单</a>
|
|
|
</c:if>
|
|
|
@@ -139,7 +139,7 @@
|
|
|
<a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}">发货记录</a>
|
|
|
<a href="${ctx}/bulkpurchase/cmRefundsProduct/toShopOrderRefundRecord.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}&from=2">收付款记录</a>
|
|
|
<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByShopOrder.rpc?orderID=${order.orderID}&shopOrderID=${order.shopOrderID}">退款（退货）记录</a>
|
|
|
- <c:if test="${order.status != 4 and order.payStatus eq 1 and order.receiptStatus eq 1 and order.sendOutStatus eq 1}">
|
|
|
+ <c:if test="${order.status != 4 and order.payStatus eq 1 and order.receiptStatus eq 1 and order.sendOutStatus eq 1 and order.organizeId != 4}">
|
|
|
<a href="${ctx}/order/cancelShopOrder?shopOrderId=${order.shopOrderID}"
|
|
|
onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
|
|
|
</c:if>
|
