付供应商金额bugfix

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

@@ -594,10 +594,10 @@
                             </c:if>
                                   <%--1少付2多付--%>
                             <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">
-                                <font color="black">${so.shouldPayShopAmount+so.differencePrice}</font><font color="red">(原应付：${so.shouldPayShopAmount},已补差价：${so.differencePrice})</font>
+                                <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">${so.shouldPayShopAmount-so.differencePrice}</font><font color="red">(原应付：${so.shouldPayShopAmount}，已退差价：${so.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${so.shouldPayShopAmount-so.differencePrice}"/></font><font color="red">(原应付：${so.shouldPayShopAmount}，已退差价：${so.differencePrice})</font>
                             </c:if>
 
                         </td>

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

@@ -461,10 +461,10 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                             <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -473,10 +473,10 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                             <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -219,10 +219,10 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                                 <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -558,10 +558,10 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                                 <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -502,7 +502,7 @@
                             <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${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}" type="number" pattern="#,##0.00"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>

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

@@ -473,10 +473,10 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                             <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -590,10 +590,10 @@
                                     value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>，
                             已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>

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

@@ -414,10 +414,10 @@
                                     value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
                             ，已付：<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>

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

@@ -232,10 +232,10 @@
 								应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
 							</c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-								<font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+								<font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
 							</c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-								<font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+								<font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
 							</c:if>
 							，</span>
 								<span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -528,10 +528,10 @@
                                 应付：<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                             </c:if>
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                             </c:if>
 							，</span>
                                 <span class="nowrap">已付：${s.payedShopAmount}，</span></div>

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

@@ -449,10 +449,10 @@
                             <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">

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

@@ -418,10 +418,10 @@
                             <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                         </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
                         </c:if>
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                            <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
                         </c:if>
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">

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

@@ -210,10 +210,10 @@
                     <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                 </c:if>
             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
             </c:if>
             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
             </c:if>
         </td>
     </tr>

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

@@ -180,10 +180,10 @@
                     <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
                 </c:if>
             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                <font color="black">${s.shouldPayShopAmount+s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
+                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount+s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount},已补差价：${s.differencePrice})</font>
             </c:if>
             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                <font color="black">${s.shouldPayShopAmount-s.differencePrice}</font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
+                <font color="black"><fmt:formatNumber value="${s.shouldPayShopAmount-s.differencePrice}"/></font><font color="red">(原应付：${s.shouldPayShopAmount}，已退差价：${s.differencePrice})</font>
             </c:if>
         </td>
     </tr>