修改页面显示

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

@@ -264,7 +264,7 @@
 		</div>
 		<div class="payment-form-bottom">
 			<div >
-				<label style="font-weight: bold; font-size:18px">付供应商总金额：</label>
+				<label style="font-weight: bold; font-size:18px">${cmPayShop.paymentType eq 2 ? "需补供应商差价":"付供应商总金额"}：</label>
 				<span id="totalAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00"/> </span>
 				<c:if test="${cmPayShop.wipePayment > 0}">
 					<span class="red">（付款抹平总额：￥<fmt:formatNumber value="${cmPayShop.wipePayment}" pattern="#,##0.00"/>）</span>

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

@@ -275,7 +275,7 @@
 		</div>
 		<div class="payment-form-bottom">
 			<div >
-				<label style="font-weight: bold; font-size:18px">付供应商总金额：</label>
+				<label style="font-weight: bold; font-size:18px">${cmPayShop.paymentType eq 2 ? "需补供应商差价":"付供应商总金额"}：</label>
 				<span id="totalAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00"/> </span>
 				<c:if test="${cmPayShop.wipePayment > 0}">
 					<span class="red">（付款抹平总额：￥<fmt:formatNumber value="${cmPayShop.wipePayment}" pattern="#,##0.00"/>）</span>

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

@@ -165,8 +165,14 @@
                         <td colspan="2" class="payCm-t"></td>
                         <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
                         <td colspan="2" class="supplier-fee">
-                            <div>应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>,
-                                 已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
+                            <div>应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+                                <c:if test="${s.differenceType eq 1}">
+                                    <font color="red">(需补差价￥${s.differencePrice})</font>
+                                </c:if>
+                                <c:if test="${s.differenceType eq 2}">
+                                    <font color="red">(需退差价￥${s.differencePrice})</font>
+                                </c:if>
+                                ,已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                             </div>
                             <div>待付：<fmt:formatNumber value="${s.wipePayment>0 ? 0 : s.waitPayShop}" type="number" pattern="#,##0.00"/></div>
 							<c:if test="${s.wipePayment > 0}">
@@ -244,7 +250,7 @@
         </div>
         <div class="payment-form-bottom">
             <div>
-                <label style="font-weight: bold; font-size:18px">付供应商总金额：</label>
+                <label style="font-weight: bold; font-size:18px">${cmPayShop.paymentType eq 2 ? "需补供应商差价":"付供应商总金额"}：</label>
                 <span id="totalAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00"/> </span>
 				<c:if test="${cmPayShop.wipePayment > 0}">
 					<span class="red">（付款抹平总额：￥<fmt:formatNumber value="${cmPayShop.wipePayment}" pattern="#,##0.00"/>）</span>

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

@@ -275,7 +275,7 @@
 		<div class="inputForm">
 			<table border="0" cellspacing="0" cellpadding="0" width="100%">
 				<tr>
-					<th><span style="font-weight:bold;font-size:18px">付供应商总金额：</span></th>
+					<th><span style="font-weight:bold;font-size:18px">${cmPayShop.paymentType eq 2 ? "需补供应商差价":"付供应商总金额"}：</span></th>
 					<td colspan="3">
 						<span id="totalAmount" style="font-weight: bold;font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00"/></span>
 						<span class="wipeVisible">（付款抹平总额：<em class="red wipeTotalFee">￥0.00</em>）</span>

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

@@ -169,8 +169,14 @@
 						<c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if></td>
 					<td class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
 					<td class="supplier-fee">
-						<div>应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>，
-							 已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
+						<div>应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+							<c:if test="${s.differenceType eq 1}">
+								<font color="red">(需补差价￥${s.differencePrice})</font>
+							</c:if>
+							<c:if test="${s.differenceType eq 2}">
+								<font color="red">(需退差价￥${s.differencePrice})</font>
+							</c:if>
+							，已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
 						</div>
 						<div>
 							<c:if test="${s.refundAmount > 0}">
@@ -229,7 +235,7 @@
 		</div>
 		<div class="payment-form-bottom">
 			<div>
-				<label style="font-weight: bold; font-size:18px">付供应商总金额：</label>
+				<label style="font-weight: bold; font-size:18px">${cmPayShop.paymentType eq 2 ? "需补供应商差价":"付供应商总金额"}：</label>
 				<span id="totalAmount" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00"/> </span>
 				<c:if test="${cmPayShop.wipePayment > 0}">
 					<span class="red">（付款抹平总额：￥<fmt:formatNumber value="${cmPayShop.wipePayment}" pattern="#,##0.00"/>）</span>