|
|
@@ -53,42 +53,42 @@
|
|
|
<td>手机: ${order.mobile}</td>
|
|
|
</tr>
|
|
|
|
|
|
- <tr>
|
|
|
- <td>
|
|
|
- 收款状态:
|
|
|
- <c:if test="${order.receiptStatus == 1}">
|
|
|
- <font color="red">待收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.receiptStatus == 2}">
|
|
|
- <font color="#ff8c00">部分收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.receiptStatus == 3}">
|
|
|
- <font color="green">已收款</font>
|
|
|
- </c:if>
|
|
|
- </td>
|
|
|
+ <%-- <tr>--%>
|
|
|
+ <%-- <td>--%>
|
|
|
+ <%-- 收款状态:--%>
|
|
|
+ <%-- <c:if test="${order.receiptStatus == 1}">--%>
|
|
|
+ <%-- <font color="red">待收款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.receiptStatus == 2}">--%>
|
|
|
+ <%-- <font color="#ff8c00">部分收款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.receiptStatus == 3}">--%>
|
|
|
+ <%-- <font color="green">已收款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- </td>--%>
|
|
|
|
|
|
- <td>发货状态:
|
|
|
- <c:if test="${order.sendOutStatus == 1}">
|
|
|
- <font color="red">待发货</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.sendOutStatus == 2}">
|
|
|
- <font color="#ff8c00">部分发货</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.sendOutStatus == 3}">
|
|
|
- <font color="green">已发货</font>
|
|
|
- </c:if></td>
|
|
|
- <td>付款状态:
|
|
|
- <c:if test="${order.payStatus == 1}">
|
|
|
- <font color="red">待付款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.payStatus == 2}">
|
|
|
- <font color="#ff8c00">部分付款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.payStatus == 3}">
|
|
|
- <font color="green">已付款</font>
|
|
|
- </c:if></td>
|
|
|
- </td>
|
|
|
- </tr>
|
|
|
+ <%-- <td>发货状态:--%>
|
|
|
+ <%-- <c:if test="${order.sendOutStatus == 1}">--%>
|
|
|
+ <%-- <font color="red">待发货</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.sendOutStatus == 2}">--%>
|
|
|
+ <%-- <font color="#ff8c00">部分发货</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.sendOutStatus == 3}">--%>
|
|
|
+ <%-- <font color="green">已发货</font>--%>
|
|
|
+ <%-- </c:if></td>--%>
|
|
|
+ <%-- <td>付款状态:--%>
|
|
|
+ <%-- <c:if test="${order.payStatus == 1}">--%>
|
|
|
+ <%-- <font color="red">待付款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.payStatus == 2}">--%>
|
|
|
+ <%-- <font color="#ff8c00">部分付款</font>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.payStatus == 3}">--%>
|
|
|
+ <%-- <font color="green">已付款</font>--%>
|
|
|
+ <%-- </c:if></td>--%>
|
|
|
+ <%-- </td>--%>
|
|
|
+ <%-- </tr>--%>
|
|
|
|
|
|
<tr>
|
|
|
<td>
|
|
|
@@ -118,9 +118,9 @@
|
|
|
|
|
|
<tr>
|
|
|
<td>
|
|
|
- <%-- 地址: ${fns:appendLast(fns:appendLast1(order.bpOrderUserinfo.province,order.bpOrderUserinfo.city,order.bpOrderUserinfo.town), order.bpOrderUserinfo.address)}--%>
|
|
|
+ 地址: ${fns:appendLast(fns:appendLast1(order.bpOrderUserinfo.province,order.bpOrderUserinfo.city,order.bpOrderUserinfo.town), order.bpOrderUserinfo.address)}
|
|
|
</td>
|
|
|
- <td>订单可见度：</td>
|
|
|
+ <td>订单可见度：${order.orderSeen eq 1 ? '对机构可见':'对机构不可见'}</td>
|
|
|
<td style="position: relative;"><a class="operation-btn btn"
|
|
|
onclick="operation(${order.shopOrderID})">功能</a>
|
|
|
<div style="position: absolute;">
|
|
|
@@ -143,7 +143,7 @@
|
|
|
<a href="${ctx}/order/cancelShopOrder?shopOrderId=${order.shopOrderID}"
|
|
|
onclick="return confirmx('是否取消订单?', this.href)">取消订单</a>
|
|
|
</c:if>
|
|
|
- <%-- <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
|
|
|
+<%-- <a href="${ctx}/order/cmOrderRemark/remarksViewNew.rpc?orderID=${order.orderID}&source=2&shopOrderID=${order.shopOrderID}">订单备注</a>--%>
|
|
|
</shiro:hasPermission>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -223,7 +223,7 @@
|
|
|
<b>订单备注<a onclick="openRemarks(${order.orderID},${order.shopOrderID})" style="color: white">展开 《</a></b>
|
|
|
</div>
|
|
|
<div class="order-rows">
|
|
|
- <tr>
|
|
|
+ <div>
|
|
|
<span><label>子订单状态：</label>${fns:getDictLabel(order.status,"shopStatus","" )}</span>
|
|
|
|
|
|
<span>运费：${order.postageInfo}</span>
|
|
|
@@ -241,9 +241,9 @@
|
|
|
已收金额：<fmt:formatNumber value="${order.receiptAmount}" type="currency"/>
|
|
|
<c:if test="${order.useBalanceFlag eq 1 and order.accountAmount ne null}">(余额抵扣￥${order.accountAmount})</c:if>
|
|
|
</span>
|
|
|
- </tr>
|
|
|
+ </div>
|
|
|
|
|
|
- <tr>
|
|
|
+ <div>
|
|
|
<span>商品总额：<fmt:formatNumber value="${order.productAmount}" type="currency"/></span>
|
|
|
<span>
|
|
|
收款状态：
|
|
|
@@ -325,11 +325,11 @@
|
|
|
<font>已退款</font>
|
|
|
</c:if>
|
|
|
</span>
|
|
|
- </tr>
|
|
|
+ </div>
|
|
|
|
|
|
- <tr>
|
|
|
+ <div>
|
|
|
<span>待收金额：<fmt:formatNumber value="${order.restAmount}" type="currency"/></span>
|
|
|
- </tr>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="order-rows">
|
|
|
<span><label>供应商：</label>${order.shopName}</span>
|
|
|
@@ -442,10 +442,10 @@
|
|
|
<span>税费: ${(op.includedTax eq 1 or (op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3))?'---': empty op.totalAddedValueTax ?0.00:(op.totalAddedValueTax)}</span>
|
|
|
</c:if>
|
|
|
<span>总额: <fmt:formatNumber value="${op.totalFee}" type="currency"/></span>
|
|
|
- <c:if test="${order.sendOutStatus == 2 || order.sendOutStatus == 3}">
|
|
|
+ <c:if test="${order.sendOutStatus == 3}">
|
|
|
<span>已发/已收 ${(op.num == null ? 0 : op.num)+ (op.presentNum == null ? 0 : op.presentNum)- (op.notOutStore == null ? 0 : op.notOutStore)}/${op.receivedNum}</span>
|
|
|
</c:if>
|
|
|
- <c:if test="${fns:hasReturn(order.status)}">
|
|
|
+ <c:if test="${order.refundStatus eq 3}">
|
|
|
<span>退款(退货)中/已完成 ${op.returningNum}/${op.returnedNum}</span>
|
|
|
</c:if>
|
|
|
</div>
|
zhijiezhao