|
|
@@ -331,13 +331,13 @@
|
|
|
<li class="active tab-li"><a href="${ctx}/shopOrder/checkPaymentOrder">订单财务信息</a></li>
|
|
|
</ul>
|
|
|
|
|
|
-<form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newOrder"
|
|
|
+<form:form id="searchForm" onsubmit="submitFunc()" modelAttribute="newShopOrder"
|
|
|
action="${ctx}/shopOrder/checkPaymentOrder" method="post" class="breadcrumb form-search">
|
|
|
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
|
|
|
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
|
|
|
<div class="ul-form">
|
|
|
<label>子订单ID：</label>
|
|
|
- <form:input path="shopOrderIDs" htmlEscape="false" onkeyup="onlynum(this)" maxlength="8" class="input-medium"/>
|
|
|
+ <form:input path="shopOrderID" htmlEscape="false" onkeyup="onlynum(this)" maxlength="8" class="input-medium"/>
|
|
|
<label>子订单编号：</label>
|
|
|
<form:input path="shopOrderNo" htmlEscape="false" maxlength="20" class="input-medium"/>
|
|
|
<label>订单ID：</label>
|
|
|
@@ -368,18 +368,17 @@
|
|
|
htmlEscape="false"/>
|
|
|
</form:select>
|
|
|
<label>退款状态：</label>
|
|
|
- <form:select path="refundType" class="select-ele input-medium required">
|
|
|
+ <form:select path="refundStatus" class="select-ele input-medium required">
|
|
|
<form:option value="" label="所有"/>
|
|
|
- <form:option value="0" label="无退款"/>
|
|
|
- <form:option value="1" label="部分退款"/>
|
|
|
- <form:option value="2" label="已退款"/>
|
|
|
+ <form:option value="1" label="无退款"/>
|
|
|
+ <form:option value="3" label="有退款"/>
|
|
|
</form:select>
|
|
|
- <label>返佣订单：</label>
|
|
|
+ <%--<label>返佣订单：</label>
|
|
|
<form:select path="rebateOrder" class="select-ele input-medium required">
|
|
|
<form:option value="" label="请选择"/>
|
|
|
<form:option value="1" label="是"/>
|
|
|
<form:option value="0" label="否"/>
|
|
|
- </form:select>
|
|
|
+ </form:select>--%>
|
|
|
</div>
|
|
|
<div class="pay-status">
|
|
|
<label>组织：</label>
|
|
|
@@ -412,6 +411,7 @@
|
|
|
<table class="table table-striped table-bordered table-condensed pay-table">
|
|
|
<tr class="t1">
|
|
|
<th class="item0">序号</th>
|
|
|
+ <th colspan="2">子订单编号(ID)</th>
|
|
|
<th colspan="2">母订单编号(ID)</th>
|
|
|
<th>下单时间</th>
|
|
|
<th>订单金额</th>
|
|
|
@@ -427,56 +427,34 @@
|
|
|
<th>已结金额</th>
|
|
|
<th>退款状态</th>
|
|
|
<th>退款金额</th>
|
|
|
- <th>机构</th>
|
|
|
<th>优惠券</th>
|
|
|
<th>经理折扣</th>
|
|
|
- <th>机构运费</th>
|
|
|
- <th>是否返佣</th>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td rowspan="0" class="item0">${(page.pageNo-1)*page.pageSize+sIndex.index+1}</td>
|
|
|
+ <td colspan="2">${s.shopOrderNo}(${s.shopOrderID})</td>
|
|
|
<td colspan="2">${s.orderNo}(${s.orderID})</td>
|
|
|
<td>${s.orderTime}</td>
|
|
|
- <td><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
|
|
|
+ <td><fmt:formatNumber value="${s.totalAmount}" type="number" pattern="#,##0.00"/></td>
|
|
|
<td>
|
|
|
- <c:if test="${s.status eq 11 || s.status eq 12 || s.status eq 13 ||s.status eq 21 ||s.status eq 22 ||
|
|
|
- s.status eq 23 || s.status eq 31 ||s.status eq 32 ||s.status eq 33}">交易中<br>(${fns:getDictLabel(s.status,"order_detail_status","" )})</c:if>
|
|
|
- <c:if test="${s.status eq 0 || s.status eq 4 || s.status eq 5 || s.status eq 6 || s.status eq 7}">${fns:getDictLabel(s.status,"order_detail_status","" )}</c:if>
|
|
|
- <c:if test="${s.status eq 6}">
|
|
|
- <br>${s.closeTime ne null?s.closeTime:''}
|
|
|
- </c:if>
|
|
|
+ <c:if test="${s.status == 0}"><font color="red">待确认</font></c:if>
|
|
|
+ <c:if test="${s.status == 1}"><font color="#ff8c00">已确认</font></c:if>
|
|
|
+ <c:if test="${s.status == 2}"><font color="#ff8c00">交易完成</font></c:if>
|
|
|
+ <c:if test="${s.status == 3}"><font color="green">订单完成</font></c:if>
|
|
|
+ <c:if test="${s.status == 4}"><font color="green">已关闭</font></c:if>
|
|
|
+ <c:if test="${s.status == 5}"><font color="green">交易全退</font></c:if>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
|
|
|
- style="text-decoration: underline">
|
|
|
- <c:if test="${s.receiptStatus == 1}">
|
|
|
- <font color="red">待收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.receiptStatus == 2}">
|
|
|
- <font color="#ff8c00">部分收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.receiptStatus == 3}">
|
|
|
- <font color="green">已收款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.receiptStatus == 4}">
|
|
|
- ----
|
|
|
- </c:if>
|
|
|
- </a>
|
|
|
+ <c:if test="${s.shopReceiptStatus == 1}"><font color="red">待收款</font></c:if>
|
|
|
+ <c:if test="${s.shopReceiptStatus == 2}"><font color="#ff8c00">部分收款</font></c:if>
|
|
|
+ <c:if test="${s.shopReceiptStatus == 3}"><font color="green">已收款</font></c:if>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <fmt:formatNumber value="${s.payableAmount}" type="number" pattern="#,##0.00"/>
|
|
|
- (余额抵扣:<fmt:formatNumber value="${s.balancePayFee}" type="number" pattern="#,##0.00"/>)
|
|
|
+ <fmt:formatNumber value="${s.needPayAmount}" type="number" pattern="#,##0.00"/>
|
|
|
+ (余额抵扣:<fmt:formatNumber value="${s.accountAmount}" type="number" pattern="#,##0.00"/>)
|
|
|
</td>
|
|
|
<td>
|
|
|
- <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
|
|
|
- style="text-decoration: underline">
|
|
|
- <c:if test="${s.alreadyReceipt eq '----'}">
|
|
|
- ${s.alreadyReceipt}
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.alreadyReceipt ne '----'}">
|
|
|
- <fmt:formatNumber value="${s.alreadyReceipt}" type="number" pattern="#,##0.00"/>
|
|
|
- </c:if>
|
|
|
- </a>
|
|
|
+ ${s.receiptAmount}
|
|
|
</td>
|
|
|
<td>
|
|
|
<c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
|
|
|
@@ -484,7 +462,7 @@
|
|
|
<c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
|
|
|
<c:if test="${s.payStatus == 3}"><font color="green">已付款</font>
|
|
|
<c:if test="${s.zeroCostFlag eq 1}">
|
|
|
- <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
|
|
|
+ <a href="javascript: void(0);" class="zeroCost"><span><img src="/static/images/info.jpg"
|
|
|
style="width: 15px;margin-bottom: 4px"></span>
|
|
|
<div class="message">
|
|
|
<span>商品成本为0，直接置为已付款，无需付款供应商</span>
|
|
|
@@ -494,162 +472,139 @@
|
|
|
</c:if>
|
|
|
<c:if test="${s.payStatus == 4}">----</c:if>
|
|
|
</td>
|
|
|
- <td><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></td>
|
|
|
+ <td><fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}" type="number" pattern="#,##0.00"/></td>
|
|
|
<td>
|
|
|
- <c:if test="${s.paid eq '----'}">
|
|
|
- ${s.alreadyReceipt}
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.paid ne '----'}">
|
|
|
- <fmt:formatNumber value="${s.paid}" type="number" pattern="#,##0.00"/>
|
|
|
- </c:if>
|
|
|
+ <fmt:formatNumber value="${s.payShopAmount}" type="number" pattern="#,##0.00"/>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <c:if test="${s.onlinePayFlag eq 0}">
|
|
|
- <c:if test="${s.settleAmount < s.shouldPayShopAmount && s.settleAmount > 0}"><font color="#ff8c00">部分结算</font></c:if>
|
|
|
- <c:if test="${s.settleAmount eq s.shouldPayShopAmount && s.settleAmount > 0}"><font color="green">已结算</font></c:if>
|
|
|
- <c:if test="${s.settleAmount eq 0}"><font color="red">未结算</font></c:if>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.onlinePayFlag eq 1}">---</c:if>
|
|
|
+ <c:if test="${s.settleStatus == 1}"><font color="#ff8c00">未结算</font></c:if>
|
|
|
+ <c:if test="${s.settleStatus == 2}"><font color="green">部分结算</font></c:if>
|
|
|
+ <c:if test="${s.settleStatus == 3}"><font color="red">已结算</font></c:if>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <c:if test="${s.onlinePayFlag eq 0}"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></c:if>
|
|
|
- <c:if test="${s.onlinePayFlag eq 1}">---</c:if>
|
|
|
+ <fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}" type="number" pattern="#,##0.00"/>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <c:if test="${s.onlinePayFlag eq 0}"><fmt:formatNumber value="${s.settleAmount}" type="number" pattern="#,##0.00"/></c:if>
|
|
|
- <c:if test="${s.onlinePayFlag eq 1}">---</c:if>
|
|
|
+ <fmt:formatNumber value="${s.settleAmount}" type="number" pattern="#,##0.00"/>
|
|
|
</td>
|
|
|
<td>
|
|
|
- <c:if test="${s.refundType == 1}">
|
|
|
- <font>部分退款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.refundType == 2}">
|
|
|
- <font>已退款</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.refundType != 1 && s.refundType != 2}">
|
|
|
+ <c:if test="${s.refundStatus == 1}">
|
|
|
<font>无退款</font>
|
|
|
</c:if>
|
|
|
- </td>
|
|
|
- <td><fmt:formatNumber value="${s.returnValue}" type="number" pattern="#,##0.00"/></td>
|
|
|
- <td>
|
|
|
- <c:if test="${s.organizeID == '1'}">
|
|
|
- <span class="org-note">星范</span>
|
|
|
- </c:if>
|
|
|
- ${s.clubName}
|
|
|
- <c:if test="${s.orderType eq 2}">
|
|
|
- <font color="red">(呵呵商城)</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${s.organizeID == 3}">
|
|
|
-
|
|
|
+ <c:if test="${s.refundStatus == 3}">
|
|
|
+ <font>有退款</font>
|
|
|
</c:if>
|
|
|
</td>
|
|
|
+ <td><fmt:formatNumber value="${s.canRefundAmount}" type="number" pattern="#,##0.00"/></td>
|
|
|
<td>
|
|
|
- ${s.couponAmount}
|
|
|
+ <fmt:formatNumber value="${s.couponAmount}" type="number" pattern="#,##0.00"/>
|
|
|
</td>
|
|
|
<td><fmt:formatNumber value="${s.discountFee}" type="number" pattern="#,##0.00"/></td>
|
|
|
+ </tr>
|
|
|
+ <tr class="t2">
|
|
|
+ <th colspan="3">机构</th>
|
|
|
+ <th colspan="3">供应商</th>
|
|
|
+ <th colspan="2">商品费</th>
|
|
|
+ <th colspan="2">已付供应商</th>
|
|
|
+ <th>供应商退款</th>
|
|
|
+ <th colspan="2">应付供应商</th>
|
|
|
+ <th colspan="2">应付税费</th>
|
|
|
+ <th colspan="2">机构运费</th>
|
|
|
+ <th>供应商运费</th>
|
|
|
+ <th colspan="2">付第三方</th>
|
|
|
+ </tr>
|
|
|
+ <tr class="t2">
|
|
|
+ <td colspan="3">
|
|
|
+ <c:if test="${s.organizeID eq 1}"><span class="org-note">星范</span></c:if>
|
|
|
+ ${s.clubName}
|
|
|
+ <c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
|
|
|
+ <c:if test="${s.organizeID == 4}"><font color="red">(丽格集采联盟)</font></c:if>
|
|
|
+ </td>
|
|
|
+ <td colspan="3">${s.shopName}</td>
|
|
|
+ <td colspan="2" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}"
|
|
|
+ type="number" pattern="#,##0.00"/></td>
|
|
|
+ <td colspan="2"><fmt:formatNumber value="${s.payedShopAmount}" type="number"
|
|
|
+ pattern="#,##0.00"/></td>
|
|
|
<td>
|
|
|
- <c:if test="${s.freight == 0}">
|
|
|
+ <fmt:formatNumber value="${s.refundAmount}" type="number" pattern="#,##0.00"/>
|
|
|
+ </td>
|
|
|
+ <td colspan="2">
|
|
|
+ <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
|
|
|
+ <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount-s.shopOtherFee}" type="number"
|
|
|
+ pattern="#,##0.00"/></font>
|
|
|
+ </c:if>
|
|
|
+ <%--1少付2多付--%>
|
|
|
+ <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
|
|
|
+ <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice-s.shopOtherFee}"/></font><font color="red">(原应付：${s.shouldPayShopAmount-s.shopOtherFee},已补差价：${s.differencePrice})</font>
|
|
|
+ </c:if>
|
|
|
+ <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
|
|
|
+ <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice-s.shopOtherFee}"/></font><font color="red">(原应付：${s.shouldPayShopAmount-s.shopOtherFee}，已退差价：${s.differencePrice})</font>
|
|
|
+ </c:if>
|
|
|
+
|
|
|
+ </td>
|
|
|
+ <td colspan="2"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
|
|
|
+ pattern="#,##0.00"/></td>
|
|
|
+ <td colspan="2">
|
|
|
+ <c:if test="${s.shopPostFlag == 0}">
|
|
|
包邮
|
|
|
</c:if>
|
|
|
- <c:if test="${s.freight == -1}">
|
|
|
+ <c:if test="${s.shopPostFlag == 2}">
|
|
|
到付
|
|
|
</c:if>
|
|
|
- <c:if test="${s.freight == -2}">
|
|
|
+ <c:if test="${s.shopPostFlag == -2}">
|
|
|
仪器到付-产品包邮
|
|
|
</c:if>
|
|
|
- <c:if test="${s.freight != -1 && s.freight != 0 && s.freight != -2}">
|
|
|
- <fmt:formatNumber value="${s.freight}" type="currency"/>
|
|
|
+ <c:if test="${s.shopPostFlag != 2 && s.shopPostFlag != 0 && s.shopPostFlag != -2}">
|
|
|
+ <fmt:formatNumber value="${s.shopPostFee}" type="number" pattern="#,##0.00"/>
|
|
|
<c:if test="${s.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
|
|
|
</c:if>
|
|
|
+ <c:if test="${s.userBeans > 0}">
|
|
|
+ <br><font color="red">（采美豆抵用：${s.userBeans}）</font>
|
|
|
+ </c:if>
|
|
|
</td>
|
|
|
- <td>
|
|
|
- <c:if test="${s.rebateOrder == '1'}">是</c:if>
|
|
|
- <c:if test="${s.rebateOrder == '0'}">否</c:if>
|
|
|
- </td>
|
|
|
+ <td class="product-freight"><fmt:formatNumber value="${s.shopPostFee}" type="number"
|
|
|
+ pattern="#,##0.00"/></td>
|
|
|
+ <td colspan="2"><fmt:formatNumber value="${s.shopOtherFee}" type="number" pattern="#,##0.00"/></td>
|
|
|
+
|
|
|
</tr>
|
|
|
- <c:forEach items="${s.newShopOrders}" var="so" varStatus="soIndex">
|
|
|
- <tr class="t2">
|
|
|
- <th colspan="3">子订单编号(ID)</th>
|
|
|
- <th colspan="3">供应商</th>
|
|
|
- <th colspan="2">商品费</th>
|
|
|
- <th colspan="2">已付供应商</th>
|
|
|
- <th>供应商退款</th>
|
|
|
- <th colspan="2">应付供应商</th>
|
|
|
- <th colspan="3">应付税费</th>
|
|
|
- <th>供应商运费</th>
|
|
|
- <th colspan="2">付第三方</th>
|
|
|
- <th colspan="2">成本类型</th>
|
|
|
- </tr>
|
|
|
- <tr class="t2">
|
|
|
- <td colspan="3">${so.shopOrderNo}(${so.shopOrderID})</td>
|
|
|
- <td colspan="3">${so.shopName}</td>
|
|
|
- <td colspan="2" class="product-fee"><fmt:formatNumber value="${so.shopProductAmount}"
|
|
|
- type="number" pattern="#,##0.00"/></td>
|
|
|
- <td colspan="2"><fmt:formatNumber value="${so.payedShopAmount}" type="number"
|
|
|
- pattern="#,##0.00"/></td>
|
|
|
- <td>
|
|
|
- <c:if test="${so.refundAmount > 0}">
|
|
|
- <fmt:formatNumber value="${so.refundAmount}" type="number" pattern="#,##0.00"/>
|
|
|
- </c:if>
|
|
|
+ <tr>
|
|
|
+ <th colspan="3">商品名</th>
|
|
|
+ <th>规格</th>
|
|
|
+ <th>数量<%--（赠品）--%></th>
|
|
|
+ <th>退货</th>
|
|
|
+ <th colspan="2">单价</th>
|
|
|
+ <th colspan="3">机构税率 / 单税费 / 总税费</th>
|
|
|
+ <th colspan="2">总价</th>
|
|
|
+ <th colspan="3">供应商税率 / 单税费 / 总税费</th>
|
|
|
+ <th colspan="2">成本(单 + 税)</th>
|
|
|
+ <th colspan="2">成本(总)</th>
|
|
|
+ </tr>
|
|
|
+ <c:forEach items="${s.newOrderProducts}" var="p" varStatus="pIndex">
|
|
|
+ <tr class="pay-product-item">
|
|
|
+ <input type="hidden" class="p-copId" value="${p.orderProductID}">
|
|
|
+ <td style="width:300px;" class="p-name" colspan="3">
|
|
|
+ <c:if test="${p.productType eq 1}"><font color="red">协商赠品:</font></c:if>
|
|
|
+ <c:if test="${p.productType eq 2}"><font color="red">促销赠品:</font></c:if>
|
|
|
+ ${p.name}
|
|
|
</td>
|
|
|
- <td colspan="2">
|
|
|
- <c:if test="${so.differenceType ne 1 && so.differenceType ne 2 }">
|
|
|
- <font color="#E15616"><fmt:formatNumber value="${so.shouldPayShopAmount}" type="number"
|
|
|
- pattern="#,##0.00"/></font>
|
|
|
- </c:if>
|
|
|
- <%--1少付2多付--%>
|
|
|
- <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">
|
|
|
- <font color="black"><fmt:formatNumber value="${so.shouldPayShopAmount+so.differencePrice}"/></font><font color="red">(原应付：${so.shouldPayShopAmount},已补差价：${so.differencePrice})</font>
|
|
|
- </c:if>
|
|
|
- <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">
|
|
|
- <font color="black"><fmt:formatNumber value="${so.shouldPayShopAmount-so.differencePrice}"/></font><font color="red">(原应付：${so.shouldPayShopAmount}，已退差价：${so.differencePrice})</font>
|
|
|
+ <td style="width:80px;">${p.unit}</td>
|
|
|
+ <td class="p-num" data-num="${p.num + p.presentNum}">
|
|
|
+ ${p.num}
|
|
|
+ <c:if test="${p.presentNum > 0}">(赠:${p.presentNum})</c:if>
|
|
|
+ </td>
|
|
|
+ <td><font color="${p.returnedNum>0?'red':''}">${p.returnedNum}</font></td>
|
|
|
+ <td colspan="2"><fmt:formatNumber value="${empty p.touchPrice?p.discountPrice:p.touchPrice}"
|
|
|
+ type="number" pattern="#,##0.00"/>
|
|
|
+ <c:if test="${p.includedTax != null and p.includedTax != '' and p.includedTax ne 2}">
|
|
|
+ <label style="color: red">
|
|
|
+ （${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'}）
|
|
|
+ </label>
|
|
|
</c:if>
|
|
|
-
|
|
|
</td>
|
|
|
- <td colspan="3"><fmt:formatNumber value="${so.shopTaxFee}" type="number"
|
|
|
- pattern="#,##0.00"/></td>
|
|
|
- <td class="product-freight"><fmt:formatNumber value="${so.shopPostFee}" type="number"
|
|
|
- pattern="#,##0.00"/></td>
|
|
|
- <td colspan="2"><fmt:formatNumber value="${so.shopOtherFee}" type="number" pattern="#,##0.00"/></td>
|
|
|
- <td colspan="2"><c:if test="${empty so.costType || so.costType == '1'}">固定成本</c:if><c:if
|
|
|
- test="${so.costType == '2'}">比例成本</c:if></td>
|
|
|
- </tr>
|
|
|
- <tr>
|
|
|
- <th colspan="3">商品名</th>
|
|
|
- <th>规格</th>
|
|
|
- <th>数量<%--（赠品）--%></th>
|
|
|
- <th>退货</th>
|
|
|
- <th colspan="2">单价</th>
|
|
|
- <th colspan="3">机构税率 / 单税费 / 总税费</th>
|
|
|
- <th colspan="2">总价</th>
|
|
|
- <th colspan="3">供应商税率 / 单税费 / 总税费</th>
|
|
|
- <th>成本(单)</th>
|
|
|
- <th colspan="4">成本(总)</th>
|
|
|
- </tr>
|
|
|
- <c:forEach items="${so.newOrderProducts}" var="p" varStatus="pIndex">
|
|
|
- <tr class="pay-product-item">
|
|
|
- <td colspan="3" class="product-name">
|
|
|
- <c:if test="${p.productType eq 1}"><font color="red">协商赠品:</font></c:if>
|
|
|
- <c:if test="${p.productType eq 2}"><font color="red">促销赠品:</font></c:if>
|
|
|
- ${p.name}
|
|
|
- </td>
|
|
|
- <td style="width:80px;">${p.unit}</td>
|
|
|
- <td class="p-num" data-num="${p.num + p.presentNum}">
|
|
|
- ${p.num}
|
|
|
- <c:if test="${p.presentNum > 0}">(赠:${p.presentNum})</c:if>
|
|
|
- </td>
|
|
|
- <td><font color="${p.returnedNum>0?'red':''}">${p.returnedNum}</font></td>
|
|
|
- <td colspan="2"><fmt:formatNumber value="${empty p.touchPrice?p.discountPrice:p.touchPrice}"
|
|
|
- type="number" pattern="#,##0.00"/>
|
|
|
- <c:if test="${p.includedTax != null and p.includedTax != '' and p.includedTax ne 2}">
|
|
|
- <label style="color: red">
|
|
|
- （${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'}）
|
|
|
- </label>
|
|
|
- </c:if>
|
|
|
- </td>
|
|
|
- <td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.taxRate?0.0:p.taxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
|
|
|
- <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.addedValueTax ?0.00:p.addedValueTax}</td>
|
|
|
- <td><c:choose>
|
|
|
+ <td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.taxRate?0.0:p.taxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
|
|
|
+ <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.addedValueTax ?0.00:p.addedValueTax}</td>
|
|
|
+ <td>
|
|
|
+ <c:choose>
|
|
|
<c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
|
|
|
---
|
|
|
</c:when>
|
|
|
@@ -658,13 +613,15 @@
|
|
|
value="${empty p.totalAddedValueTax ?0.00:(p.addedValueTax * (p.num+p.presentNum-p.returnedNum))}"
|
|
|
type="number" pattern="#,##0.00"/>
|
|
|
</c:otherwise>
|
|
|
- </c:choose></td>
|
|
|
- <td colspan="2"><fmt:formatNumber
|
|
|
- value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}"
|
|
|
- type="number" pattern="#,##0.00"/></td>
|
|
|
- <td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
|
|
|
- <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
|
|
|
- <td><c:choose>
|
|
|
+ </c:choose>
|
|
|
+ </td>
|
|
|
+ <td colspan="2"><fmt:formatNumber
|
|
|
+ value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}"
|
|
|
+ type="number" pattern="#,##0.00"/></td>
|
|
|
+ <td class="p-taxes">${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
|
|
|
+ <td class="p-taxes">${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
|
|
|
+ <td class="p-taxes-t">
|
|
|
+ <c:choose>
|
|
|
<c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
|
|
|
---
|
|
|
</c:when>
|
|
|
@@ -673,13 +630,13 @@
|
|
|
value="${empty p.shouldPayTotalTax ?0.00:(p.singleShouldPayTotalTax * (p.num+p.presentNum-p.returnedNum))}"
|
|
|
type="number" pattern="#,##0.00"/>
|
|
|
</c:otherwise>
|
|
|
- </c:choose></td>
|
|
|
- <td><fmt:formatNumber value="${p.costPrice}" type="number" pattern="#,##0.00"/></td>
|
|
|
- <td colspan="4"><fmt:formatNumber
|
|
|
- value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}" type="number"
|
|
|
- pattern="#,##0.00"/></td>
|
|
|
- </tr>
|
|
|
- </c:forEach>
|
|
|
+ </c:choose>
|
|
|
+ </td>
|
|
|
+ <td class="p-costprice" colspan="2"><fmt:formatNumber value="${p.costPrice}" type="number"
|
|
|
+ pattern="#,##0.00"/></td>
|
|
|
+ <td colspan="2"><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}"
|
|
|
+ type="number" pattern="#,##0.00"/></td>
|
|
|
+ </tr>
|
|
|
</c:forEach>
|
|
|
</table>
|
|
|
<div style="float:right">
|
|
|
@@ -691,7 +648,7 @@
|
|
|
</c:if>
|
|
|
<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord?orderID=${s.orderID}&shopOrderID=${s.shopOrderID}&from=3">收付款记录</a>
|
|
|
<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecordByOrderID?orderID=${s.orderID}&from=3">用户退款/货记录</a>
|
|
|
- <a href="${ctx}/shopOrder/refundRecord?orderID=${s.orderID}">供应商退/付款记录</a>
|
|
|
+ <a href="${ctx}/shopOrder/refundRecord?shopOrderId=${s.shopOrderID}">供应商退/付款记录</a>
|
|
|
</div>
|
|
|
</div>
|
|
|
</c:forEach>
|
