bugfix

src/main/webapp/WEB-INF/views/modules/order/cmPayShopPrintDetail.jsp

@@ -101,7 +101,7 @@
 						<th colspan="2">下单时间</th>
 						<th>订单金额</th>
 						<th colspan="3">所有子订单</th>
-						<th>订单总佣金</th>
+<%--						<th>订单总佣金</th>--%>
 						<th>机构运费</th>
 						<th>收款状态</th>
 						<th colspan="3">收款金额</th>
@@ -118,7 +118,7 @@
 							${cs}<br/>
 						</c:forEach>
 						</td>
-						<td>${s.income}</td>
+<%--						<td>${s.income}</td>--%>
 						<td>
 							<label class="clubFreight" style="display: none">
 								<c:choose>
@@ -148,15 +148,16 @@
 							</c:if>
 						</td>
 						<td>
-							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
-							   style="text-decoration: underline">
+<%--							<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></a>
 						</td>
 						<td colspan="3">
-							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
-							   style="text-decoration: underline">${s.receiptTotalFee}</a>
+<%--							<a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"--%>
+<%--							   style="text-decoration: underline">--%>
+									${s.receiptTotalFee}</a>
 						</td>
 						<td>
 							<label class="discountFee" style="display: none">
@@ -196,19 +197,19 @@
 					<tr>
 						<th>子订单编号(ID)</th>
 						<th colspan="3"> 供应商</th>
-						<th colspan="3">子订单佣金</th>
+<%--						<th colspan="3">子订单佣金</th>--%>
 						<th colspan="3">商品费</th>
 						<th>应付税费</th>
 						<th>供应商运费</th>
 						<th>付款状态</th>
 						<th colspan="3">付供应商</th>
-						<th>付第三方</th>
-						<th>成本类型</th>
+						<th colspan="2">付第三方</th>
+						<th colspan="2">成本类型</th>
 					</tr>
 					<tr>
 						<td>${s.shopOrderNo}(${s.shopOrderID})</td>
 						<td colspan="3">${s.shopName}</td>
-						<td colspan="3" class="payCm-t">子订单佣金</td>
+<%--						<td colspan="3" class="payCm-t">子订单佣金</td>--%>
 						<td colspan="3" class="product-fee">${s.shopProductAmount}</td>
 
 						<td class="taxes">
@@ -250,9 +251,9 @@
 									class="red wipeText">￥0.00</em></span></label>
 						</td>
 
-						<td class="third-party-fee">${s.shopOtherFee}</td>
+						<td colspan="2" class="third-party-fee">${s.shopOtherFee}</td>
 
-						<td>
+						<td colspan="2">
 							<c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if>
 							<c:if test="${s.costType == '2'}">比例成本</c:if>
 						</td>
@@ -262,14 +263,14 @@
 						<th>规格</th>
 						<th>数量<%--（赠品）--%></th>
 						<th>退货</th>
-						<th colspan="3">单价</th>
-						<th colspan="3">机构税率 / 单税费 / 总税费</th>
-						<th>总价</th>
-						<th>佣金(单)</th>
-						<th>佣金(总)</th>
-						<th colspan="3">供应商税率 / 单税费 / 总税费</th>
-						<th>成本(单)</th>
-						<th>成本(总)</th>
+<%--						<th colspan="3">单价</th>--%>
+<%--						<th colspan="3">机构税率 / 单税费 / 总税费</th>--%>
+<%--						<th>总价</th>--%>
+<%--						<th>佣金(单)</th>--%>
+<%--						<th>佣金(总)</th>--%>
+						<th colspan="6">供应商税率 / 单税费 / 总税费</th>
+						<th colspan="3">成本(单)</th>
+						<th colspan="4">成本(总)</th>
 					</tr>
 					<c:forEach items="${s.newOrderProducts}" var="p" varStatus="pIndex">
 						<tr class="pay-product-item">
@@ -285,40 +286,40 @@
 								<c:if test="${p.presentNum > 0}">(赠:${p.presentNum})</c:if>
 							</td>
 							<td><font color="${p.returnedNum>0?'red':''}">${p.returnedNum}</font></td>
-							<td colspan="3"><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>
-								<c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">
-									---
-								</c:when>
-								<c:otherwise>
-									<fmt:formatNumber
-											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><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><fmt:formatNumber
-									value="${(empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}"
-									pattern="#,##0.00"/></td>
+<%--							<td colspan="3"><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>--%>
+<%--								<c:when test="${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))}">--%>
+<%--									-----%>
+<%--								</c:when>--%>
+<%--								<c:otherwise>--%>
+<%--									<fmt:formatNumber--%>
+<%--											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><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><fmt:formatNumber--%>
+<%--									value="${(empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}"--%>
+<%--									pattern="#,##0.00"/></td>--%>
 
-							<td class="payCm"><fmt:formatNumber
-									value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}"
-									pattern="#,##0.00"/></td>
+<%--							<td class="payCm"><fmt:formatNumber--%>
+<%--									value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}"--%>
+<%--									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>
+							<td colspan="2" 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 colspan="2" 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 colspan="2" 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>
@@ -328,9 +329,9 @@
 											type="number" pattern="#,##0.00"/>
 								</c:otherwise>
 							</c:choose></td>
-							<td class="p-costprice"><fmt:formatNumber value="${p.costPrice}" type="number"
+							<td colspan="3" class="p-costprice"><fmt:formatNumber value="${p.costPrice}" type="number"
 																	  pattern="#,##0.00"/></td>
-							<td><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}"
+							<td colspan="4"><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}"
 												  type="number" pattern="#,##0.00"/></td>
 						</tr>
 					</c:forEach>