|
|
@@ -660,150 +660,150 @@
|
|
|
${postageInfo}
|
|
|
</c:if>
|
|
|
</td>
|
|
|
- <td style="position: relative;"><a class="operation-btn btn">功能</a>
|
|
|
- <div class="operation-block">
|
|
|
- <shiro:hasPermission name="order:order:edit">
|
|
|
- <%--包含订单充值商品就不显示--%>
|
|
|
- <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
|
|
|
- <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">
|
|
|
- <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7&& order.organizeID != 4}">
|
|
|
- <a href="javascript:void(0);" onclick="collection(${order.orderID})">抹平收款</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.organizeID != 4}">
|
|
|
- <c:if test="${order.organizeID == 0}">
|
|
|
- <c:if test="${order.status == 0}">
|
|
|
- <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"
|
|
|
- onclick="return confirmx('是否确认订单?', this.href)">确认订单</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.status == 0 || order.status == 11}">
|
|
|
- <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"
|
|
|
- onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
|
|
|
- order.status eq 23 || order.status eq 0}">
|
|
|
- <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2 && (order.ableUserMoney > 0 || order.status eq 0)}">
|
|
|
- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">
|
|
|
- <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">
|
|
|
- <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.status == 0}">
|
|
|
- <c:if test="${order.postageOrderFlag == 1}">
|
|
|
- <a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${(order.organizeID == 0 or order.organizeID > 2) && order.status == 11 && order.payStatus == 1}">
|
|
|
- <a href="javascript:void(0);"
|
|
|
- onclick="modelShow('${order.orderID}')">编辑经理折扣</a>
|
|
|
- </c:if>
|
|
|
-
|
|
|
- <c:if test="${order.secondHandOrderFlag ne 1 && order.rebateFlag ne 1 && order.status != 0 && order.status != 6 && order.status != 7 && empty order.rechargeGoods}">
|
|
|
- <a href="javascript:void(0);"
|
|
|
- onclick="rebateFeeEdit('${order.orderID}')">编辑返佣服务费</a>
|
|
|
- </c:if>
|
|
|
-
|
|
|
- <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">
|
|
|
- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
|
|
|
- onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag eq 1}">
|
|
|
- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"
|
|
|
- onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为二手返佣订单</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
-
|
|
|
-
|
|
|
- </shiro:hasPermission>
|
|
|
- <shiro:hasPermission name="order:order:applyrefound">
|
|
|
- <%--线下订单以主订单为单位退款--%>
|
|
|
- <c:if test="${order.onlinePayFlag == 1}">
|
|
|
- <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">
|
|
|
- <%-- 返佣订单不能申请退款（退货） --%>
|
|
|
- <c:if test="${order.rebateOrder == '0'}">
|
|
|
- <c:if test="${order.toAudit eq 1}">
|
|
|
- <%--如果存在审核收款则不允许申请:1不能申请,其它可以申请--%>
|
|
|
- <c:if test="${order.toAudit eq 1}">
|
|
|
- <%--弹窗提示--%>
|
|
|
- <a href="#" onclick="return alertx('订单存在未审核的收款，暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.toAudit ne 1}">
|
|
|
- <c:if test="${order.applyReturnedPurchaseFlag eq 1}">
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"
|
|
|
- <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"
|
|
|
- </c:if>
|
|
|
- >申请退款</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.applyReturnedPurchaseFlag ne 1}">
|
|
|
- <font title="存在未处理完的申请,请前往退款列表处理！">申请退款</font>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </shiro:hasPermission>
|
|
|
-
|
|
|
- <shiro:hasPermission name="order:order:edit">
|
|
|
- <c:if test="${order.organizeID != 4}">
|
|
|
- <c:if test="${(order.rebateOrder == '1' ) && (brokerage == 0) && (order.status != 0)}">
|
|
|
- <a href="${ctx}/order/toChangePay?orderId=${order.orderID}"
|
|
|
- onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.organizeID == 0}">
|
|
|
- <c:if test="${order.status == 11}">
|
|
|
- <c:if test="${order.splitFlag == 1}">
|
|
|
- <a href="${ctx}/order/toSplit?id=${order.orderID}">
|
|
|
- 拆分订单
|
|
|
- </a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <a href="javascript:" onclick="QRCodewin(${order.orderID},'${order.orderNo}')">分享二维码</a>
|
|
|
- <c:if test="${order.status ne 6 && order.status ne 7}">
|
|
|
- <a href="${ctx}/order/editclausecontent?id=${order.orderID}">修改售后条款</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.status ne 0}">
|
|
|
- <a href="${ctx}/order/printOrder?orderID=${order.orderID}">打印发货单</a>
|
|
|
- </c:if>
|
|
|
- <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>
|
|
|
- <%-- <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>--%>
|
|
|
- <c:if test="${order.orderType ==0}">
|
|
|
- <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.orderType !=0}">
|
|
|
- <c:if test="${order.spID!=null}">
|
|
|
- <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
-
|
|
|
-
|
|
|
- <%--包含订单充值商品就不显示--%>
|
|
|
- <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
|
|
|
- <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
|
|
|
- <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收付款记录
|
|
|
- </a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款（退货）记录
|
|
|
- </a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
|
|
|
-
|
|
|
- </shiro:hasPermission>
|
|
|
- </div>
|
|
|
- </td>
|
|
|
+ <%-- <td style="position: relative;"><a class="operation-btn btn">功能</a>--%>
|
|
|
+ <%-- <div class="operation-block">--%>
|
|
|
+ <%-- <shiro:hasPermission name="order:order:edit">--%>
|
|
|
+ <%-- <%–包含订单充值商品就不显示–%>--%>
|
|
|
+ <%-- <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">--%>
|
|
|
+ <%-- <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7&& order.organizeID != 4}">--%>
|
|
|
+ <%-- <a href="javascript:void(0);" onclick="collection(${order.orderID})">抹平收款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.organizeID != 4}">--%>
|
|
|
+ <%-- <c:if test="${order.organizeID == 0}">--%>
|
|
|
+ <%-- <c:if test="${order.status == 0}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('是否确认订单?', this.href)">确认订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status == 0 || order.status == 11}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
|
|
|
+ <%-- order.status eq 23 || order.status eq 0}">--%>
|
|
|
+ <%-- <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2 && (order.ableUserMoney > 0 || order.status eq 0)}">--%>
|
|
|
+ <%-- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status == 0}">--%>
|
|
|
+ <%-- <c:if test="${order.postageOrderFlag == 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${(order.organizeID == 0 or order.organizeID > 2) && order.status == 11 && order.payStatus == 1}">--%>
|
|
|
+ <%-- <a href="javascript:void(0);"--%>
|
|
|
+ <%-- onclick="modelShow('${order.orderID}')">编辑经理折扣</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+
|
|
|
+ <%-- <c:if test="${order.secondHandOrderFlag ne 1 && order.rebateFlag ne 1 && order.status != 0 && order.status != 6 && order.status != 7 && empty order.rechargeGoods}">--%>
|
|
|
+ <%-- <a href="javascript:void(0);"--%>
|
|
|
+ <%-- onclick="rebateFeeEdit('${order.orderID}')">编辑返佣服务费</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+
|
|
|
+ <%-- <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag eq 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为二手返佣订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+
|
|
|
+
|
|
|
+ <%-- </shiro:hasPermission>--%>
|
|
|
+ <%-- <shiro:hasPermission name="order:order:applyrefound">--%>
|
|
|
+ <%-- <%–线下订单以主订单为单位退款–%>--%>
|
|
|
+ <%-- <c:if test="${order.onlinePayFlag == 1}">--%>
|
|
|
+ <%-- <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">--%>
|
|
|
+ <%-- <%– 返佣订单不能申请退款（退货） –%>--%>
|
|
|
+ <%-- <c:if test="${order.rebateOrder == '0'}">--%>
|
|
|
+ <%-- <c:if test="${order.toAudit eq 1}">--%>
|
|
|
+ <%-- <%–如果存在审核收款则不允许申请:1不能申请,其它可以申请–%>--%>
|
|
|
+ <%-- <c:if test="${order.toAudit eq 1}">--%>
|
|
|
+ <%-- <%–弹窗提示–%>--%>
|
|
|
+ <%-- <a href="#" onclick="return alertx('订单存在未审核的收款，暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.toAudit ne 1}">--%>
|
|
|
+ <%-- <c:if test="${order.applyReturnedPurchaseFlag eq 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"--%>
|
|
|
+ <%-- <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- >申请退款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.applyReturnedPurchaseFlag ne 1}">--%>
|
|
|
+ <%-- <font title="存在未处理完的申请,请前往退款列表处理！">申请退款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </shiro:hasPermission>--%>
|
|
|
+
|
|
|
+ <%-- <shiro:hasPermission name="order:order:edit">--%>
|
|
|
+ <%-- <c:if test="${order.organizeID != 4}">--%>
|
|
|
+ <%-- <c:if test="${(order.rebateOrder == '1' ) && (brokerage == 0) && (order.status != 0)}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/toChangePay?orderId=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('确定将该返佣订单直接置为已收款和已付款状态吗？', this.href)">置为已收款已付款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.organizeID == 0}">--%>
|
|
|
+ <%-- <c:if test="${order.status == 11}">--%>
|
|
|
+ <%-- <c:if test="${order.splitFlag == 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/toSplit?id=${order.orderID}">--%>
|
|
|
+ <%-- 拆分订单--%>
|
|
|
+ <%-- </a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <a href="javascript:" onclick="QRCodewin(${order.orderID},'${order.orderNo}')">分享二维码</a>--%>
|
|
|
+ <%-- <c:if test="${order.status ne 6 && order.status ne 7}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/editclausecontent?id=${order.orderID}">修改售后条款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status ne 0}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/printOrder?orderID=${order.orderID}">打印发货单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <a href="${ctx}/order/exportOrder?id=${order.orderID}">订单导出</a>--%>
|
|
|
+ <%-- <%– <a href="javascript:void(0);" onclick="remarks('${order.orderID}','')">备注</a>–%>--%>
|
|
|
+ <%-- <c:if test="${order.orderType ==0}">--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.orderType !=0}">--%>
|
|
|
+ <%-- <c:if test="${order.spID!=null}">--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/commissions?orderId=${order.orderID}">销售提成记录</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+
|
|
|
+
|
|
|
+ <%-- <%–包含订单充值商品就不显示–%>--%>
|
|
|
+ <%-- <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">--%>
|
|
|
+ <%-- <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收付款记录--%>
|
|
|
+ <%-- </a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款（退货）记录--%>
|
|
|
+ <%-- </a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>--%>
|
|
|
+
|
|
|
+ <%-- </shiro:hasPermission>--%>
|
|
|
+ <%-- </div>--%>
|
|
|
+ <%-- </td>--%>
|
|
|
</tr>
|
|
|
<c:if test="${order.svipFullReduction gt 0}">
|
|
|
<tr>
|
|
|
@@ -831,51 +831,131 @@
|
|
|
<div class="order-rows">
|
|
|
<span><label>下单时间：</label>${order.orderTime}</span>
|
|
|
<span><label>子订单号(ID)：</label>${shopOrder.shopOrderNo}(${shopOrder.shopOrderID})</span>
|
|
|
- <span><label>子订单金额：</label><fmt:formatNumber value="${order.onlinePayFlag eq 0?shopOrder.realPay:shopOrder.needPayAmount}" type="currency"/></span>
|
|
|
- <c:if test="${shopOrder.postFeeCos eq '0'}">
|
|
|
- <div class="print-wrapper">
|
|
|
- <a href="${ctx}/order/printOrder?shopOrderID=${shopOrder.shopOrderID}">打印</a>
|
|
|
- <a href="${ctx}/order/exportSubOrder?shopOrderID=${shopOrder.shopOrderID}">导出</a>
|
|
|
- <c:if test="${order.status ne '0'}">
|
|
|
- <a onclick="copyText('${shopOrder.shopOrderID}')" style="cursor:pointer;">供应商订单二维码</a>
|
|
|
- </c:if>
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收付款记录</a>
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款（退货）记录</a>
|
|
|
- <c:if test="${order.onlinePayFlag eq 0}">
|
|
|
- <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">
|
|
|
- <%-- 返佣订单不能申请退款（退货） --%>
|
|
|
- <c:if test="${order.rebateOrder == '0'}">
|
|
|
- <c:if test="${order.toAudit eq 1}">
|
|
|
- <%--如果存在审核收款则不允许申请:1不能申请,其它可以申请--%>
|
|
|
- <c:if test="${order.toAudit eq 1}">
|
|
|
- <%--弹窗提示--%>
|
|
|
- <a href="#" onclick="return alertx('订单存在未审核的收款，暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.toAudit ne 1}">
|
|
|
- <c:if test="${order.applyReturnedPurchaseFlag eq 1}">
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&onlineShopOrderId=${shopOrder.shopOrderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"
|
|
|
- <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"
|
|
|
- </c:if>
|
|
|
- >申请退款</a>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.applyReturnedPurchaseFlag ne 1}">
|
|
|
- <font title="存在未处理完的申请,请前往退款列表处理！">申请退款</font>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
+ <span><label>子订单金额：</label><fmt:formatNumber
|
|
|
+ value="${order.onlinePayFlag eq 0?shopOrder.realPay:shopOrder.needPayAmount}" type="currency"/></span>
|
|
|
+ <td style="position: relative;"><a class="operation-btn btn">功能</a>
|
|
|
+ <div class="operation-block">
|
|
|
+ <shiro:hasPermission name="order:order:edit">
|
|
|
+ <%--包含订单充值商品就不显示--%>
|
|
|
+ <%-- <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">--%>
|
|
|
+ <%-- <c:if test="${order.status == 11 || order.status == 12 || order.status == 21 || order.status == 22 || order.status == 31 || order.status == 32}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/toDeliveryPage?id=${order.orderID}">发货</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.receiptStatus == 2 && order.status != 6 && order.status != 7&& order.organizeID != 4}">--%>
|
|
|
+ <%-- <a href="javascript:void(0);" onclick="collection(${order.orderID})">抹平收款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <c:if test="${order.status == 0}">
|
|
|
+ <a href="${ctx}/order/confirmOrder?orderID=${order.orderID}"
|
|
|
+ onclick="return confirmx('是否确认订单?', this.href)">确认订单</a>
|
|
|
+ </c:if>
|
|
|
+ <%-- <c:if test="${order.status == 0 || order.status == 11}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/cancelOrder?orderID=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||--%>
|
|
|
+ <%-- order.status eq 23 || order.status eq 0}">--%>
|
|
|
+ <%-- <c:if test="${order.rechargeGoods ne 1 && order.rechargeGoods ne 2 && (order.ableUserMoney > 0 || order.status eq 0)}">--%>
|
|
|
+ <%-- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag != 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/form?id=${order.orderID}">修改订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.postageOrderFlag == 0 && order.secondHandOrderFlag == 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/secondeProductOrderForm?id=${order.orderID}">修改订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.status == 0}">--%>
|
|
|
+ <%-- <c:if test="${order.postageOrderFlag == 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/postageOrderForm?id=${order.orderID}">修改邮费订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${(order.organizeID == 0 or order.organizeID > 2) && order.status == 11 && order.payStatus == 1}">--%>
|
|
|
+ <%-- <a href="javascript:void(0);"--%>
|
|
|
+ <%-- onclick="modelShow('${order.orderID}')">编辑经理折扣</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+
|
|
|
+ <%-- <c:if test="${order.secondHandOrderFlag ne 1 && order.rebateFlag ne 1 && order.status != 0 && order.status != 6 && order.status != 7 && empty order.rechargeGoods}">--%>
|
|
|
+ <%-- <a href="javascript:void(0);"--%>
|
|
|
+ <%-- onclick="rebateFeeEdit('${order.orderID}')">编辑返佣服务费</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+
|
|
|
+ <%-- <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag ne 1 && order.rechargeGoods ne 1 && order.rechargeGoods ne 3}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为返佣订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.orderType != 1 && order.rebateFlag eq 0 && order.receiptStatus eq 1 && order.payStatus eq 1 && order.secondHandOrderFlag eq 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/order/modifyRebate?orderId=${order.orderID}"--%>
|
|
|
+ <%-- onclick="return confirmx('确定将订单转为返佣订单吗？', this.href)">转为二手返佣订单</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ </shiro:hasPermission>
|
|
|
+
|
|
|
+
|
|
|
+ <shiro:hasPermission name="order:order:edit">
|
|
|
+
|
|
|
+
|
|
|
+ <%--包含订单充值商品就不显示--%>
|
|
|
+ <c:if test="${order.rechargeGoods ne 1 and order.rechargeGoods ne 2}">
|
|
|
+ <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 21 && order.status ne 6}">
|
|
|
+ <a href="${ctx}/order/logisticsDetails?orderID=${order.orderID}">发货记录</a>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
|
|
|
+ <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&shopOrderID=${shopOrder.shopOrderID}&from=2">收付款记录
|
|
|
+ </a>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.status ne 0 && order.status ne 11 && order.status ne 6}">
|
|
|
+ <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}&shopOrderID=${shopOrder.shopOrderID}">退款（退货）记录
|
|
|
+ </a>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.orderArchiveId ne null}">
|
|
|
- <a href="${ctx}/archive/cmOrderArchive/form?id=${shopOrder.orderArchiveId}">查看订单资料</a>
|
|
|
- </c:if>
|
|
|
+ <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2">订单备注</a>
|
|
|
+
|
|
|
+ </shiro:hasPermission>
|
|
|
</div>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.onlinePayFlag eq 0}">
|
|
|
- <br/>
|
|
|
- <span>商品总额：<fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
|
|
|
- <span>优惠：<fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>
|
|
|
- <span>运费：
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ <%-- <c:if test="${shopOrder.postFeeCos eq '0'}">--%>
|
|
|
+ <%-- <div class="print-wrapper">--%>
|
|
|
+ <%-- <a href="${ctx}/order/printOrder?shopOrderID=${shopOrder.shopOrderID}">打印</a>--%>
|
|
|
+ <%-- <a href="${ctx}/order/exportSubOrder?shopOrderID=${shopOrder.shopOrderID}">导出</a>--%>
|
|
|
+ <%-- <c:if test="${order.status ne '0'}">--%>
|
|
|
+ <%-- <a onclick="copyText('${shopOrder.shopOrderID}')" style="cursor:pointer;">供应商订单二维码</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=2">收付款记录</a>--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID.rpc?orderID=${order.orderID}">退款（退货）记录</a>--%>
|
|
|
+ <%-- <c:if test="${order.onlinePayFlag eq 0}">--%>
|
|
|
+ <%-- <c:if test="${order.status == 12 || order.status == 13 || order.status == 21 || order.status == 22 || order.status == 23 || order.status == 31 || order.status == 32 || order.status == 33 || order.status == 4 || order.status == 5}">--%>
|
|
|
+ <%-- <%– 返佣订单不能申请退款（退货） –%>--%>
|
|
|
+ <%-- <c:if test="${order.rebateOrder == '0'}">--%>
|
|
|
+ <%-- <c:if test="${order.toAudit eq 1}">--%>
|
|
|
+ <%-- <%–如果存在审核收款则不允许申请:1不能申请,其它可以申请–%>--%>
|
|
|
+ <%-- <c:if test="${order.toAudit eq 1}">--%>
|
|
|
+ <%-- <%–弹窗提示–%>--%>
|
|
|
+ <%-- <a href="#" onclick="return alertx('订单存在未审核的收款，暂不能退款。请将收款审核通过后再操作退款。')">申请退款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.toAudit ne 1}">--%>
|
|
|
+ <%-- <c:if test="${order.applyReturnedPurchaseFlag eq 1}">--%>
|
|
|
+ <%-- <a href="${ctx}/bulkpurchase/cmRefundsProduct/applyRefound.rpc?orderID=${order.orderID}&onlineShopOrderId=${shopOrder.shopOrderID}&refundType=1&returnGoodsStutas=${order.returnGoodsStutas}"--%>
|
|
|
+ <%-- <c:if test="${order.status == 21 || order.status == 22 || order.status == 23}">onclick="return confirmx('部分收款的订单、申请退款只能申请全部退款！', this.href)"--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- >申请退款</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.applyReturnedPurchaseFlag ne 1}">--%>
|
|
|
+ <%-- <font title="存在未处理完的申请,请前往退款列表处理！">申请退款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${shopOrder.orderArchiveId ne null}">--%>
|
|
|
+ <%-- <a href="${ctx}/archive/cmOrderArchive/form?id=${shopOrder.orderArchiveId}">查看订单资料</a>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </div>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.onlinePayFlag eq 0}">--%>
|
|
|
+ <br/>
|
|
|
+ <span>商品总额：<fmt:formatNumber value="${shopOrder.needPayAmount}" type="currency"/></span>
|
|
|
+ <span>运费：
|
|
|
<c:if test="${order.organizeID != 4}">
|
|
|
<c:if test="${order.freePostFlag == 0}">
|
|
|
包邮
|
|
|
@@ -894,12 +974,14 @@
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
<c:if test="${order.organizeID == 4}">
|
|
|
- ${postageInfo}
|
|
|
+ <%-- ${postageInfo}--%>
|
|
|
+ ${shopOrder.postageInfo}
|
|
|
</c:if>
|
|
|
</span>
|
|
|
- <span>子订单总额：<fmt:formatNumber value="${shopOrder.totalAmount}" type="currency"/></span>
|
|
|
- <span>应付金额：<fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
|
|
|
- <span>
|
|
|
+ <span>子订单总额：<fmt:formatNumber value="${shopOrder.totalAmount}" type="currency"/></span>
|
|
|
+ <span>优惠：<fmt:formatNumber value="${shopOrder.eachDiscount}" type="currency"/></span>
|
|
|
+ <span>应收金额：<fmt:formatNumber value="${shopOrder.realPay}" type="currency"/></span>
|
|
|
+ <span>
|
|
|
已收金额：<fmt:formatNumber value="${shopOrder.receiptAmount}" type="currency"/>
|
|
|
<c:if test="${shopOrder.useBalanceFlag eq 1 and shopOrder.accountAmount ne null}">(余额抵扣￥${shopOrder.accountAmount})</c:if>
|
|
|
<c:if test="${order.organizeID != 4&&shopOrder.commercialCode eq 'E1807059160' && (order.receiptStatus == 2 || order.receiptStatus == 3)}">
|
|
|
@@ -907,50 +989,31 @@
|
|
|
</c:if>
|
|
|
|
|
|
</span>
|
|
|
- <span>待收金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
|
|
|
- <br/>
|
|
|
- <span>收款状态：
|
|
|
- <c:if test="${shopOrder.shopReceiptStatus == 1}">
|
|
|
- <font color="red">待收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.shopReceiptStatus == 2}">
|
|
|
- <font color="#ff8c00">部分收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.shopReceiptStatus == 3}">
|
|
|
- <font color="green">已收款</font>
|
|
|
- </c:if>
|
|
|
- </span>
|
|
|
- <span>付款状态：
|
|
|
- <c:if test="${shopOrder.payStatus == 1}">
|
|
|
- <font color="red">待付款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.payStatus == 2}">
|
|
|
- <font color="#ff8c00">部分付款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.payStatus == 3}">
|
|
|
- <font color="green">已付款</font>
|
|
|
- </c:if>
|
|
|
- </span>
|
|
|
- <span>发货状态：
|
|
|
- <c:if test="${shopOrder.sendOutStatus == 1}">
|
|
|
- <font color="red">待发货</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.sendOutStatus == 2}">
|
|
|
- <font color="#ff8c00">部分发货</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.sendOutStatus == 3}">
|
|
|
- <font color="green">已发货</font>
|
|
|
- </c:if>
|
|
|
- </span>
|
|
|
- <c:if test="${not empty shopOrder.note}">
|
|
|
- <span>留言：${shopOrder.note}</span>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.onlinePayFlag eq 1}">
|
|
|
- <c:if test="${shopOrder.postFeeCos eq '0'}">
|
|
|
- <c:if test="${order.status ne 0 && order.status ne 11}">
|
|
|
- <div class="delivery-wrapper">
|
|
|
- <span>发货状态：
|
|
|
+ <span>待收金额：<fmt:formatNumber value="${shopOrder.restAmount}" type="currency"/></span>
|
|
|
+ <br/>
|
|
|
+ <span>收款状态：
|
|
|
+ <c:if test="${shopOrder.shopReceiptStatus == 1}">
|
|
|
+ <font color="red">待收款</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${shopOrder.shopReceiptStatus == 2}">
|
|
|
+ <font color="#ff8c00">部分收款</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${shopOrder.shopReceiptStatus == 3}">
|
|
|
+ <font color="green">已收款</font>
|
|
|
+ </c:if>
|
|
|
+ </span>
|
|
|
+ <span>付款状态：
|
|
|
+ <c:if test="${shopOrder.payStatus == 1}">
|
|
|
+ <font color="red">待付款</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${shopOrder.payStatus == 2}">
|
|
|
+ <font color="#ff8c00">部分付款</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${shopOrder.payStatus == 3}">
|
|
|
+ <font color="green">已付款</font>
|
|
|
+ </c:if>
|
|
|
+ </span>
|
|
|
+ <span>发货状态：
|
|
|
<c:if test="${shopOrder.sendOutStatus == 1}">
|
|
|
<font color="red">待发货</font>
|
|
|
</c:if>
|
|
|
@@ -961,33 +1024,25 @@
|
|
|
<font color="green">已发货</font>
|
|
|
</c:if>
|
|
|
</span>
|
|
|
- <span>付款状态：<c:if test="${shopOrder.payStatus == 1}">
|
|
|
- <font color="red">待付款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.payStatus == 2}">
|
|
|
- <font color="#ff8c00">部分付款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${shopOrder.payStatus == 3}">
|
|
|
- <font color="green">已付款</font>
|
|
|
- </c:if></span>
|
|
|
- <c:if test="${shopOrder.payStatus == 3 or shopOrder.payStatus == 2}">
|
|
|
- <span>
|
|
|
- 已付金额: <fmt:formatNumber value="${shopOrder.payed}" type="currency"/>
|
|
|
- <c:if test="${order.organizeID == 4&& voucherVo eq null }">
|
|
|
- <font color="red">(联合丽格线上收款)</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.organizeID == 4&& voucherVo ne null }">
|
|
|
- <font color="red">(联合丽格线下收款)</font>
|
|
|
- </c:if>
|
|
|
- </span>
|
|
|
- </c:if>
|
|
|
- </div>
|
|
|
- </c:if>
|
|
|
- <c:if test="${not empty shopOrder.note}">
|
|
|
- <div><label>留言：</label>${shopOrder.note}</div>
|
|
|
- </c:if>
|
|
|
- </c:if>
|
|
|
+ <span>
|
|
|
+ 退款状态:
|
|
|
+ <c:if test="${shopOrder.orderStatusFlag == 1}">
|
|
|
+ <font>无退款</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${shopOrder.orderStatusFlag == 2}">
|
|
|
+ <font>退款中</font>
|
|
|
+ </c:if>
|
|
|
+<%-- <c:if test="${shopOrder.orderStatusFlag == 2}">--%>
|
|
|
+<%-- <font>部分退款</font>--%>
|
|
|
+<%-- </c:if>--%>
|
|
|
+ <c:if test="${shopOrder.orderStatusFlag == 3}">
|
|
|
+ <font>已退款</font>
|
|
|
+ </c:if>
|
|
|
+ </span>
|
|
|
+ <c:if test="${not empty shopOrder.note}">
|
|
|
+ <span>留言：${shopOrder.note}</span>
|
|
|
</c:if>
|
|
|
+ <%-- </c:if>--%>
|
|
|
</div>
|
|
|
<div class="order-rows">
|
|
|
<span><label>供应商：</label>${shopOrder.shopName}</span>
|
|
|
@@ -1082,21 +1137,21 @@
|
|
|
<label style="margin-left:5px"><fmt:formatNumber value="${op.discountPrice}"
|
|
|
type="currency"/></label>
|
|
|
<font color="red">(超级会员价)</font></span>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.ladderPriceFlag eq 1 || op.isActProduct eq 2}">
|
|
|
+ <a href="javascript:;" class="ladderPrice"><span> (阶梯价格)</span>
|
|
|
+ <c:if test="${not empty op.orderProductLadderPriceList}">
|
|
|
+ <div class="list">
|
|
|
+ <p><span>起订量</span><span>价格</span></p>
|
|
|
+ <c:forEach items="${op.orderProductLadderPriceList}" var="ladderPrice">
|
|
|
+ <p data-num="${ladderPrice.buyNum}">
|
|
|
+ <span>${ladderPrice.buyNumRangeShow}</span><span
|
|
|
+ class="price">${ladderPrice.buyPrice}</span></p>
|
|
|
+ </c:forEach>
|
|
|
+ </div>
|
|
|
</c:if>
|
|
|
- <c:if test="${op.ladderPriceFlag eq 1 || op.isActProduct eq 2}">
|
|
|
- <a href="javascript:;" class="ladderPrice"><span> (阶梯价格)</span>
|
|
|
- <c:if test="${not empty op.orderProductLadderPriceList}">
|
|
|
- <div class="list">
|
|
|
- <p><span>起订量</span><span>价格</span></p>
|
|
|
- <c:forEach items="${op.orderProductLadderPriceList}" var="ladderPrice">
|
|
|
- <p data-num="${ladderPrice.buyNum}">
|
|
|
- <span>${ladderPrice.buyNumRangeShow}</span><span
|
|
|
- class="price">${ladderPrice.buyPrice}</span></p>
|
|
|
- </c:forEach>
|
|
|
- </div>
|
|
|
- </c:if>
|
|
|
- </a>
|
|
|
- </c:if>
|
|
|
+ </a>
|
|
|
+ </c:if>
|
|
|
</span>
|
|
|
<c:if test="${order.organizeID != 4}">
|
|
|
<span>折扣: ${op.discount}%</span>
|
|
|
@@ -1126,71 +1181,71 @@
|
|
|
</div>
|
|
|
<c:if test="${op.productPromotion ne null}">
|
|
|
<c:if test="${op.productPromotion.type eq 2}">
|
|
|
- <div class="supplier-product-promotionInfo">
|
|
|
- <table>
|
|
|
- <tr>
|
|
|
- <td rowspan="2">
|
|
|
- <c:if test="${op.productPromotion.mode eq 2}">
|
|
|
- <label style="background-color: #F60;color: white"><label
|
|
|
- class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productPromotion.mode eq 3}">
|
|
|
- <label style="background-color: purple;color: white"><label
|
|
|
- class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
- </c:if>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- <span class="downSpan">${op.productPromotion.description}</span>
|
|
|
- <c:if test="${op.productPromotion.mode eq 2}">
|
|
|
+ <div class="supplier-product-promotionInfo">
|
|
|
+ <table>
|
|
|
+ <tr>
|
|
|
+ <td rowspan="2">
|
|
|
+ <c:if test="${op.productPromotion.mode eq 2}">
|
|
|
+ <label style="background-color: #F60;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productPromotion.mode eq 3}">
|
|
|
+ <label style="background-color: purple;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </c:if>
|
|
|
+ </td>
|
|
|
+ <td>
|
|
|
+ <span class="downSpan">${op.productPromotion.description}</span>
|
|
|
+ <c:if test="${op.productPromotion.mode eq 2}">
|
|
|
<span class="upSpan"> 满<fmt:formatNumber
|
|
|
value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
maxFractionDigits="2"/>,减<fmt:formatNumber
|
|
|
value="${op.productPromotion.reducedPrice}"
|
|
|
pattern="#,##0.00" maxFractionDigits="2"/></span>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productPromotion.mode eq 3}">
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productPromotion.mode eq 3}">
|
|
|
<span class="upSpan"> 满<fmt:formatNumber
|
|
|
value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
maxFractionDigits="2"/>,赠送商品</span>
|
|
|
- </c:if>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
- </table>
|
|
|
- </div>
|
|
|
+ </c:if>
|
|
|
+ </td>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productPromotion.type eq 1}">
|
|
|
+ <div class="supplier-product-promotionInfo">
|
|
|
+ <table>
|
|
|
+ <tr>
|
|
|
+ <c:if test="${op.productPromotion.mode eq 1}">
|
|
|
+ <td><label style="background-color: green;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </td>
|
|
|
+ <td> 优惠价: <label style="color: red"><fmt:formatNumber
|
|
|
+ value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/></label></td>
|
|
|
</c:if>
|
|
|
- <c:if test="${op.productPromotion.type eq 1}">
|
|
|
- <div class="supplier-product-promotionInfo">
|
|
|
- <table>
|
|
|
- <tr>
|
|
|
- <c:if test="${op.productPromotion.mode eq 1}">
|
|
|
- <td><label style="background-color: green;color: white"><label
|
|
|
- class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
- </td>
|
|
|
- <td> 优惠价: <label style="color: red"><fmt:formatNumber
|
|
|
- value="${op.productPromotion.touchPrice}" pattern="#,##0.00"
|
|
|
- maxFractionDigits="2"/></label></td>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productPromotion.mode eq 2}">
|
|
|
- <td><label style="background-color: #F60;color: white"><label
|
|
|
- class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
- </td>
|
|
|
- <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}"
|
|
|
- pattern="#,##0.00"
|
|
|
- maxFractionDigits="2"/>,减<fmt:formatNumber
|
|
|
- value="${op.productPromotion.reducedPrice}" pattern="#,##0.00"
|
|
|
- maxFractionDigits="2"/></td>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productPromotion.mode eq 3}">
|
|
|
- <td><label style="background-color: purple;color: white"><label
|
|
|
- class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
- </td>
|
|
|
- <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}"
|
|
|
- pattern="#,##0.00" maxFractionDigits="2"/>,赠送商品
|
|
|
- </td>
|
|
|
- </c:if>
|
|
|
- </tr>
|
|
|
- </table>
|
|
|
- </div>
|
|
|
+ <c:if test="${op.productPromotion.mode eq 2}">
|
|
|
+ <td><label style="background-color: #F60;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </td>
|
|
|
+ <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}"
|
|
|
+ pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/>,减<fmt:formatNumber
|
|
|
+ value="${op.productPromotion.reducedPrice}" pattern="#,##0.00"
|
|
|
+ maxFractionDigits="2"/></td>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productPromotion.mode eq 3}">
|
|
|
+ <td><label style="background-color: purple;color: white"><label
|
|
|
+ class="promotionsName">${op.productPromotion.name}</label></label>
|
|
|
+ </td>
|
|
|
+ <td> 满<fmt:formatNumber value="${op.productPromotion.touchPrice}"
|
|
|
+ pattern="#,##0.00" maxFractionDigits="2"/>,赠送商品
|
|
|
+ </td>
|
|
|
+ </c:if>
|
|
|
+ </tr>
|
|
|
+ </table>
|
|
|
+ </div>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
@@ -1202,6 +1257,30 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
+ <c:if test="${order.organizeID == 4&& shopOrder.voucherVo ne null }">
|
|
|
+ <div class="order-rows">
|
|
|
+
|
|
|
+ <label>线下支付凭证：</label>
|
|
|
+ <c:forEach items="${shopOrder.voucherVo}" var="voucher">
|
|
|
+ <div>
|
|
|
+ <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
|
|
|
+ <c:if test="${voucher.images ne null }">
|
|
|
+ <div>
|
|
|
+ <c:forEach items="${voucher.images}" var="items" varStatus="index">
|
|
|
+ <c:if test="${items.image ne null }">
|
|
|
+ <a href="${items.image}" target="_blank">
|
|
|
+ <img class="supplier-img" src="${items.image}"
|
|
|
+ style="width: 120px;height: 120px"/>
|
|
|
+ </a>
|
|
|
+ </c:if>
|
|
|
+ </c:forEach>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
+ <p>备注: ${voucher.remarks}</p>
|
|
|
+ </div>
|
|
|
+ </c:forEach>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
</c:forEach>
|
|
|
<%--组织订单暂时不显示发票和条款信息--%>
|
|
|
<%--<c:if test="${order.organizeID == 0}">--%>
|
|
|
@@ -1290,29 +1369,29 @@
|
|
|
</div>
|
|
|
</c:if>
|
|
|
<%--</c:if>--%>
|
|
|
-<c:if test="${order.organizeID == 4&& voucherVo ne null }">
|
|
|
- <div class="order-rows">
|
|
|
-
|
|
|
- <label>线下支付凭证：</label>
|
|
|
- <c:forEach items="${voucherVo}" var="voucher">
|
|
|
- <div>
|
|
|
- <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>
|
|
|
- <c:if test="${voucher.images ne null }">
|
|
|
- <div>
|
|
|
- <c:forEach items="${voucher.images}" var="items" varStatus="index">
|
|
|
- <c:if test="${items.image ne null }">
|
|
|
- <a href="${items.image}" target="_blank">
|
|
|
- <img class="supplier-img" src="${items.image}" style="width: 120px;height: 120px"/>
|
|
|
- </a>
|
|
|
- </c:if>
|
|
|
- </c:forEach>
|
|
|
- </div>
|
|
|
- </c:if>
|
|
|
- <p>备注: ${voucher.remarks}</p>
|
|
|
- </div>
|
|
|
- </c:forEach>
|
|
|
- </div>
|
|
|
-</c:if>
|
|
|
+<%--<c:if test="${order.organizeID == 4&& voucherVo ne null }">--%>
|
|
|
+<%-- <div class="order-rows">--%>
|
|
|
+
|
|
|
+<%-- <label>线下支付凭证：</label>--%>
|
|
|
+<%-- <c:forEach items="${voucherVo}" var="voucher">--%>
|
|
|
+<%-- <div>--%>
|
|
|
+<%-- <p><fmt:formatDate value="${voucher.addTime}" pattern="yyyy-MM-dd HH:mm:ss"/></p>--%>
|
|
|
+<%-- <c:if test="${voucher.images ne null }">--%>
|
|
|
+<%-- <div>--%>
|
|
|
+<%-- <c:forEach items="${voucher.images}" var="items" varStatus="index">--%>
|
|
|
+<%-- <c:if test="${items.image ne null }">--%>
|
|
|
+<%-- <a href="${items.image}" target="_blank">--%>
|
|
|
+<%-- <img class="supplier-img" src="${items.image}" style="width: 120px;height: 120px"/>--%>
|
|
|
+<%-- </a>--%>
|
|
|
+<%-- </c:if>--%>
|
|
|
+<%-- </c:forEach>--%>
|
|
|
+<%-- </div>--%>
|
|
|
+<%-- </c:if>--%>
|
|
|
+<%-- <p>备注: ${voucher.remarks}</p>--%>
|
|
|
+<%-- </div>--%>
|
|
|
+<%-- </c:forEach>--%>
|
|
|
+<%-- </div>--%>
|
|
|
+<%--</c:if>--%>
|
|
|
<script type="text/javascript">
|
|
|
(function () {
|
|
|
$('body').click(function (e) {
|
kaick