|
|
@@ -408,7 +408,10 @@
|
|
|
<td>返佣订单: ${(order.rebateOrder ne '0' || order.rebateFlag eq '1')?'是':'否'}</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>订单类型: <c:if test="${order.orderType == 1}">自主订单</c:if><c:if test="${order.orderType == 0}">协销订单</c:if></td>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <td>订单类型: <c:if test="${order.orderType == 1}">自主订单</c:if><c:if
|
|
|
+ test="${order.orderType == 0}">协销订单</c:if></td>
|
|
|
+ </c:if>
|
|
|
<td>订单来源: ${fns:getDictLabel(order.orderSource,"bp_orderSource","" )}</td>
|
|
|
<td>订单状态:
|
|
|
<c:if test="${order.status eq 11 || order.status eq 12 || order.status eq 13 ||order.status eq 21 ||order.status eq 22 ||
|
|
|
@@ -533,6 +536,7 @@
|
|
|
<c:if test="${order.bpOrderUserinfo.firstClubType eq null and order.bpOrderUserinfo.svipFlag eq 1}">
|
|
|
${order.bpOrderUserinfo.svipFlag eq 1?'(超级会员)':''}
|
|
|
</c:if>
|
|
|
+ <c:if test="${order.orderType == 3}">（联合丽格）</c:if>
|
|
|
</font>
|
|
|
<c:if test="${order.organizeID >= 3}"><label
|
|
|
style="margin-left: 20px">门店：${order.organizeStoreName}</label> </c:if></td>
|
|
|
@@ -571,6 +575,7 @@
|
|
|
<tr>
|
|
|
<td>
|
|
|
应收金额：<fmt:formatNumber value="${order.payableAmount}" type="currency"/>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
<span style="color: red">
|
|
|
<c:if test="${order.balancePayFee gt 0}">
|
|
|
<a href="${ctx}/user/cmUserBalanceRecord/userBalanceRecord?userId=${order.userID}"
|
|
|
@@ -581,9 +586,8 @@
|
|
|
<c:if test="${order.balancePayFee le 0}">
|
|
|
(账户余额抵扣: <fmt:formatNumber value="${order.balancePayFee}" type="currency"/>)
|
|
|
</c:if>
|
|
|
-
|
|
|
-
|
|
|
</span>
|
|
|
+ </c:if>
|
|
|
</td>
|
|
|
<td>
|
|
|
已收金额：
|
|
|
@@ -599,26 +603,29 @@
|
|
|
</td>
|
|
|
<td>
|
|
|
退款金额（已完成）：<fmt:formatNumber value="${returnValue}" type="currency"/>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
<span style="color: red">
|
|
|
(原<fmt:formatNumber value="${returnedPurchaseFee}" type="currency"/>，折扣取消
|
|
|
<c:if test="${order.discountFee gt returnedPurchaseFee}"><fmt:formatNumber
|
|
|
value="${returnedPurchaseFee}" type="currency"/></c:if>
|
|
|
<c:if test="${order.discountFee le returnedPurchaseFee}"><fmt:formatNumber
|
|
|
value="${order.discountFee}" type="currency"/></c:if>)
|
|
|
- </span>
|
|
|
+ </span>
|
|
|
+ </c:if>
|
|
|
</td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
- <td>
|
|
|
- 经理折扣：
|
|
|
- <c:if test="${order.discountFee gt 0}">
|
|
|
- <c:if test="${order.discountFee gt returnedPurchaseFee}">
|
|
|
- <fmt:formatNumber value="${order.discountFee - returnedPurchaseFee}" type="currency"/>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.discountFee le returnedPurchaseFee}">
|
|
|
- ¥0.00
|
|
|
- </c:if>
|
|
|
- <span style="color: red">
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <td>
|
|
|
+ 经理折扣：
|
|
|
+ <c:if test="${order.discountFee gt 0}">
|
|
|
+ <c:if test="${order.discountFee gt returnedPurchaseFee}">
|
|
|
+ <fmt:formatNumber value="${order.discountFee - returnedPurchaseFee}" type="currency"/>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.discountFee le returnedPurchaseFee}">
|
|
|
+ ¥0.00
|
|
|
+ </c:if>
|
|
|
+ <span style="color: red">
|
|
|
(原<fmt:formatNumber value="${order.discountFee}" type="currency"/>，折扣取消
|
|
|
<c:if test="${order.discountFee gt returnedPurchaseFee}">
|
|
|
<fmt:formatNumber value="${returnedPurchaseFee}" type="currency"/>
|
|
|
@@ -627,9 +634,10 @@
|
|
|
<fmt:formatNumber value="${order.discountFee}" type="currency"/>
|
|
|
</c:if>)
|
|
|
</span>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.discountFee le 0}">¥0.00</c:if>
|
|
|
- </td>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.discountFee le 0}">¥0.00</c:if>
|
|
|
+ </td>
|
|
|
+ </c:if>
|
|
|
<td>运费：
|
|
|
<c:if test="${order.freePostFlag == 0}">
|
|
|
包邮
|
|
|
@@ -959,29 +967,30 @@
|
|
|
</c:if>
|
|
|
<div>
|
|
|
<c:forEach items="${shopOrder.newOrderProducts}" var="op" varStatus="varIndex">
|
|
|
- <div class="supplier-product-item" style="z-index:${100000 - varIndex.index};position:relative;">
|
|
|
- <%--二手订单详情--%>
|
|
|
- <c:if test="${order.secondHandOrderFlag eq 1}">
|
|
|
- <a href="${fns:getConfig('wwwServer')}flea-market-${op.productID}.html" target="_blank">
|
|
|
- <img class="supplier-img" src="${op.image}"/>
|
|
|
+ <c class="supplier-product-item" style="z-index:${100000 - varIndex.index};position:relative;">
|
|
|
+ <%--二手订单详情--%>
|
|
|
+ <c:if test="${order.secondHandOrderFlag eq 1}">
|
|
|
+ <a href="${fns:getConfig('wwwServer')}flea-market-${op.productID}.html" target="_blank">
|
|
|
+ <img class="supplier-img" src="${op.image}"/>
|
|
|
+ </a>
|
|
|
+ </c:if>
|
|
|
+ <%--正常订单详情--%>
|
|
|
+ <c:if test="${order.secondHandOrderFlag ne 1}">
|
|
|
+ <a href="${fns:getConfig('wwwServer')}product-${op.productID}.html" target="_blank">
|
|
|
+ <img class="supplier-img" src="${op.image}"/>
|
|
|
</a>
|
|
|
</c:if>
|
|
|
- <%--正常订单详情--%>
|
|
|
- <c:if test="${order.secondHandOrderFlag ne 1}">
|
|
|
- <a href="${fns:getConfig('wwwServer')}product-${op.productID}.html" target="_blank">
|
|
|
- <img class="supplier-img" src="${op.image}"/>
|
|
|
- </a>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <div class="supplier-name">
|
|
|
+ <c:if test="${op.name eq op.aliasName || op.productID eq 6060}">
|
|
|
+ <div class="supplier-product-name">${op.name}</div>
|
|
|
</c:if>
|
|
|
- <div class="supplier-name">
|
|
|
- <c:if test="${op.name eq op.aliasName || op.productID eq 6060}">
|
|
|
- <div class="supplier-product-name">${op.name}</div>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.name ne op.aliasName && op.productID ne 6060}">
|
|
|
- <div class="supplier-product-name">${op.name}</div>
|
|
|
- <div class="supplier-product-alias">${op.aliasName}</div>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productType eq 1}">
|
|
|
- <div class="supplier-product-name"><label style="color: red">协商赠品</label></div>
|
|
|
+ <c:if test="${op.name ne op.aliasName && op.productID ne 6060}">
|
|
|
+ <div class="supplier-product-name">${op.name}</div>
|
|
|
+ <div class="supplier-product-alias">${op.aliasName}</div>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productType eq 1}">
|
|
|
+ <div class="supplier-product-name"><label style="color: red">协商赠品</label></div>
|
|
|
</c:if>
|
|
|
<c:if test="${op.productType eq 2}">
|
|
|
<div class="supplier-product-name"><label style="color: red">促销赠品</label></div>
|
|
|
@@ -990,30 +999,31 @@
|
|
|
<div class="supplier-product-name"><label style="color: red">(含税)</label></div>
|
|
|
</c:if>
|
|
|
<c:if test="${op.includedTax ne '' and op.includedTax eq 0}">
|
|
|
- <c:if test="${op.invoiceType eq 3}">
|
|
|
+ <c:if test="${op.invoiceType eq 3 and order}">
|
|
|
<div class="supplier-product-name"><label style="color: red">(不含税-不能开票)</label></div>
|
|
|
</c:if>
|
|
|
<c:if test="${op.invoiceType eq 2 or op.invoiceType eq 1}">
|
|
|
<div class="supplier-product-name"><label style="color: red">(不含税-能开票)</label></div>
|
|
|
</c:if>
|
|
|
</c:if>
|
|
|
-<%-- <c:if test="${order.returnGoodsStutas==2}">--%>
|
|
|
-<%-- <div class="supplier-product-name"><label style="color: red">(不能退货)</label></div>--%>
|
|
|
-<%-- </c:if>--%>
|
|
|
-<%-- <c:if test="${order.returnGoodsStutas==1}">--%>
|
|
|
-<%-- <div class="supplier-product-name"><label style="color: red">(能退货)</label></div>--%>
|
|
|
-<%-- </c:if>--%>
|
|
|
- <c:if test="${op.machineType eq 3}">
|
|
|
- <div class="supplier-product-name"><font style="font-size: 16px" color="red">械字号三类</font></div>
|
|
|
- </c:if>
|
|
|
- </div>
|
|
|
- <c:if test="${op.productID ne 999}">
|
|
|
- <div class="supplier-product-info">
|
|
|
+ <%-- <c:if test="${order.returnGoodsStutas==2}">--%>
|
|
|
+ <%-- <div class="supplier-product-name"><label style="color: red">(不能退货)</label></div>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <%-- <c:if test="${order.returnGoodsStutas==1}">--%>
|
|
|
+ <%-- <div class="supplier-product-name"><label style="color: red">(能退货)</label></div>--%>
|
|
|
+ <%-- </c:if>--%>
|
|
|
+ <c:if test="${op.machineType eq 3}">
|
|
|
+ <div class="supplier-product-name"><font style="font-size: 16px" color="red">械字号三类</font></div>
|
|
|
+ </c:if>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productID ne 999}">
|
|
|
+ <div class="supplier-product-info">
|
|
|
<span>
|
|
|
规格：
|
|
|
<label>${op.unit}</label>
|
|
|
</span>
|
|
|
- <span>单价:
|
|
|
+ <span>单价:
|
|
|
<c:if test="${op.svipPriceFlag eq 1 or op.productPromotion.mode eq 1}">
|
|
|
<label style="text-decoration: line-through"><fmt:formatNumber value="${op.price}"
|
|
|
type="currency"/></label>
|
|
|
@@ -1040,31 +1050,35 @@
|
|
|
</c:if>
|
|
|
</a>
|
|
|
</c:if>
|
|
|
- </span>
|
|
|
- <span>折扣: ${op.discount}%</span>
|
|
|
- <span>折后单价:
|
|
|
- <c:if test="${op.productPromotion.mode eq 1}">
|
|
|
+ </span>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <span>折扣: ${op.discount}%</span>
|
|
|
+ <span>折后单价:
|
|
|
+ <c:if test="${op.productPromotion.mode eq 1}">
|
|
|
<label style="text-decoration: line-through"><fmt:formatNumber
|
|
|
value="${op.discountPrice}" type="currency"/></label></span>
|
|
|
- </c:if>
|
|
|
- <c:if test="${op.productPromotion.mode ne 1}">
|
|
|
- <fmt:formatNumber value="${op.discountPrice}" type="currency"/></span>
|
|
|
- </c:if>
|
|
|
- <span>数量: x${op.num}</span>
|
|
|
-
|
|
|
- <br>
|
|
|
- <span>税率: ${(op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3)?'---': op.taxRate ne null?op.taxRate:0.0}%</span>
|
|
|
- <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>
|
|
|
- <span>总额: <fmt:formatNumber value="${op.totalFee}" type="currency"/></span>
|
|
|
- <c:if test="${order.sendOutStatus == 2 || 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)}">
|
|
|
- <span>退款(退货)中/已完成 ${op.returningNum}/${op.returnedNum}</span>
|
|
|
- </c:if>
|
|
|
- </div>
|
|
|
- <c:if test="${op.productPromotion ne null}">
|
|
|
- <c:if test="${op.productPromotion.type eq 2}">
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${op.productPromotion.mode ne 1}">
|
|
|
+ <fmt:formatNumber value="${op.discountPrice}" type="currency"/></span>
|
|
|
+ </c:if>
|
|
|
+ </c:if>
|
|
|
+ <span>数量: x${op.num}</span>
|
|
|
+
|
|
|
+ <br>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <span>税率: ${(op.includedTax != '' and op.includedTax eq 0 and op.invoiceType eq 3)?'---': op.taxRate ne null?op.taxRate:0.0}%</span>
|
|
|
+ <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}">
|
|
|
+ <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)}">
|
|
|
+ <span>退款(退货)中/已完成 ${op.returningNum}/${op.returnedNum}</span>
|
|
|
+ </c:if>
|
|
|
+ </div>
|
|
|
+ <c:if test="${op.productPromotion ne null}">
|
|
|
+ <c:if test="${op.productPromotion.type eq 2}">
|
|
|
<div class="supplier-product-promotionInfo">
|
|
|
<table>
|
|
|
<tr>
|
|
|
@@ -1145,18 +1159,20 @@
|
|
|
</c:forEach>
|
|
|
<%--组织订单暂时不显示发票和条款信息--%>
|
|
|
<c:if test="${order.organizeID == 0}">
|
|
|
- <div class="order-rows">
|
|
|
- <label>订单对机构是否可见：</label>
|
|
|
- <c:if test="${order.orderSeen eq 1}">
|
|
|
- <label>可见</label>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.orderSeen eq 2}">
|
|
|
- <label>不可见</label>
|
|
|
- </c:if>
|
|
|
- <c:if test="${order.orderSeen ne 1 and order.orderSeen ne 2}">
|
|
|
- <label>未定义</label>
|
|
|
- </c:if>
|
|
|
- </div>
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <div class="order-rows">
|
|
|
+ <label>订单对机构是否可见：</label>
|
|
|
+ <c:if test="${order.orderSeen eq 1}">
|
|
|
+ <label>可见</label>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.orderSeen eq 2}">
|
|
|
+ <label>不可见</label>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${order.orderSeen ne 1 and order.orderSeen ne 2}">
|
|
|
+ <label>未定义</label>
|
|
|
+ </c:if>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
<div class="order-rows">
|
|
|
<label>发票信息：</label>
|
|
|
<c:if test="${order.orderInvoice.type eq 0}">
|
|
|
@@ -1208,10 +1224,11 @@
|
|
|
</table>
|
|
|
</c:if>
|
|
|
</div>
|
|
|
- <div class="order-rows">
|
|
|
- <label>售后条款：</label>
|
|
|
- <c:forEach items="${bpClauses}" var="items" varStatus="index">
|
|
|
- <c:if test="${items.clauseType ne 0 }">
|
|
|
+ <c:if test="${order.orderType != 3}">
|
|
|
+ <div class="order-rows">
|
|
|
+ <label>售后条款：</label>
|
|
|
+ <c:forEach items="${bpClauses}" var="items" varStatus="index">
|
|
|
+ <c:if test="${items.clauseType ne 0 }">
|
|
|
<span>
|
|
|
<input id="clauseId${index.index+1}" class="clauseId" name="clauseID" type="radio"
|
|
|
value="${items.id}"${(order.clauseID)==(items.id)?'checked="checked"':''}
|
|
|
@@ -1222,9 +1239,10 @@
|
|
|
<a href="javascript:void(0);"
|
|
|
onclick="openClauseInfo(${index.index+1});"><label>${items.name}</label></a>
|
|
|
</span>
|
|
|
- </c:if>
|
|
|
- </c:forEach>
|
|
|
- </div>
|
|
|
+ </c:if>
|
|
|
+ </c:forEach>
|
|
|
+ </div>
|
|
|
+ </c:if>
|
|
|
</c:if>
|
|
|
<script type="text/javascript">
|
|
|
(function () {
|
kaick