Browse Source

付供应商优化

plf 3 years ago
parent
commit
45f45ba057

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

@@ -562,12 +562,13 @@
                                 <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="red">${so.shouldPayShopAmount-so.differencePrice}(原应付:${so.shouldPayShopAmount},已退差价:${so.differencePrice})</font>
+                                <font color="red">${so.shouldPayShopAmount+so.differencePrice}(原应付:${so.shouldPayShopAmount},已补差价:${so.differencePrice})</font>
                             </c:if>
 
                             <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">
-                                <font color="red">${so.shouldPayShopAmount+so.differencePrice}(原应付:${so.shouldPayShopAmount},已补差价:${so.differencePrice})</font>
+                                <font color="red">${so.shouldPayShopAmount-so.differencePrice}(原应付:${so.shouldPayShopAmount},已退差价:${so.differencePrice})</font>
                             </c:if>
 
                         </td>

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

@@ -1,151 +1,383 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>付款单表管理</title>
-	<meta name="decorator" content="default"/>
-	<style>
-		.table th{text-align:center}
-		.table td{text-align:center}
-		.payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px solid #eee}
-		.required{color:red}
-		.payment-form label{width:100px;text-align:right;vertical-align:middle;font-weight:600}
-		.payment-form-top{padding:10px 0}
-		.payment-form-top>div,.payment-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px solid #eee;white-space:nowrap}
-		.payment-form-top input{vertical-align:baseline}
-		.payment-form-top>div:last-child span{margin-left:15px}
-		.payment-form-top>div:last-child span:nth-of-type(1){margin-left:0}
-		.pay-list-item{margin-bottom:30px}
-		.pay-table{width:96%;margin-left:2%;margin-bottom:10px}
-		.pay-table th{background:#f9f9f9}
-		.pay-table tr:first-child th{background:#eee !important}
-		.pay-table td{background:#fff !important}
-		.supplier-fee{text-align:left !important;padding-top:20px !important;padding-left:20px !important}
-		.need-to-pay{width:90px}
-		.payment-form-bottom label{width:140px}
-		.used-amount{width:80px;margin-top:6px}
-		.process-details span{width:140px;margin-left:50px;font-weight:600}
-		.process-for-label{margin-left:0 !important}
-		.process-details div{display:inline-block}
-		.check-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
-		.check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
-		.check-cfm-btn{background:#3daae9;color:#fff}
-		.cfm-btn:active,.return-btn:active{background:#ddd;color:#fff}
-		.mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}
-		.tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}
-		.tips-popup-content div{width:100%;text-align:center}
-		.tips-popup-content{width:30%}
-		.tips-popup-content p{text-align:center;padding:80px;font-size:20px}
-		.tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}
-		.tips-cfm-btn,.tips-cancel-btn,.check-blue-btn,.check-grey-btn{width:100px;height:40px;margin:auto;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#3daae9;color:#fff;border:none}
-		.refuse-btn{margin-left:50px}
-		.return-btn,.tips-cancel-btn,.check-grey-btn{background:#fff;color:#555;margin-left:50px}
-		.tips-cancel-btn,.check-grey-btn{border:1px solid #ddd;margin-left:20px;display:none}
-		#close-btn1{top:8px;right:10px;width:18px;position:absolute;cursor:pointer}
-		.tips-popup-reason .tips-popup-content{height:250px}
-		.tips-popup-reason .tips-popup-content div{position:absolute;bottom:15px}
-		.tips-popup-reason .check-grey-btn{display:inline-block}
-		#refuse-reason{width:80%;height:48%;left:8%;position:absolute;resize:none}
-		.tips-popup-reason h5{color:#555;padding-left:8%;margin-bottom:4px;margin-top:-12px}
-		.red{color:red;}
-		.payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
-		.wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
-		.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
-	</style>
+    <title>付款单表管理</title>
+    <meta name="decorator" content="default"/>
+    <style>
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .payment-form h4 {
+            width: 96%;
+            margin-left: 2%;
+            padding-bottom: 20px;
+            text-align: center;
+            border-bottom: 1px solid #eee
+        }
+
+        .required {
+            color: red
+        }
+
+        .payment-form label {
+            width: 100px;
+            text-align: right;
+            vertical-align: middle;
+            font-weight: 600
+        }
+
+        .payment-form-top {
+            padding: 10px 0
+        }
+
+        .payment-form-top > div, .payment-form-bottom > div {
+            width: 94%;
+            margin-left: 3%;
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #eee;
+            white-space: nowrap
+        }
+
+        .payment-form-top input {
+            vertical-align: baseline
+        }
+
+        .payment-form-top > div:last-child span {
+            margin-left: 15px
+        }
+
+        .payment-form-top > div:last-child span:nth-of-type(1) {
+            margin-left: 0
+        }
+
+        .pay-list-item {
+            margin-bottom: 30px
+        }
+
+        .pay-table {
+            width: 96%;
+            margin-left: 2%;
+            margin-bottom: 10px
+        }
+
+        .pay-table th {
+            background: #f9f9f9
+        }
+
+        .pay-table tr:first-child th {
+            background: #eee !important
+        }
+
+        .pay-table td {
+            background: #fff !important
+        }
+
+        .supplier-fee {
+            text-align: left !important;
+            padding-top: 20px !important;
+            padding-left: 20px !important
+        }
+
+        .need-to-pay {
+            width: 90px
+        }
+
+        .payment-form-bottom label {
+            width: 140px
+        }
+
+        .used-amount {
+            width: 80px;
+            margin-top: 6px
+        }
+
+        .process-details span {
+            width: 140px;
+            margin-left: 50px;
+            font-weight: 600
+        }
+
+        .process-for-label {
+            margin-left: 0 !important
+        }
+
+        .process-details div {
+            display: inline-block
+        }
+
+        .check-btn {
+            width: 96%;
+            margin-left: 2%;
+            text-align: center;
+            height: 60px;
+            line-height: 60px;
+            margin-top: 30px
+        }
+
+        .check-btn button {
+            width: 100px;
+            height: 35px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            border: none;
+            border: 1px solid #ddd
+        }
+
+        .check-cfm-btn {
+            background: #3daae9;
+            color: #fff
+        }
+
+        .cfm-btn:active, .return-btn:active {
+            background: #ddd;
+            color: #fff
+        }
+
+        .mask {
+            width: 100%;
+            height: 100%;
+            position: fixed;
+            top: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none
+        }
+
+        .tips-popup-content {
+            width: 40%;
+            height: auto;
+            padding-bottom: 30px;
+            background: #fff;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%)
+        }
+
+        .tips-popup-content div {
+            width: 100%;
+            text-align: center
+        }
+
+        .tips-popup-content {
+            width: 30%
+        }
+
+        .tips-popup-content p {
+            text-align: center;
+            padding: 80px;
+            font-size: 20px
+        }
+
+        .tips-popup-content h4 {
+            padding-left: 10px;
+            height: 40px;
+            line-height: 40px;
+            border-bottom: 1px solid #eee;
+            margin-bottom: 20px
+        }
+
+        .tips-cfm-btn, .tips-cancel-btn, .check-blue-btn, .check-grey-btn {
+            width: 100px;
+            height: 40px;
+            margin: auto;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            background: #3daae9;
+            color: #fff;
+            border: none
+        }
+
+        .refuse-btn {
+            margin-left: 50px
+        }
+
+        .return-btn, .tips-cancel-btn, .check-grey-btn {
+            background: #fff;
+            color: #555;
+            margin-left: 50px
+        }
+
+        .tips-cancel-btn, .check-grey-btn {
+            border: 1px solid #ddd;
+            margin-left: 20px;
+            display: none
+        }
+
+        #close-btn1 {
+            top: 8px;
+            right: 10px;
+            width: 18px;
+            position: absolute;
+            cursor: pointer
+        }
+
+        .tips-popup-reason .tips-popup-content {
+            height: 250px
+        }
+
+        .tips-popup-reason .tips-popup-content div {
+            position: absolute;
+            bottom: 15px
+        }
+
+        .tips-popup-reason .check-grey-btn {
+            display: inline-block
+        }
+
+        #refuse-reason {
+            width: 80%;
+            height: 48%;
+            left: 8%;
+            position: absolute;
+            resize: none
+        }
+
+        .tips-popup-reason h5 {
+            color: #555;
+            padding-left: 8%;
+            margin-bottom: 4px;
+            margin-top: -12px
+        }
+
+        .red {
+            color: red;
+        }
+
+        .payment-form-bottom .wipeImgs {
+            height: auto;
+            padding: 8px 0;
+        }
+
+        .wipeImgs img {
+            width: 120px;
+            height: 90px;
+            background-color: #eee;
+            margin-right: 15px;
+        }
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
+    </style>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/order/cmPayShop/">付款管理</a></li>
-		<li class="active"><a href="${ctx}/order/cmPayShop/toCheck?id=${cmPayShop.id}">付款审核</a></li>
-	</ul><br/>
-		<div class="payment-form">
-		<h4>付款单</h4>
-		<div class="payment-form-top">
-			<div>
-				<label><span class="required">* </span>付款单名称:</label>
-				<span>${cmPayShop.name}</span>
-			</div>
-			<div>
-				<label>供应商名称:</label>
-				<span>${cmPayShop.shopName}</span>
-			</div>
-			<div>
-				<label><em class="required">* </em>付款账号:</label>
-				<span>户名:${cmPayShop.bankAccountName}</span>
-				<span>账号:${cmPayShop.bankAccount}</span>
-				<span>开户行:${cmPayShop.bankName}</span>
-				<span>账户类型:
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/order/cmPayShop/">付款管理</a></li>
+    <li class="active"><a href="${ctx}/order/cmPayShop/toCheck?id=${cmPayShop.id}">付款审核</a></li>
+</ul>
+<br/>
+<div class="payment-form">
+    <h4>付款单</h4>
+    <div class="payment-form-top">
+        <div>
+            <label><span class="required">* </span>付款单名称:</label>
+            <span>${cmPayShop.name}</span>
+        </div>
+        <div>
+            <label>供应商名称:</label>
+            <span>${cmPayShop.shopName}</span>
+        </div>
+        <div>
+            <label><em class="required">* </em>付款账号:</label>
+            <span>户名:${cmPayShop.bankAccountName}</span>
+            <span>账号:${cmPayShop.bankAccount}</span>
+            <span>开户行:${cmPayShop.bankName}</span>
+            <span>账户类型:
 					<c:if test="${cmPayShop.type == '0'}">公帐</c:if>
 					<c:if test="${cmPayShop.type == '1'}">私帐</c:if>
 				</span>
-			</div>
-		</div>
-		<div class="payment-form-content">
-			<c:forEach items="${cmPayShop.shopOrders}" var="s">
-            	<%--涛姐遍历下面这个table--%>
-				<table class="table table-striped table-bordered table-condensed pay-table">
-					<tr>
-						<th>子订单编号(ID)</th>
-						<th colspan="3">订单编号(ID)</th>
-						<th colspan="2">订单金额</th>
-						<th colspan="3">下单时间</th>
-						<th>收款状态</th>
-						<th>收款金额</th>
-						<th colspan="2">经理折扣</th>
-						<th colspan="3">成本类型</th>
-						<th colspan="2">付第三方</th>
-					</tr>
-					<tr>
-						<td>${s.shopOrderNo}(${s.shopOrderID})</td>
-						<td colspan="3">${s.orderNo}(${s.orderID})</td>
-						<td colspan="2">${s.payTotalFee}</td>
-						<td colspan="3">${s.orderTime}</td>
-						<%--此处对应订单列表收款状态--%>
-						<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">
+        </div>
+    </div>
+    <div class="payment-form-content">
+        <c:forEach items="${cmPayShop.shopOrders}" var="s">
+            <%--涛姐遍历下面这个table--%>
+            <table class="table table-striped table-bordered table-condensed pay-table">
+                <tr>
+                    <th>子订单编号(ID)</th>
+                    <th colspan="3">订单编号(ID)</th>
+                    <th colspan="2">订单金额</th>
+                    <th colspan="3">下单时间</th>
+                    <th>收款状态</th>
+                    <th>收款金额</th>
+                    <th colspan="2">经理折扣</th>
+                    <th colspan="3">成本类型</th>
+                    <th colspan="2">付第三方</th>
+                </tr>
+                <tr>
+                    <td>${s.shopOrderNo}(${s.shopOrderID})</td>
+                    <td colspan="3">${s.orderNo}(${s.orderID})</td>
+                    <td colspan="2">${s.payTotalFee}</td>
+                    <td colspan="3">${s.orderTime}</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></a></td>
-						<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
-						<td colspan="2">
-							<c:if test="${s.discountTotalFee gt 0}">
-								<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-									<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}" type="currency"/>
-								</c:if>
-								<c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-									¥0.00
-								</c:if>
-								<c:if test="${s.returnedPurchaseTotalFee gt 0}">
+                    <td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                           style="text-decoration: underline">${s.receiptTotalFee}</a></td>
+                    <td colspan="2">
+                        <c:if test="${s.discountTotalFee gt 0}">
+                            <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
+                                <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
+                                                  type="currency"/>
+                            </c:if>
+                            <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
+                                ¥0.00
+                            </c:if>
+                            <c:if test="${s.returnedPurchaseTotalFee gt 0}">
                                 <span style="color: red">
                                     (原<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>,因退货折扣取消
                                     <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
-									</c:if>
+                                        <fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
+                                    </c:if>
                                     <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
-									</c:if>)
+                                        <fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
+                                    </c:if>)
                                 </span>
-								</c:if>
-							</c:if>
-							<c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
-						</td>
-						<td colspan="3"><c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if><c:if test="${s.costType == '2'}">比例成本</c:if></td>
-						<td colspan="2" class="third-party-fee"><fmt:formatNumber value="${s.shopOtherFee}" type="number" pattern="#,##0.00"/></td>
-					</tr>
-					<tr>
-						<th>供应商</th>
-						<th colspan="3">机构</th>
-						<th>机构运费</th>
-						<th>供应商运费</th>
-						<th colspan="3">商品费</th>
-						<th colspan="2">付款状态</th>
-						<th colspan="2">采美佣金</th>
-						<th colspan="3">应付税费</th>
-						<th colspan="2">付供应商</th>
-					</tr>
-					<tr>
-						<td>${s.shopName}</td>
-						<td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
-						<td>
+                            </c:if>
+                        </c:if>
+                        <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                    </td>
+                    <td colspan="3"><c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if><c:if
+                            test="${s.costType == '2'}">比例成本</c:if></td>
+                    <td colspan="2" class="third-party-fee"><fmt:formatNumber value="${s.shopOtherFee}" type="number"
+                                                                              pattern="#,##0.00"/></td>
+                </tr>
+                <tr>
+                    <th>供应商</th>
+                    <th colspan="3">机构</th>
+                    <th>机构运费</th>
+                    <th>供应商运费</th>
+                    <th colspan="3">商品费</th>
+                    <th colspan="2">付款状态</th>
+                    <th colspan="2">采美佣金</th>
+                    <th colspan="3">应付税费</th>
+                    <th colspan="2">付供应商</th>
+                </tr>
+                <tr>
+                    <td>${s.shopName}</td>
+                    <td colspan="3">${s.buyer}<c:if test="${s.organizeID == 3}"></c:if></td>
+                    <td>
                         <c:if test="${s.freight == 0}">
                             包邮
                         </c:if>
@@ -160,144 +392,169 @@
                             <c:if test="${s.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
                         </c:if>
                     </td>
-						<td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number" pattern="#,##0.00"/></td>
-						<td colspan="3" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number" pattern="#,##0.00"/></td>
-						<td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
-							<c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-							<c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
-						</td>
-						<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"/>
-
-								<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-									<font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
-								</c:if>
-
-								<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-									<font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
-								</c:if>
-
-								, 已付:<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
-							</div>
-							<div>
-								<c:if test="${s.refundAmount > 0}">
-									<span style="color:red">退款:<fmt:formatNumber value="${s.refundAmount}" type="number" pattern="#,##0.00"/></span>,
-								</c:if>
-								待付: <fmt:formatNumber value="${s.waitPayShop}" type="number" pattern="#,##0.00"/>
-							</div>
-							<c:if test="${s.wipePayment > 0}">
-								<div>
-									付款抹平:<fmt:formatNumber value="${s.wipePayment}" type="number" pattern="#,##0.00"/>
-								</div>
-							</c:if>
-						</td>
-					</tr>
-					<tr>
-						<th>商品名</th>
-						<th>规格</th>
-						<th>数量<%--(赠品)--%></th>
-						<th>退货</th>
-						<th colspan="2">单价</th>
-						<th colspan="3">机构税率 / 单税费 / 总税费</th>
-						<th colspan="2">总价</th>
-						<th>佣金(单)</th>
-						<th>佣金(总)</th>
-						<th colspan="3">供应商税率 / 单税费 / 总税费</th>
-						<th>成本(单)</th>
-						<th>成本(总)</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">
-								<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}">
-									<font color="red">
-										(${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'})
-									</font>
-								</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 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>
-							<c:if test="${empty p.touchPrice}">
-								<td><fmt:formatNumber value="${p.discountPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}" pattern="#,##0.00"/></td>
-								<td class="payCm"><fmt:formatNumber value="${(p.discountPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}" pattern="#,##0.00"/></td>
-							</c:if>
-							<c:if test="${!empty p.touchPrice}">
-								<td><fmt:formatNumber value="${p.touchPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}" pattern="#,##0.00"/></td>
-								<td class="payCm"><fmt:formatNumber value="${(p.touchPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}" pattern="#,##0.00"/></td>
-							</c:if>
-							<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>
-								<c:otherwise>
-									<fmt:formatNumber 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 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)}" type="number" pattern="#,##0.00"/></td>
-						</tr>
-					</c:forEach>
-			</table>
-			</c:forEach>
-		</div>
-		<div class="payment-form-bottom">
-			<div >
-				<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>
-				</c:if>
-			</div>
-			<c:if test="${cmPayShop.wipePayment > 0}">
-				<div>
-					<label>抹平备注:</label>
-					<span>${cmPayShop.wipeRemarks}</span>
-				</div>
-				<c:if test="${not empty cmPayShop.wipeImages}">
-                    <div class="wipeImgs">
-                        <label>图片:</label>
-                        <c:forEach items="${cmPayShop.wipeImages}" var="wi" varStatus="wIndex">
-                            <img src="${wi}">
-                        </c:forEach>
-                    </div>
-                </c:if>
-			</c:if>
-			<div>
-				<label>余额支付:</label>
-				总余额:<span id="rebateAmount">${cmPayShop.rebateAmount}</span>,
-				可用余额:<span id="ableRebateAmount">${cmPayShop.ableRebateAmount}</span>,
-				使用:${cmPayShop.balancePayFee},
-				剩余:<span id="remainingBalance">${cmPayShop.rebateAmount - cmPayShop.balancePayFee}</span>
-			</div>
-			<div>
-				<label style="font-weight: bold; font-size:18px">转账支付:</label>
-				<span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.transferPayFee}" pattern="#,##0.00"/> </span>
-				<label>付款银行:</label><span>
+                    <td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number"
+                                                          pattern="#,##0.00"/></td>
+                    <td colspan="3" class="product-fee"><fmt:formatNumber value="${s.shopProductAmount}" type="number"
+                                                                          pattern="#,##0.00"/></td>
+                    <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
+                            color="red">待付款</font></c:if>
+                        <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                        <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                    </td>
+                    <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>
+                            <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">应付:<fmt:formatNumber
+                                    value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+                            </c:if>
+                            <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
+                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
+                            </c:if>
+                            <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
+                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
+                            </c:if>
+                            , 已付:<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
+                        </div>
+                        <div>
+                            <c:if test="${s.refundAmount > 0}">
+                                <span style="color:red">退款:<fmt:formatNumber value="${s.refundAmount}" type="number"
+                                                                             pattern="#,##0.00"/></span>,
+                            </c:if>
+                            待付: <fmt:formatNumber value="${s.waitPayShop}" type="number" pattern="#,##0.00"/>
+                        </div>
+                        <c:if test="${s.wipePayment > 0}">
+                            <div>
+                                付款抹平:<fmt:formatNumber value="${s.wipePayment}" type="number" pattern="#,##0.00"/>
+                            </div>
+                        </c:if>
+                    </td>
+                </tr>
+                <tr>
+                    <th>商品名</th>
+                    <th>规格</th>
+                    <th>数量<%--(赠品)--%></th>
+                    <th>退货</th>
+                    <th colspan="2">单价</th>
+                    <th colspan="3">机构税率 / 单税费 / 总税费</th>
+                    <th colspan="2">总价</th>
+                    <th>佣金(单)</th>
+                    <th>佣金(总)</th>
+                    <th colspan="3">供应商税率 / 单税费 / 总税费</th>
+                    <th>成本(单)</th>
+                    <th>成本(总)</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">
+                            <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}">
+                                <font color="red">
+                                    (${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'})
+                                </font>
+                            </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 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>
+                        <c:if test="${empty p.touchPrice}">
+                            <td><fmt:formatNumber
+                                    value="${p.discountPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}"
+                                    pattern="#,##0.00"/></td>
+                            <td class="payCm"><fmt:formatNumber
+                                    value="${(p.discountPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}"
+                                    pattern="#,##0.00"/></td>
+                        </c:if>
+                        <c:if test="${!empty p.touchPrice}">
+                            <td><fmt:formatNumber
+                                    value="${p.touchPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax}"
+                                    pattern="#,##0.00"/></td>
+                            <td class="payCm"><fmt:formatNumber
+                                    value="${(p.touchPrice + p.addedValueTax - p.costPrice - p.singleShouldPayTotalTax) * (p.num + p.presentNum - p.returnedNum)}"
+                                    pattern="#,##0.00"/></td>
+                        </c:if>
+                        <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>
+                            <c:otherwise>
+                                <fmt:formatNumber
+                                        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 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)}"
+                                              type="number" pattern="#,##0.00"/></td>
+                    </tr>
+                </c:forEach>
+            </table>
+        </c:forEach>
+    </div>
+    <div class="payment-form-bottom">
+        <div>
+            <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>
+            </c:if>
+        </div>
+        <c:if test="${cmPayShop.wipePayment > 0}">
+            <div>
+                <label>抹平备注:</label>
+                <span>${cmPayShop.wipeRemarks}</span>
+            </div>
+            <c:if test="${not empty cmPayShop.wipeImages}">
+                <div class="wipeImgs">
+                    <label>图片:</label>
+                    <c:forEach items="${cmPayShop.wipeImages}" var="wi" varStatus="wIndex">
+                        <img src="${wi}">
+                    </c:forEach>
+                </div>
+            </c:if>
+        </c:if>
+        <div>
+            <label>余额支付:</label>
+            总余额:<span id="rebateAmount">${cmPayShop.rebateAmount}</span>,
+            可用余额:<span id="ableRebateAmount">${cmPayShop.ableRebateAmount}</span>,
+            使用:${cmPayShop.balancePayFee},
+            剩余:<span id="remainingBalance">${cmPayShop.rebateAmount - cmPayShop.balancePayFee}</span>
+        </div>
+        <div>
+            <label style="font-weight: bold; font-size:18px">转账支付:</label>
+            <span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber
+                    value="${cmPayShop.transferPayFee}" pattern="#,##0.00"/> </span>
+            <label>付款银行:</label><span>
 					<select name="payType">
 						<option value="1">建设银行7297</option>
 						<option value="2">中信银行0897</option>
@@ -306,135 +563,139 @@
 						<option value="5">广发银行5461</option>
 					</select>
 				</span>
-				<label>付款时间:</label>
-				<span>${cmPayShop.payTime}</span>
-				<input name="id" value="${cmPayShop.id}" id="id" type="hidden">
-			</div>
-			<div class="process-details">
-				<label>申请人:</label><div class="process-for-label">${cmPayShop.applicantName}</div>
-				<span>申请时间:</span><div>${cmPayShop.applyTime}</div>
-				<span>审核人:</span><div>
-										<c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
-											${cmPayShop.reviewerName}
-										</c:if>
-									</div>
-				<span>审核时间:</span><div>
-										<c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
-											${cmPayShop.reviewTime}
-										</c:if>
-										</div>
-			</div>
-		</div>
-		<div class="check-btn">
-			<button class="check-cfm-btn" type="button">审核通过</button>
-			<button class="refuse-btn" type="button">审核不通过</button>
-			<button class="return-btn" type="button" onclick="history.go(-1)">返回</button>
-		</div>
-	</div>
-	<%--</form>--%>
-	<div class="mask tips-popup-reason">
-		<div class="tips-popup-content">
-			<h4>确认提示</h4>
-			<h5><span class="required">* </span>审核不通过原因:</h5>
-			<textarea id="refuse-reason" cols="30" rows="10" maxlength="200"></textarea>
-			<div>
-				<button class="check-cfm-btn check-blue-btn" type="button">确定</button>
-				<button class="check-grey-btn" type="button">取消</button>
-			</div>
-			<img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
-		</div>
-	</div>
-	<div class="mask tips-popup">
-		<div class="tips-popup-content">
-			<h4>信息提示</h4>
-			<p></p>
-			<div>
-				<button class="tips-cfm-btn tips-cfm-directly" type="button">确定</button>
-				<button class="tips-cancel-btn" type="button">取消</button>
-			</div>
-			<img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
-		</div>
-	</div>
-	<script>
-		(function(){
-            var payTableEle = $('.pay-table'),
-				accessFlag = true,
-				unaccessFlag = true,
-                payProductEle = $('.pay-product-item');
-            payTableEle.each(function (i,l) {
-                var productLength = $(this).find('.pay-product-item').length;
-                // 商品列表合并单元格
-                // $(this).find('.mergeRows').attr('rowspan',productLength);
-            });
-
-            $('.pay-table').each(function(){
-                var thisEle = $(this),
-                    totalComissionVal = 0,
-                    resVal = '';
-                totalComissionEle = thisEle.find('.payCm'),
-                    comissionEle = thisEle.find('.payCm-t'),
-                    thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',',''),
-                    freightVal = thisEle.find('.freight').text().replace(',','');
-                totalComissionEle.each(function(){
-                    totalComissionVal += Number($(this).text().replace(',',''));
-                })
-                resVal = (totalComissionVal - thirdPartyVal - freightVal).toFixed(2);
-                comissionEle.text(resVal);
-            })
+            <label>付款时间:</label>
+            <span>${cmPayShop.payTime}</span>
+            <input name="id" value="${cmPayShop.id}" id="id" type="hidden">
+        </div>
+        <div class="process-details">
+            <label>申请人:</label>
+            <div class="process-for-label">${cmPayShop.applicantName}</div>
+            <span>申请时间:</span>
+            <div>${cmPayShop.applyTime}</div>
+            <span>审核人:</span>
+            <div>
+                <c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
+                    ${cmPayShop.reviewerName}
+                </c:if>
+            </div>
+            <span>审核时间:</span>
+            <div>
+                <c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
+                    ${cmPayShop.reviewTime}
+                </c:if>
+            </div>
+        </div>
+    </div>
+    <div class="check-btn">
+        <button class="check-cfm-btn" type="button">审核通过</button>
+        <button class="refuse-btn" type="button">审核不通过</button>
+        <button class="return-btn" type="button" onclick="history.go(-1)">返回</button>
+    </div>
+</div>
+<%--</form>--%>
+<div class="mask tips-popup-reason">
+    <div class="tips-popup-content">
+        <h4>确认提示</h4>
+        <h5><span class="required">* </span>审核不通过原因:</h5>
+        <textarea id="refuse-reason" cols="30" rows="10" maxlength="200"></textarea>
+        <div>
+            <button class="check-cfm-btn check-blue-btn" type="button">确定</button>
+            <button class="check-grey-btn" type="button">取消</button>
+        </div>
+        <img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
+    </div>
+</div>
+<div class="mask tips-popup">
+    <div class="tips-popup-content">
+        <h4>信息提示</h4>
+        <p></p>
+        <div>
+            <button class="tips-cfm-btn tips-cfm-directly" type="button">确定</button>
+            <button class="tips-cancel-btn" type="button">取消</button>
+        </div>
+        <img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
+    </div>
+</div>
+<script>
+    (function () {
+        var payTableEle = $('.pay-table'),
+            accessFlag = true,
+            unaccessFlag = true,
+            payProductEle = $('.pay-product-item');
+        payTableEle.each(function (i, l) {
+            var productLength = $(this).find('.pay-product-item').length;
+            // 商品列表合并单元格
+            // $(this).find('.mergeRows').attr('rowspan',productLength);
+        });
 
-            $('.tips-cancel-btn, #close-btn1').on('click',function() {
-                $('.mask').hide();
-            })
-            $('.tips-cfm-directly').on('click',function() {
-                if($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
-                    $('.tips-popup').hide();
-                } else {
-                    $('#form').submit();
-                }
-            })
-			$('.refuse-btn').on('click',function() {
-			    $('.tips-popup-reason').show();
-			})
-            $('.check-grey-btn').on('click',function() {
-                $('.tips-popup-reason').hide();
+        $('.pay-table').each(function () {
+            var thisEle = $(this),
+                totalComissionVal = 0,
+                resVal = '';
+            totalComissionEle = thisEle.find('.payCm'),
+                comissionEle = thisEle.find('.payCm-t'),
+                thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),
+                freightVal = thisEle.find('.freight').text().replace(',', '');
+            totalComissionEle.each(function () {
+                totalComissionVal += Number($(this).text().replace(',', ''));
             })
+            resVal = (totalComissionVal - thirdPartyVal - freightVal).toFixed(2);
+            comissionEle.text(resVal);
+        })
 
-            function showTips(title,text) {
-                $('.tips-popup h4').text(title);
-                $('.tips-popup p').text(text);
-                $('.tips-popup').show();
+        $('.tips-cancel-btn, #close-btn1').on('click', function () {
+            $('.mask').hide();
+        })
+        $('.tips-cfm-directly').on('click', function () {
+            if ($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
+                $('.tips-popup').hide();
+            } else {
+                $('#form').submit();
             }
+        })
+        $('.refuse-btn').on('click', function () {
+            $('.tips-popup-reason').show();
+        })
+        $('.check-grey-btn').on('click', function () {
+            $('.tips-popup-reason').hide();
+        })
+
+        function showTips(title, text) {
+            $('.tips-popup h4').text(title);
+            $('.tips-popup p').text(text);
+            $('.tips-popup').show();
+        }
+
 
+        function submitForm() {
+            $('.tips-cfm-btn').removeClass('tips-cfm-directly').addClass('submit-now');
+            $('.tips-cancel-btn').hide();
+            showTips('信息提示', '审核通过');
+        }
 
-            function submitForm() {
-                $('.tips-cfm-btn').removeClass('tips-cfm-directly').addClass('submit-now');
-                $('.tips-cancel-btn').hide();
-                showTips('信息提示','审核通过');
-			}
-
-			$('.check-cfm-btn').on('click',function(e) {
-				var payType = $('select[name="payType"]').val(),
-						id = $('#id').val();
-			    if($(this).hasClass('check-blue-btn')) {
-                    var textareaVal = $('#refuse-reason').val();
-                    if(!textareaVal.trim()) {
-                        showTips('信息提示','审核原因不能为空');
-                        return false;
-                    }
-                    if(unaccessFlag) {
-						window.location.href = '${ctx}/order/cmPayShop/checkNotPass?id=' + id + '&reason=' + textareaVal;
-						unaccessFlag = false;
-					}
-				} else {
-			    	if(accessFlag) {
-						window.location.href = '${ctx}/order/cmPayShop/checkPass?payType=' + payType + '&id=' + id;
-						accessFlag = false;
-					}
+        $('.check-cfm-btn').on('click', function (e) {
+            var payType = $('select[name="payType"]').val(),
+                id = $('#id').val();
+            if ($(this).hasClass('check-blue-btn')) {
+                var textareaVal = $('#refuse-reason').val();
+                if (!textareaVal.trim()) {
+                    showTips('信息提示', '审核原因不能为空');
+                    return false;
                 }
-            })
+                if (unaccessFlag) {
+                    window.location.href = '${ctx}/order/cmPayShop/checkNotPass?id=' + id + '&reason=' + textareaVal;
+                    unaccessFlag = false;
+                }
+            } else {
+                if (accessFlag) {
+                    window.location.href = '${ctx}/order/cmPayShop/checkPass?payType=' + payType + '&id=' + id;
+                    accessFlag = false;
+                }
+            }
+        })
 
-		})()
+    })()
 
-	</script>
+</script>
 </body>
 </html>

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

@@ -180,15 +180,17 @@
 					<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"/>
+						<div>
+							<c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
+								应付:<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+							</c:if>
 							<c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
+								<font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
 							</c:if>
-
 							<c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
-							</c:if>
-							 已付:<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
+								<font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
+							</c:if>
+							 已付:<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
 						</div>
 						<div>
 							<c:if test="${s.refundAmount > 0}">

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

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

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

@@ -1,657 +1,1025 @@
 <%@ page contentType="text/html;charset=UTF-8" %>
-<%@ include file="/WEB-INF/views/include/taglib.jsp"%>
+<%@ include file="/WEB-INF/views/include/taglib.jsp" %>
 <html>
 <head>
-	<title>付款单表管理</title>
-	<meta name="decorator" content="default"/>
-<style>
-	.red{color:red;font-style:normal;}
-	.nowrap{white-space:nowrap;}
-	.table th{text-align:center}
-	.table td{text-align:center}
-	.payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px solid #eee}
-	.required{color:red}
-	.payment-form label{width:100px;text-align:right;vertical-align:middle;font-weight:600}
-	.payment-form-top{padding:10px 0}
-	.payment-form-top>div,.payment-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px solid #eee;white-space:nowrap}
-	.payment-form-top input{vertical-align:baseline}
-	.payment-form-top>div:last-child span{margin-left:15px}
-	.payment-form-top>div:last-child span:nth-of-type(1){margin-left:0}
-	.pay-list-item{margin-bottom:30px}
-	.pay-table{width:96%;margin-left:2%;margin-bottom:10px}
-	.pay-table th{background:#f9f9f9}
-	.pay-table tr:first-child th{background:#eee !important}
-	.pay-table td{background:#fff !important}
-	.need-to-pay{width:90px}
-	.payment-form-bottom label{width:140px}
-	.used-amount{width:80px;margin-top:6px}
-	.process-details span{width:140px;margin-left:50px;font-weight:600}
-	.process-for-label{margin-left:0 !important}
-	.process-details div{display:inline-block}
-	.payment-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
-	.payment-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
-	.apply-btn{background:#3daae9;color:#fff}
-	.cfm-btn:active,.return-btn:active{background:#ddd;color:#fff}
-	.mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}
-	.tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}
-	.tips-popup-content div{width:100%;text-align:center}
-	.tips-popup-content{width:30%}
-	.tips-popup-content p{text-align:center;padding:80px;font-size:20px}
-	.tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}
-	.tips-cfm-btn,.tips-cancel-btn{width:100px;height:40px;margin:auto;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#3daae9;color:#fff;border:none}
-	.return-btn,.tips-cancel-btn{background:#fff;color:#555;margin-left:50px}
-	.tips-cancel-btn{border:1px solid #ddd;margin-left:20px;display:none}
-	#close-btn1{top:8px;right:10px;width:18px;position:absolute;cursor:pointer}
-	td.supplier-fee {text-align:left;}
-	td.supplier-fee .wipeBtn{width:auto;white-space:nowrap;height:30px;line-height:30px;display:none;}
-	.inputForm{/*max-width:1200px;*/width:100%;}
-	.inputForm table{width:100%;line-height:18px;margin-bottom:50px;}
-	.inputForm th,.inputForm td{ font-weight: normal; text-align: left; padding: 8px 5px; border-bottom: 1px solid rgb(238, 238, 238); }
-	.inputForm th{width:15%;text-align:right;white-space:nowrap;font-weight:bold;}
-	.inputForm td input[type="text"]{width:320px;height:16px; line-height:16px; }
-	.inputForm td input.short{width:110px;}
-	.inputForm td b.line{margin:0 15px 0 20px;font-weight:normal}
-	.wipeVisible{display:none;}
-	.wipeRemarks{margin:0;}
-	.controls{font-size:0}
-	.select2-choice{width:100px}
-	.upload-content{position:relative;}
-	.upload-content *{margin:0;padding:0;}
-	.upload-content .conList{display:inline-block;margin-right:5px;width:90px;height:90px;background:#e6e6e6;border-radius:5px;position:relative;overflow:hidden}
-	.upload-content .conList li{position:relative;padding:18px 0}
-	.upload-content .conList li img{width:100%;margin:0 !important;padding:0 !important}
-	.upload-content img.cancel-upload{position:absolute;top:0;right:0;cursor:pointer;z-index:100}
-	.upload-content .conList .btn{position:absolute;width:100%;height:100%;top:0;left:0;background:#e6e6e6}
-	.upload-content .conList .btn div{padding-top:20px}
-	.upload-content .conList .btn div span{font-size:35px}
-	.hide-pic{display:none !important}
-	.upload-tips{margin:10px 0}
-	.mask {z-index: 9999;}
-	.weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
-</style>
+    <title>付款单表管理</title>
+    <meta name="decorator" content="default"/>
+    <style>
+        .red {
+            color: red;
+            font-style: normal;
+        }
+
+        .nowrap {
+            white-space: nowrap;
+        }
+
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .payment-form h4 {
+            width: 96%;
+            margin-left: 2%;
+            padding-bottom: 20px;
+            text-align: center;
+            border-bottom: 1px solid #eee
+        }
+
+        .required {
+            color: red
+        }
+
+        .payment-form label {
+            width: 100px;
+            text-align: right;
+            vertical-align: middle;
+            font-weight: 600
+        }
+
+        .payment-form-top {
+            padding: 10px 0
+        }
+
+        .payment-form-top > div, .payment-form-bottom > div {
+            width: 94%;
+            margin-left: 3%;
+            height: 50px;
+            line-height: 50px;
+            border-bottom: 1px solid #eee;
+            white-space: nowrap
+        }
+
+        .payment-form-top input {
+            vertical-align: baseline
+        }
+
+        .payment-form-top > div:last-child span {
+            margin-left: 15px
+        }
+
+        .payment-form-top > div:last-child span:nth-of-type(1) {
+            margin-left: 0
+        }
+
+        .pay-list-item {
+            margin-bottom: 30px
+        }
+
+        .pay-table {
+            width: 96%;
+            margin-left: 2%;
+            margin-bottom: 10px
+        }
+
+        .pay-table th {
+            background: #f9f9f9
+        }
+
+        .pay-table tr:first-child th {
+            background: #eee !important
+        }
+
+        .pay-table td {
+            background: #fff !important
+        }
+
+        .need-to-pay {
+            width: 90px
+        }
+
+        .payment-form-bottom label {
+            width: 140px
+        }
+
+        .used-amount {
+            width: 80px;
+            margin-top: 6px
+        }
+
+        .process-details span {
+            width: 140px;
+            margin-left: 50px;
+            font-weight: 600
+        }
+
+        .process-for-label {
+            margin-left: 0 !important
+        }
+
+        .process-details div {
+            display: inline-block
+        }
+
+        .payment-btn {
+            width: 96%;
+            margin-left: 2%;
+            text-align: center;
+            height: 60px;
+            line-height: 60px;
+            margin-top: 30px
+        }
+
+        .payment-btn button {
+            width: 100px;
+            height: 35px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            border: none;
+            border: 1px solid #ddd
+        }
+
+        .apply-btn {
+            background: #3daae9;
+            color: #fff
+        }
+
+        .cfm-btn:active, .return-btn:active {
+            background: #ddd;
+            color: #fff
+        }
+
+        .mask {
+            width: 100%;
+            height: 100%;
+            position: fixed;
+            top: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none
+        }
+
+        .tips-popup-content {
+            width: 40%;
+            height: auto;
+            padding-bottom: 30px;
+            background: #fff;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%)
+        }
+
+        .tips-popup-content div {
+            width: 100%;
+            text-align: center
+        }
+
+        .tips-popup-content {
+            width: 30%
+        }
+
+        .tips-popup-content p {
+            text-align: center;
+            padding: 80px;
+            font-size: 20px
+        }
+
+        .tips-popup-content h4 {
+            padding-left: 10px;
+            height: 40px;
+            line-height: 40px;
+            border-bottom: 1px solid #eee;
+            margin-bottom: 20px
+        }
+
+        .tips-cfm-btn, .tips-cancel-btn {
+            width: 100px;
+            height: 40px;
+            margin: auto;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            background: #3daae9;
+            color: #fff;
+            border: none
+        }
+
+        .return-btn, .tips-cancel-btn {
+            background: #fff;
+            color: #555;
+            margin-left: 50px
+        }
+
+        .tips-cancel-btn {
+            border: 1px solid #ddd;
+            margin-left: 20px;
+            display: none
+        }
+
+        #close-btn1 {
+            top: 8px;
+            right: 10px;
+            width: 18px;
+            position: absolute;
+            cursor: pointer
+        }
+
+        td.supplier-fee {
+            text-align: left;
+        }
+
+        td.supplier-fee .wipeBtn {
+            width: auto;
+            white-space: nowrap;
+            height: 30px;
+            line-height: 30px;
+            display: none;
+        }
+
+        .inputForm { /*max-width:1200px;*/
+            width: 100%;
+        }
+
+        .inputForm table {
+            width: 100%;
+            line-height: 18px;
+            margin-bottom: 50px;
+        }
+
+        .inputForm th, .inputForm td {
+            font-weight: normal;
+            text-align: left;
+            padding: 8px 5px;
+            border-bottom: 1px solid rgb(238, 238, 238);
+        }
+
+        .inputForm th {
+            width: 15%;
+            text-align: right;
+            white-space: nowrap;
+            font-weight: bold;
+        }
+
+        .inputForm td input[type="text"] {
+            width: 320px;
+            height: 16px;
+            line-height: 16px;
+        }
+
+        .inputForm td input.short {
+            width: 110px;
+        }
+
+        .inputForm td b.line {
+            margin: 0 15px 0 20px;
+            font-weight: normal
+        }
+
+        .wipeVisible {
+            display: none;
+        }
+
+        .wipeRemarks {
+            margin: 0;
+        }
+
+        .controls {
+            font-size: 0
+        }
+
+        .select2-choice {
+            width: 100px
+        }
+
+        .upload-content {
+            position: relative;
+        }
+
+        .upload-content * {
+            margin: 0;
+            padding: 0;
+        }
+
+        .upload-content .conList {
+            display: inline-block;
+            margin-right: 5px;
+            width: 90px;
+            height: 90px;
+            background: #e6e6e6;
+            border-radius: 5px;
+            position: relative;
+            overflow: hidden
+        }
+
+        .upload-content .conList li {
+            position: relative;
+            padding: 18px 0
+        }
+
+        .upload-content .conList li img {
+            width: 100%;
+            margin: 0 !important;
+            padding: 0 !important
+        }
+
+        .upload-content img.cancel-upload {
+            position: absolute;
+            top: 0;
+            right: 0;
+            cursor: pointer;
+            z-index: 100
+        }
+
+        .upload-content .conList .btn {
+            position: absolute;
+            width: 100%;
+            height: 100%;
+            top: 0;
+            left: 0;
+            background: #e6e6e6
+        }
+
+        .upload-content .conList .btn div {
+            padding-top: 20px
+        }
+
+        .upload-content .conList .btn div span {
+            font-size: 35px
+        }
+
+        .hide-pic {
+            display: none !important
+        }
+
+        .upload-tips {
+            margin: 10px 0
+        }
+
+        .mask {
+            z-index: 9999;
+        }
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
+    </style>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-		<li><a href="${ctx}/order/cmPayShop/">付款列表</a></li>
-		<li class="active"><a>提交付款单</a></li>
-	</ul><br/>
-	<form action="${ctx}/order/cmPayShop/apply" id="form" method="post">
-		<div class="payment-form">
-		<h4>付款单</h4>
-		<div class="payment-form-top">
-			<div>
-				<label><span class="required">* </span>付款单名称:</label>
-				<input type="text" id="payment-form-name" name="name" value="${cmPayShop.name}" maxlength="200" >
-				<input type="hidden" name="shopID" value="${cmPayShop.shopID}">
-				<input type="hidden" name="id" value="${cmPayShop.id}">
-			</div>
-			<div>
-				<label>供应商名称:</label>
-				<span>${cmPayShop.shopName}</span>
-			</div>
-			<div>
-				<label><em class="required">* </em>付款账号:</label>
-				<span>户名:<input type="text" id="account-name" name="bankAccountName" value="${cmPayShop.bankAccountName}"></span>
-				<span>账号:<input type="text" id="account-no" name="bankAccount" value="${cmPayShop.bankAccount}" ></span>
-				<span>开户行:<input type="text" id="account-bank" name="bankName" value="${cmPayShop.bankName}"></span>
-				<span>账户类型:
+<ul class="nav nav-tabs">
+    <li><a href="${ctx}/order/cmPayShop/">付款列表</a></li>
+    <li class="active"><a>提交付款单</a></li>
+</ul>
+<br/>
+<form action="${ctx}/order/cmPayShop/apply" id="form" method="post">
+    <div class="payment-form">
+        <h4>付款单</h4>
+        <div class="payment-form-top">
+            <div>
+                <label><span class="required">* </span>付款单名称:</label>
+                <input type="text" id="payment-form-name" name="name" value="${cmPayShop.name}" maxlength="200">
+                <input type="hidden" name="shopID" value="${cmPayShop.shopID}">
+                <input type="hidden" name="id" value="${cmPayShop.id}">
+            </div>
+            <div>
+                <label>供应商名称:</label>
+                <span>${cmPayShop.shopName}</span>
+            </div>
+            <div>
+                <label><em class="required">* </em>付款账号:</label>
+                <span>户名:<input type="text" id="account-name" name="bankAccountName"
+                                value="${cmPayShop.bankAccountName}"></span>
+                <span>账号:<input type="text" id="account-no" name="bankAccount" value="${cmPayShop.bankAccount}"></span>
+                <span>开户行:<input type="text" id="account-bank" name="bankName" value="${cmPayShop.bankName}"></span>
+                <span>账户类型:
 					<select name="type">
-						<option value ="0" ${cmPayShop.type == '0' ? 'selected' : ''}>公帐</option>
-						<option value ="1" ${cmPayShop.type == '1' ? 'selected' : ''}>私帐</option>
+						<option value="0" ${cmPayShop.type == '0' ? 'selected' : ''}>公帐</option>
+						<option value="1" ${cmPayShop.type == '1' ? 'selected' : ''}>私帐</option>
 					</select>
 				</span>
-			</div>
-		</div>
-		<div class="payment-form-content">
-			<c:forEach items="${cmPayShop.shopOrders}" var="s">
-				<table class="table table-striped table-bordered table-condensed pay-table">
-				<tr>
-					<th>子订单编号(ID)</th>
-					<th colspan="3">订单编号(ID)</th>
-					<th colspan="2">订单金额</th>
-					<th colspan="3">下单时间</th>
-					<th>收款状态</th>
-					<th>收款金额</th>
-					<th colspan="2">经理折扣</th>
-					<th colspan="3">成本类型</th>
-					<th colspan="2">付第三方</th>
-				</tr>
-				<tr>
-					<td>${s.shopOrderNo}(${s.shopOrderID})</td>
-					<td colspan="3">${s.orderNo}(${s.orderID})</td>
-					<td colspan="2">${s.payTotalFee}</td>
-					<td colspan="3">${s.orderTime}</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></a></td>
-					<td><a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1" style="text-decoration: underline">${s.receiptTotalFee}</a></td>
-					<td colspan="2">
-						<c:if test="${s.discountTotalFee gt 0}">
-							<c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-								<fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}" type="currency"/>
-							</c:if>
-							<c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-								¥0.00
-							</c:if>
-							<c:if test="${s.returnedPurchaseTotalFee gt 0}">
+            </div>
+        </div>
+        <div class="payment-form-content">
+            <c:forEach items="${cmPayShop.shopOrders}" var="s">
+                <table class="table table-striped table-bordered table-condensed pay-table">
+                    <tr>
+                        <th>子订单编号(ID)</th>
+                        <th colspan="3">订单编号(ID)</th>
+                        <th colspan="2">订单金额</th>
+                        <th colspan="3">下单时间</th>
+                        <th>收款状态</th>
+                        <th>收款金额</th>
+                        <th colspan="2">经理折扣</th>
+                        <th colspan="3">成本类型</th>
+                        <th colspan="2">付第三方</th>
+                    </tr>
+                    <tr>
+                        <td>${s.shopOrderNo}(${s.shopOrderID})</td>
+                        <td colspan="3">${s.orderNo}(${s.orderID})</td>
+                        <td colspan="2">${s.payTotalFee}</td>
+                        <td colspan="3">${s.orderTime}</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></a></td>
+                        <td>
+                            <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                               style="text-decoration: underline">${s.receiptTotalFee}</a></td>
+                        <td colspan="2">
+                            <c:if test="${s.discountTotalFee gt 0}">
+                                <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
+                                    <fmt:formatNumber value="${s.discountTotalFee - s.returnedPurchaseTotalFee}"
+                                                      type="currency"/>
+                                </c:if>
+                                <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
+                                    ¥0.00
+                                </c:if>
+                                <c:if test="${s.returnedPurchaseTotalFee gt 0}">
                                 <span style="color: red">
                                     (原<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>,因退货折扣取消
                                     <c:if test="${s.discountTotalFee gt s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
-									</c:if>
+                                        <fmt:formatNumber value="${s.returnedPurchaseTotalFee}" type="currency"/>
+                                    </c:if>
                                     <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
-										<fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
-									</c:if>)
+                                        <fmt:formatNumber value="${s.discountTotalFee}" type="currency"/>
+                                    </c:if>)
                                 </span>
-							</c:if>
-						</c:if>
-						<c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
-					</td>
-					<td colspan="3"><c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if><c:if test="${s.costType == '2'}">比例成本</c:if></td>
-					<td colspan="2" class="third-party-fee">${s.shopOtherFee}</td>
-				</tr>
-				<tr>
-					<th>供应商</th>
-					<th colspan="3">客户</th>
-					<th>机构运费</th>
-					<th>供应商运费</th>
-					<th colspan="3">商品费</th>
-					<th colspan="2">付款状态</th>
-					<th colspan="2">采美佣金</th>
-					<th colspan="3">应付税费</th>
-					<th colspan="2">付供应商</th>
-				</tr>
-				<tr>
-					<td>${s.shopName}</td>
-					<td colspan="3">
-							${s.buyer}
-						<c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
-						<c:if test="${s.organizeID == 3}"></c:if></td>
-					<td>
-                        <c:if test="${s.freight == 0}">
-                            包邮
-                        </c:if>
-                        <c:if test="${s.freight == -1}">
-                            到付
-                        </c:if>
-                        <c:if test="${s.freight == -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.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
-                        </c:if>
-                    </td>
-					<td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number" pattern="#,##0.00"/></td>
-					<td colspan="3" class="product-fee">${s.shopProductAmount}</td>
-					<td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font color="red">待付款</font></c:if>
-						<c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
-						<c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
-					</td>
-					<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><span class="nowrap">应付:<fmt:formatNumber value="${s.shouldPayShopAmount}" pattern="#,##0.00"/>
+                                </c:if>
+                            </c:if>
+                            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+                        </td>
+                        <td colspan="3"><c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if><c:if
+                                test="${s.costType == '2'}">比例成本</c:if></td>
+                        <td colspan="2" class="third-party-fee">${s.shopOtherFee}</td>
+                    </tr>
+                    <tr>
+                        <th>供应商</th>
+                        <th colspan="3">客户</th>
+                        <th>机构运费</th>
+                        <th>供应商运费</th>
+                        <th colspan="3">商品费</th>
+                        <th colspan="2">付款状态</th>
+                        <th colspan="2">采美佣金</th>
+                        <th colspan="3">应付税费</th>
+                        <th colspan="2">付供应商</th>
+                    </tr>
+                    <tr>
+                        <td>${s.shopName}</td>
+                        <td colspan="3">
+                                ${s.buyer}
+                            <c:if test="${s.orderType eq 2}"><font color="red">(呵呵商城)</font></c:if>
+                            <c:if test="${s.organizeID == 3}"></c:if></td>
+                        <td>
+                            <c:if test="${s.freight == 0}">
+                                包邮
+                            </c:if>
+                            <c:if test="${s.freight == -1}">
+                                到付
+                            </c:if>
+                            <c:if test="${s.freight == -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.returnedFreightFlag eq true}"><font color="red">(已退)</font></c:if>
+                            </c:if>
+                        </td>
+                        <td class="freight"><fmt:formatNumber value="${s.shopPostFee}" type="number"
+                                                              pattern="#,##0.00"/></td>
+                        <td colspan="3" class="product-fee">${s.shopProductAmount}</td>
+                        <td colspan="2"><c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font
+                                color="red">待付款</font></c:if>
+                            <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
+                            <c:if test="${s.payStatus == 3}"><font color="green">已付款</font></c:if>
+                        </td>
+                        <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><span class="nowrap">
+                            <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">
+                                应付:<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
+                            </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
-							</c:if>
-
+                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
+                            </c:if>
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-								<font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
-							</c:if>
-							,</span>
-							 <span class="nowrap">已付:${s.payedShopAmount},</span></div>
-						<div><span class="nowrap">待付:<input type="number" value="<fmt:formatNumber value="${s.waitPayShop}" pattern="0.00"/>" class="need-to-pay" data-type="${s.differenceType}" data-difference="${s.differencePrice}" data-pay="${s.shouldPayShopAmount}" data-payed="${s.payedShopAmount}"></span></div>
-						<input type="hidden" name="payInfo" class="payInfo" data-shoporderid="${s.shopOrderID}" value="${s.shopOrderID}_${s.waitPayShop}_0">
-						<label class="wipeBtn"><input class="wipeFee" type="checkbox" value="0"><span>付款抹平:<em class="red wipeText">¥0.00</em></span></label>
-					</td>
-					<input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">
-				</tr>
-				<tr>
-					<th>商品名</th>
-					<th>规格</th>
-					<th>数量<%--(赠品)--%></th>
-					<th>退货</th>
-					<th colspan="2">单价</th>
-                    <th colspan="3">机构税率 / 单税费 / 总税费</th>
-					<th colspan="2">总价</th>
-					<th>佣金(单)</th>
-					<th>佣金(总)</th>
-                    <th colspan="3">供应商税率 / 单税费 / 总税费</th>
-					<th>成本(单)</th>
-					<th>成本(总)</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">
-							<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>
+                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
                             </c:if>
+							,</span>
+                                <span class="nowrap">已付:${s.payedShopAmount},</span></div>
+                            <div><span class="nowrap">待付:<input type="number"
+                                                                value="<fmt:formatNumber value="${s.waitPayShop}" pattern="0.00"/>"
+                                                                class="need-to-pay" data-type="${s.differenceType}"
+                                                                data-difference="${s.differencePrice}"
+                                                                data-pay="${s.shouldPayShopAmount}"
+                                                                data-payed="${s.payedShopAmount}"></span></div>
+                            <input type="hidden" name="payInfo" class="payInfo" data-shoporderid="${s.shopOrderID}"
+                                   value="${s.shopOrderID}_${s.waitPayShop}_0">
+                            <label class="wipeBtn"><input class="wipeFee" type="checkbox" value="0"><span>付款抹平:<em
+                                    class="red wipeText">¥0.00</em></span></label>
                         </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 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><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="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>
-								<c:otherwise>
-									<fmt:formatNumber 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 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)}" type="number" pattern="#,##0.00"/></td>
-					</tr>
-				</c:forEach>
-			</table>
-			</c:forEach>
-		</div>
-		<div class="inputForm">
-			<table border="0" cellspacing="0" cellpadding="0" width="100%">
-				<tr>
-					<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>
-						<input type="hidden" id="totalAmount-hidden" name="totalAmount" value="${cmPayShop.totalAmount}">
-					</td>
-				</tr>
-				<tr class="wipeVisible">
-					<th><span class="red">*</span>抹平备注:</th>
-					<td colspan="3">
-						<textarea name="wipeRemarks" id="wipeRemarks" placeholder="请输入备注文字,200字以内..." maxlength="200" style="width:500px;"></textarea>
-						<p style="width:500px;text-align:right;"><span id="remarkLen" style="color:red;">0</span>/200</p>
-						<input type="hidden" id="wipePayment" name="wipePayment" value="0">
-					</td>
-				</tr>
-				<tr class="wipeVisible">
-					<th>图片:</th>
-					<td colspan="3">
-						<input type="hidden" id="wipeRemarkImages" name="wipeRemarkImages" value="">
-						<div class="imgbox">
-							<div class="controls upload-content" id="wipeImageBox">
-								<div class="conList">
-									<input type="hidden" id="image1" maxlength="255" class="imagesInput">
-									<sys:ckfinder input="image1" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-								</div>
-								<div class="conList hide-pic">
-									<input type="hidden" id="image2" maxlength="255" class="imagesInput">
-									<sys:ckfinder input="image2" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-								</div>
-								<div class="conList hide-pic">
-									<input type="hidden" id="image3" maxlength="255" class="imagesInput">
-									<sys:ckfinder input="image3" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-								</div>
-								<div class="conList hide-pic">
-									<input type="hidden" id="image4" maxlength="255" class="imagesInput">
-									<sys:ckfinder input="image4" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-								</div>
-								<div class="conList hide-pic">
-									<input type="hidden" id="image5" maxlength="255" class="imagesInput">
-									<sys:ckfinder input="image5" type="images" uploadPath="/photo" selectMultiple="false" maxWidth="100" maxHeight="100"/>
-								</div>
-							</div>
-							<div class="conList upload-tips"><span style="color:red;">注意:请上传jpg / png格式的图片,最大不超过5M,最多可上传5张</span></div>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<th>欠款抵扣:</th>
-					<td colspan="3">
-						总欠款:<span id="rebateAmount">${empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount}</span>,
-						可用抵扣欠款:<span id="ableRebateAmount">${empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount}</span>,
-						使用:<input type="number" value="${empty cmPayShop.balancePayFee ? 0 : cmPayShop.balancePayFee}" name="balancePayFee" class="used-amount">,
-						剩余:<span id="remainingBalance">${cmPayShop.rebateAmount}</span>
-						<input type="hidden" id="rebateAmount-hidden" value="${empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount}">
-						<input type="hidden" id="ableRebateAmount-hidden" value="${(empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount) + (empty cmPayShop.balancePayFee ? 0 : cmPayShop.balancePayFee)}">
-					</td>
-				</tr>
-				<tr>
-					<th><span style="font-weight:bold;font-size:18px">转账支付:</span></th>
-					<td colspan="3">
-						<span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber value="${cmPayShop.totalAmount}" pattern="#,##0.00" /></span>
-						<input type="hidden" name="transferPayFee" id="transferPayFee-hidden" value="${cmPayShop.totalAmount}">
-					</td>
-				</tr>
-				<tr class="process-details">
-					<th>申请人:</th>
-					<td colspan="3">
-						<div class="process-for-label">${cmPayShop.applicantName}</div>
-						<span>申请时间:</span><div>${cmPayShop.applyTime}</div>
-						<c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
-							<span>审核人:</span><div>${cmPayShop.reviewerName}</div>
-							<span>审核时间:</span><div>${cmPayShop.reviewTime}</div>
-						</c:if>
-					</td>
-				</tr>
-				<tr class="process-details process-details-last">
-					<th>审核状态:</th>
-					<td colspan="3">
-						<div class="process-for-label"><c:if test="${cmPayShop.status == 1}">待审核</c:if></div>
-						<span>原因:</span><div>${cmPayShop.reason}</div>
-					</td>
-				</tr>
-				<tr><td colspan="4" style="text-align:center;">
-					<button class="apply-btn btn btn-primary" type="button">申请</button>
-					<button class="return-btn btn" type="button" onclick="history.go(-1)">返回</button>
-				</td></tr>
-			</table>
-		</div>
-	</div>
-	</form>
-	<div class="mask tips-popup">
-		<div class="tips-popup-content">
-			<h4>信息提示</h4>
-			<p></p>
-			<div>
-				<button class="tips-cfm-btn tips-cfm-directly" type="button">确定</button>
-				<button class="tips-cancel-btn" type="button">取消</button>
-			</div>
-			<img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
-		</div>
-	</div>
+                        <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">
+                    </tr>
+                    <tr>
+                        <th>商品名</th>
+                        <th>规格</th>
+                        <th>数量<%--(赠品)--%></th>
+                        <th>退货</th>
+                        <th colspan="2">单价</th>
+                        <th colspan="3">机构税率 / 单税费 / 总税费</th>
+                        <th colspan="2">总价</th>
+                        <th>佣金(单)</th>
+                        <th>佣金(总)</th>
+                        <th colspan="3">供应商税率 / 单税费 / 总税费</th>
+                        <th>成本(单)</th>
+                        <th>成本(总)</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">
+                                <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>
+                                <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 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><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="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>
+                                <c:otherwise>
+                                    <fmt:formatNumber
+                                            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 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)}"
+                                                  type="number" pattern="#,##0.00"/></td>
+                        </tr>
+                    </c:forEach>
+                </table>
+            </c:forEach>
+        </div>
+        <div class="inputForm">
+            <table border="0" cellspacing="0" cellpadding="0" width="100%">
+                <tr>
+                    <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>
+                        <input type="hidden" id="totalAmount-hidden" name="totalAmount"
+                               value="${cmPayShop.totalAmount}">
+                    </td>
+                </tr>
+                <tr class="wipeVisible">
+                    <th><span class="red">*</span>抹平备注:</th>
+                    <td colspan="3">
+                        <textarea name="wipeRemarks" id="wipeRemarks" placeholder="请输入备注文字,200字以内..." maxlength="200"
+                                  style="width:500px;"></textarea>
+                        <p style="width:500px;text-align:right;"><span id="remarkLen" style="color:red;">0</span>/200
+                        </p>
+                        <input type="hidden" id="wipePayment" name="wipePayment" value="0">
+                    </td>
+                </tr>
+                <tr class="wipeVisible">
+                    <th>图片:</th>
+                    <td colspan="3">
+                        <input type="hidden" id="wipeRemarkImages" name="wipeRemarkImages" value="">
+                        <div class="imgbox">
+                            <div class="controls upload-content" id="wipeImageBox">
+                                <div class="conList">
+                                    <input type="hidden" id="image1" maxlength="255" class="imagesInput">
+                                    <sys:ckfinder input="image1" type="images" uploadPath="/photo"
+                                                  selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                                </div>
+                                <div class="conList hide-pic">
+                                    <input type="hidden" id="image2" maxlength="255" class="imagesInput">
+                                    <sys:ckfinder input="image2" type="images" uploadPath="/photo"
+                                                  selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                                </div>
+                                <div class="conList hide-pic">
+                                    <input type="hidden" id="image3" maxlength="255" class="imagesInput">
+                                    <sys:ckfinder input="image3" type="images" uploadPath="/photo"
+                                                  selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                                </div>
+                                <div class="conList hide-pic">
+                                    <input type="hidden" id="image4" maxlength="255" class="imagesInput">
+                                    <sys:ckfinder input="image4" type="images" uploadPath="/photo"
+                                                  selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                                </div>
+                                <div class="conList hide-pic">
+                                    <input type="hidden" id="image5" maxlength="255" class="imagesInput">
+                                    <sys:ckfinder input="image5" type="images" uploadPath="/photo"
+                                                  selectMultiple="false" maxWidth="100" maxHeight="100"/>
+                                </div>
+                            </div>
+                            <div class="conList upload-tips"><span style="color:red;">注意:请上传jpg / png格式的图片,最大不超过5M,最多可上传5张</span>
+                            </div>
+                        </div>
+                    </td>
+                </tr>
+                <tr>
+                    <th>欠款抵扣:</th>
+                    <td colspan="3">
+                        总欠款:<span id="rebateAmount">${empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount}</span>,
+                        可用抵扣欠款:<span
+                            id="ableRebateAmount">${empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount}</span>,
+                        使用:<input type="number" value="${empty cmPayShop.balancePayFee ? 0 : cmPayShop.balancePayFee}"
+                                  name="balancePayFee" class="used-amount">,
+                        剩余:<span id="remainingBalance">${cmPayShop.rebateAmount}</span>
+                        <input type="hidden" id="rebateAmount-hidden"
+                               value="${empty cmPayShop.rebateAmount ? 0 : cmPayShop.rebateAmount}">
+                        <input type="hidden" id="ableRebateAmount-hidden"
+                               value="${(empty cmPayShop.ableRebateAmount ? 0 : cmPayShop.ableRebateAmount) + (empty cmPayShop.balancePayFee ? 0 : cmPayShop.balancePayFee)}">
+                    </td>
+                </tr>
+                <tr>
+                    <th><span style="font-weight:bold;font-size:18px">转账支付:</span></th>
+                    <td colspan="3">
+                        <span id="transferPayFee" style="font-weight: bold; font-size:18px"><fmt:formatNumber
+                                value="${cmPayShop.totalAmount}" pattern="#,##0.00"/></span>
+                        <input type="hidden" name="transferPayFee" id="transferPayFee-hidden"
+                               value="${cmPayShop.totalAmount}">
+                    </td>
+                </tr>
+                <tr class="process-details">
+                    <th>申请人:</th>
+                    <td colspan="3">
+                        <div class="process-for-label">${cmPayShop.applicantName}</div>
+                        <span>申请时间:</span>
+                        <div>${cmPayShop.applyTime}</div>
+                        <c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
+                            <span>审核人:</span>
+                            <div>${cmPayShop.reviewerName}</div>
+                            <span>审核时间:</span>
+                            <div>${cmPayShop.reviewTime}</div>
+                        </c:if>
+                    </td>
+                </tr>
+                <tr class="process-details process-details-last">
+                    <th>审核状态:</th>
+                    <td colspan="3">
+                        <div class="process-for-label"><c:if test="${cmPayShop.status == 1}">待审核</c:if></div>
+                        <span>原因:</span>
+                        <div>${cmPayShop.reason}</div>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan="4" style="text-align:center;">
+                        <button class="apply-btn btn btn-primary" type="button">申请</button>
+                        <button class="return-btn btn" type="button" onclick="history.go(-1)">返回</button>
+                    </td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</form>
+<div class="mask tips-popup">
+    <div class="tips-popup-content">
+        <h4>信息提示</h4>
+        <p></p>
+        <div>
+            <button class="tips-cfm-btn tips-cfm-directly" type="button">确定</button>
+            <button class="tips-cancel-btn" type="button">取消</button>
+        </div>
+        <img id="close-btn1" src="/static/images/close-btn.png" alt="close-btn">
+    </div>
+</div>
 <script>
-(function(){
-	var payTableEle = $('.pay-table'),
-		listenClickNumStatus = true,
-		payProductEle = $('.pay-product-item');
-	payTableEle.each(function (i,l) {
-		var productLength = $(this).find('.pay-product-item').length;
-		// 商品列表合并单元格
-		/*$(this).find('.mergeRows').attr('rowspan',productLength);*/
-	});
-	$(window).on("load", function(){
-		$('.need-to-pay').each(function (index, ele) {
-			if($(this).val()<=0){
-				alertx("待付金额为负数,不能操作付款抹平。请先去操作供应商退款,使数据恢复正常",function(){
-					window.location.href = "${ctx}/shopOrder/refundRecordList?operatingMode=2"
-				});
-			}
-			var thisEle = $(this),
-				wrapper = thisEle.parents(".supplier-fee"),
-				shouldPay = thisEle.attr('data-pay')*1,
-				differencePrice = thisEle.attr('data-difference')*1,
-				differenceType = thisEle.attr('data-type'),
-				alreadyPaid = thisEle.attr('data-payed')*1;
-			if(thisEle.val().length>8){
-				thisEle.val(thisEle.val().slice(0,8));
-			}
-			if (differenceType == 2){
-				differencePrice = -differencePrice;
-			}
-			if((thisEle.val() > shouldPay - alreadyPaid + differencePrice) || thisEle.val() < 0) {
-				thisEle.val((shouldPay - alreadyPaid + differencePrice).toFixed(2));
-			}
-			var wipe = parseFloat((shouldPay - alreadyPaid - thisEle.val() + differencePrice).toFixed(12));
-			if (wipe>0) {
-				wrapper.find('.wipeBtn').show();
-			}else{
-				wrapper.find('.wipeBtn').hide();
-				wrapper.find('.wipeFee').prop("checked", false);
-			}
-			wrapper.find('.wipeFee').val(wipe);
-			wrapper.find('.wipeText').text('¥'+wipe.toFixed(2));
-		});
-	});
-	$('.tips-cancel-btn, #close-btn1').on('click',function() {
-		$('.tips-popup').hide();
-	});
-	$('.tips-cfm-directly').on('click',function() {
-		if($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
-			$('.tips-popup').hide();
-		} else {
-			if(listenClickNumStatus) {
-				$('#form').submit();
-				listenClickNumStatus = false;
-			}
-		}
-	})
-	function showTips(title,text) {
-		$('.tips-popup h4').text(title);
-		$('.tips-popup p').text(text);
-		$('.tips-popup').show();
-	}
-    $('body').on('keyup', '#wipeRemarks',function() {
-        $('#remarkLen').text($(this).val().length);
-    });
-	$('body').on('change','.wipeBtn input',function() {
-	    var wrapper = $(this).parents(".supplier-fee");
-		wrapper.find('.need-to-pay').trigger("input");
-		wrapper.find('.need-to-pay').trigger("propertychange");
-	});
-	//  待付<=应付-已付
-	$('body').on('input propertychange','.need-to-pay',function() {
-		var thisEle = $(this),
-			wrapper = thisEle.parents(".supplier-fee"),
-			shouldPay = thisEle.attr('data-pay')*1,
-			differencePrice = thisEle.attr('data-difference')*1,
-			differenceType = thisEle.attr('data-type'),
-			alreadyPaid = thisEle.attr('data-payed')*1;
-		if(thisEle.val().length>8){
-			thisEle.val(thisEle.val().slice(0,8));
-		}
-		if (differenceType == 2){
-			differencePrice = -differencePrice;
-		}
-		if((thisEle.val() > shouldPay - alreadyPaid + differencePrice) || thisEle.val() < 0) {
-			thisEle.val((shouldPay - alreadyPaid + differencePrice).toFixed(2));
-		}
-		var wipe = parseFloat((shouldPay - alreadyPaid - thisEle.val() + differencePrice).toFixed(12));
-		if (wipe>0) {
-			wrapper.find('.wipeBtn').show();
-		}else{
-			wrapper.find('.wipeBtn').hide();
-			wrapper.find('.wipeFee').prop("checked", false);
-		}
-		wrapper.find('.wipeFee').val(wipe);
-		wrapper.find('.wipeText').text('¥'+wipe.toFixed(2));
-		var totalAmount = 0,wipeTotalFee = 0;
-		$('.need-to-pay').each(function (index, ele) {
-			totalAmount += Number($(this).val());
-		});
-		$('.wipeFee:checked').each(function (index, ele) {
-			wipeTotalFee += Number($(this).val());
-		});
-		totalAmount = totalAmount.toFixed(2);
-		wipeTotalFee = wipeTotalFee.toFixed(2);
-		if(Number(wipeTotalFee)>0){
-			$('.wipeVisible').show();
-			$('#wipePayment').val(wipeTotalFee);
-			$('.wipeTotalFee').text('¥'+wipeTotalFee);
-		} else {
-			$('.wipeVisible').hide();
-			$('#wipePayment').val(0);
-			$('.wipeTotalFee').text('¥0.00');
-		}
-		$('#totalAmount').text(totalAmount);
-		$('#totalAmount-hidden').val(totalAmount);
-		$('#transferPayFee').text(totalAmount);
-		$('#transferPayFee-hidden').val(totalAmount);
-		$('#ableRebateAmount').text($('#ableRebateAmount-hidden').val());
-		$('#remainingBalance').text($('#ableRebateAmount-hidden').val());
-		$('.used-amount').val(0);
-		var payInfo = wrapper.find('.payInfo');
-		var checkedWipe = wrapper.find('.wipeFee:checked').length>0?wrapper.find('.wipeFee:checked').val():0;
-		payInfo.val(payInfo.attr('data-shoporderid') + '_' + thisEle.val() + '_' + checkedWipe);
-	});
+    (function () {
+        var payTableEle = $('.pay-table'),
+            listenClickNumStatus = true,
+            payProductEle = $('.pay-product-item');
+        payTableEle.each(function (i, l) {
+            var productLength = $(this).find('.pay-product-item').length;
+            // 商品列表合并单元格
+            /*$(this).find('.mergeRows').attr('rowspan',productLength);*/
+        });
+        $(window).on("load", function () {
+            $('.need-to-pay').each(function (index, ele) {
+                if ($(this).val() <= 0) {
+                    alertx("待付金额为负数,不能操作付款抹平。请先去操作供应商退款,使数据恢复正常", function () {
+                        window.location.href = "${ctx}/shopOrder/refundRecordList?operatingMode=2"
+                    });
+                }
+                var thisEle = $(this),
+                    wrapper = thisEle.parents(".supplier-fee"),
+                    shouldPay = thisEle.attr('data-pay') * 1,
+                    differencePrice = thisEle.attr('data-difference') * 1,
+                    differenceType = thisEle.attr('data-type'),
+                    alreadyPaid = thisEle.attr('data-payed') * 1;
+                if (thisEle.val().length > 8) {
+                    thisEle.val(thisEle.val().slice(0, 8));
+                }
+                if (differenceType == 2) {
+                    differencePrice = -differencePrice;
+                }
+                if ((thisEle.val() > shouldPay - alreadyPaid + differencePrice) || thisEle.val() < 0) {
+                    thisEle.val((shouldPay - alreadyPaid + differencePrice).toFixed(2));
+                }
+                var wipe = parseFloat((shouldPay - alreadyPaid - thisEle.val() + differencePrice).toFixed(12));
+                if (wipe > 0) {
+                    wrapper.find('.wipeBtn').show();
+                } else {
+                    wrapper.find('.wipeBtn').hide();
+                    wrapper.find('.wipeFee').prop("checked", false);
+                }
+                wrapper.find('.wipeFee').val(wipe);
+                wrapper.find('.wipeText').text('¥' + wipe.toFixed(2));
+            });
+        });
+        $('.tips-cancel-btn, #close-btn1').on('click', function () {
+            $('.tips-popup').hide();
+        });
+        $('.tips-cfm-directly').on('click', function () {
+            if ($('.tips-cfm-btn').hasClass('tips-cfm-directly')) {
+                $('.tips-popup').hide();
+            } else {
+                if (listenClickNumStatus) {
+                    $('#form').submit();
+                    listenClickNumStatus = false;
+                }
+            }
+        })
+
+        function showTips(title, text) {
+            $('.tips-popup h4').text(title);
+            $('.tips-popup p').text(text);
+            $('.tips-popup').show();
+        }
+
+        $('body').on('keyup', '#wipeRemarks', function () {
+            $('#remarkLen').text($(this).val().length);
+        });
+        $('body').on('change', '.wipeBtn input', function () {
+            var wrapper = $(this).parents(".supplier-fee");
+            wrapper.find('.need-to-pay').trigger("input");
+            wrapper.find('.need-to-pay').trigger("propertychange");
+        });
+        //  待付<=应付-已付
+        $('body').on('input propertychange', '.need-to-pay', function () {
+            var thisEle = $(this),
+                wrapper = thisEle.parents(".supplier-fee"),
+                shouldPay = thisEle.attr('data-pay') * 1,
+                differencePrice = thisEle.attr('data-difference') * 1,
+                differenceType = thisEle.attr('data-type'),
+                alreadyPaid = thisEle.attr('data-payed') * 1;
+            if (thisEle.val().length > 8) {
+                thisEle.val(thisEle.val().slice(0, 8));
+            }
+            if (differenceType == 2) {
+                differencePrice = -differencePrice;
+            }
+            if ((thisEle.val() > shouldPay - alreadyPaid + differencePrice) || thisEle.val() < 0) {
+                thisEle.val((shouldPay - alreadyPaid + differencePrice).toFixed(2));
+            }
+            var wipe = parseFloat((shouldPay - alreadyPaid - thisEle.val() + differencePrice).toFixed(12));
+            if (wipe > 0) {
+                wrapper.find('.wipeBtn').show();
+            } else {
+                wrapper.find('.wipeBtn').hide();
+                wrapper.find('.wipeFee').prop("checked", false);
+            }
+            wrapper.find('.wipeFee').val(wipe);
+            wrapper.find('.wipeText').text('¥' + wipe.toFixed(2));
+            var totalAmount = 0, wipeTotalFee = 0;
+            $('.need-to-pay').each(function (index, ele) {
+                totalAmount += Number($(this).val());
+            });
+            $('.wipeFee:checked').each(function (index, ele) {
+                wipeTotalFee += Number($(this).val());
+            });
+            totalAmount = totalAmount.toFixed(2);
+            wipeTotalFee = wipeTotalFee.toFixed(2);
+            if (Number(wipeTotalFee) > 0) {
+                $('.wipeVisible').show();
+                $('#wipePayment').val(wipeTotalFee);
+                $('.wipeTotalFee').text('¥' + wipeTotalFee);
+            } else {
+                $('.wipeVisible').hide();
+                $('#wipePayment').val(0);
+                $('.wipeTotalFee').text('¥0.00');
+            }
+            $('#totalAmount').text(totalAmount);
+            $('#totalAmount-hidden').val(totalAmount);
+            $('#transferPayFee').text(totalAmount);
+            $('#transferPayFee-hidden').val(totalAmount);
+            $('#ableRebateAmount').text($('#ableRebateAmount-hidden').val());
+            $('#remainingBalance').text($('#ableRebateAmount-hidden').val());
+            $('.used-amount').val(0);
+            var payInfo = wrapper.find('.payInfo');
+            var checkedWipe = wrapper.find('.wipeFee:checked').length > 0 ? wrapper.find('.wipeFee:checked').val() : 0;
+            payInfo.val(payInfo.attr('data-shoporderid') + '_' + thisEle.val() + '_' + checkedWipe);
+        });
 
 //			使用余额<总余额
-	$('body').on('input propertychange','.used-amount',function() {
-		var thisEle = $(this),
-			thisVal = Number(thisEle.val()),
-			//totalAmount = Number($('#totalAmount').text()),
-			totalAmount = ${cmPayShop.totalAmount},
-			rebateAmount = Number($('#rebateAmount-hidden').val()),
-			ableRebateAmount = Number($('#ableRebateAmount-hidden').val());
-
-		if((thisVal > ableRebateAmount) || thisVal < 0 || thisVal > totalAmount) {
-			thisEle.val(0);
-			$('#transferPayFee').text(totalAmount);
-			$('#transferPayFee-hidden').val(totalAmount);
-			$('#ableRebateAmount').text($('#ableRebateAmount-hidden').val());
-			$('#remainingBalance').text(rebateAmount);
-		} else {
-			$('#transferPayFee').text((totalAmount-thisVal).toFixed(2));
-			$('#transferPayFee-hidden').val((totalAmount-thisVal).toFixed(2));
-			$('#ableRebateAmount').text((ableRebateAmount-thisVal).toFixed(2));
-			$('#remainingBalance').text((rebateAmount-thisVal).toFixed(2));
-		}
-	});
-
-	$('.pay-table').each(function(){
-		var thisEle = $(this),
-			totalComissionVal = 0,
-			resVal = '';
-		totalComissionEle = thisEle.find('.payCm'),
-			comissionEle = thisEle.find('.payCm-t'),
-			thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',',''),
-			freightVal = thisEle.find('.freight').text().replace(',','');
-		totalComissionEle.each(function(){
-			totalComissionVal += Number($(this).text().replace(',',''));
-		})
-		resVal = (totalComissionVal - thirdPartyVal - freightVal).toFixed(2);
-		comissionEle.text(resVal);
-	})
-
-	$('.apply-btn').on('click',function() {
-		var payNameVal = $('#payment-form-name').val(),
-			accountNameVal = $('#account-name').val(),
-			accountNoVal = $('#account-no').val(),
-			accountBankVal = $('#account-bank').val();
-
-		if(!payNameVal.trim()) {
-			alertx("付款单名称不能为空");
-			return false;
-		}
-		if(!accountNameVal.trim()) {
-			alertx("户名不能为空");
-			return false;
-		}
-		if(!accountNoVal.trim()) {
-			alertx("账号不能为空");
-			return false;
-		}
-		if(!accountBankVal.trim()) {
-			alertx("开户行不能为空");
-			return false;
-		}
-		if($('#wipePayment').val()*1>0){
-            if(!$('#wipeRemarks').val().trim()) {
-                alertx("抹平备注不能为空");
+        $('body').on('input propertychange', '.used-amount', function () {
+            var thisEle = $(this),
+                thisVal = Number(thisEle.val()),
+                //totalAmount = Number($('#totalAmount').text()),
+                totalAmount = ${cmPayShop.totalAmount},
+                rebateAmount = Number($('#rebateAmount-hidden').val()),
+                ableRebateAmount = Number($('#ableRebateAmount-hidden').val());
+
+            if ((thisVal > ableRebateAmount) || thisVal < 0 || thisVal > totalAmount) {
+                thisEle.val(0);
+                $('#transferPayFee').text(totalAmount);
+                $('#transferPayFee-hidden').val(totalAmount);
+                $('#ableRebateAmount').text($('#ableRebateAmount-hidden').val());
+                $('#remainingBalance').text(rebateAmount);
+            } else {
+                $('#transferPayFee').text((totalAmount - thisVal).toFixed(2));
+                $('#transferPayFee-hidden').val((totalAmount - thisVal).toFixed(2));
+                $('#ableRebateAmount').text((ableRebateAmount - thisVal).toFixed(2));
+                $('#remainingBalance').text((rebateAmount - thisVal).toFixed(2));
+            }
+        });
+
+        $('.pay-table').each(function () {
+            var thisEle = $(this),
+                totalComissionVal = 0,
+                resVal = '';
+            totalComissionEle = thisEle.find('.payCm'),
+                comissionEle = thisEle.find('.payCm-t'),
+                thirdPartyVal = thisEle.find('.third-party-fee').text().replace(',', ''),
+                freightVal = thisEle.find('.freight').text().replace(',', '');
+            totalComissionEle.each(function () {
+                totalComissionVal += Number($(this).text().replace(',', ''));
+            })
+            resVal = (totalComissionVal - thirdPartyVal - freightVal).toFixed(2);
+            comissionEle.text(resVal);
+        })
+
+        $('.apply-btn').on('click', function () {
+            var payNameVal = $('#payment-form-name').val(),
+                accountNameVal = $('#account-name').val(),
+                accountNoVal = $('#account-no').val(),
+                accountBankVal = $('#account-bank').val();
+
+            if (!payNameVal.trim()) {
+                alertx("付款单名称不能为空");
+                return false;
+            }
+            if (!accountNameVal.trim()) {
+                alertx("户名不能为空");
+                return false;
+            }
+            if (!accountNoVal.trim()) {
+                alertx("账号不能为空");
                 return false;
             }
-			var imgArr = [];
-			if($('#image1').val()){ imgArr.push($('#image1').val()); }
-			if($('#image2').val()){ imgArr.push($('#image2').val()); }
-			if($('#image3').val()){ imgArr.push($('#image3').val()); }
-			if($('#image4').val()){ imgArr.push($('#image4').val()); }
-			if($('#image5').val()){ imgArr.push($('#image5').val()); }
-			if(imgArr.length>0){
-			    $('#wipeRemarkImages').val(imgArr.join("##"));
-			}else{
-			    $('#wipeRemarkImages').val('');
-			}
-            $('.tips-cfm-btn').removeClass('tips-cfm-directly');
-            $('.tips-cancel-btn').show();
-            showTips('确认提示','本次付款存在付款抹平行为,付款抹平总额为¥'+$('#wipePayment').val()+',确认无误后,请点击确定按钮提交付款申请!');
-		}else{
-			$('#wipePayment').val(0);
-			$('#wipeRemarks').val('');
-			$('#wipeRemarkImages').val('');
-            $('.tips-cfm-btn').removeClass('tips-cfm-directly');
-            $('.tips-cancel-btn').show();
-            showTips('确认提示','确定要提交申请吗?');
-		}
-	})
-})();
-
-//图片初始化
-$(function () {
-	$('.upload-content .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
-	$('.upload-content .conList .btn:nth-of-type(2)').after('<img class="cancel-upload" src="/static/images/close-btn1.png">').remove();
-	$('.upload-content .conList').find('.cancel-upload').hide();
-	var observeEle = document.getElementsByClassName('upload-content')[0];
-	var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
-	var MutationObserverConfig={
-		childList: true,
-		subtree: true,
-		characterData: true
-	};
-	var observer = new MutationObserver(function(mutations){
-		$.each(mutations, function(index,item) {
-			if (item.type === 'childList') {
-				// 在创建新的 element 时调用
-				var target = $(item.target),
-					thisWrapper = target.closest('.conList'),
-					nextEle = thisWrapper.next();
-				thisWrapper.find('li').css('z-index',99);
-				thisWrapper.find('.cancel-upload').show();
-				if(nextEle.hasClass('hide-pic')) {
-					nextEle.removeClass('hide-pic');
-				}
-			}
-		})
-	});
-	observer.observe(observeEle,MutationObserverConfig);
-
-	$('body').on('click', '.cancel-upload',function() {
-		var wrapper = $(this).closest('.conList');
-		wrapper.find('li').css('z-index','-1');
-		wrapper.find('input').val('');
-		$(this).hide();
-		if ($('.cancel-upload:visible').length < 9) {
-			wrapper.addClass("hide-pic");
-		}else{
-			wrapper.removeClass("hide-pic");
-		}
-		wrapper.parent().append(wrapper.clone());
-		wrapper.remove();
-		$(".conList").each(function(i,ele){
-			if($(ele).find("input.imagesInput").val()){
-				$(ele).next().removeClass("hide-pic")
-			}
-		})
-	});
-	$(window).on("load", function(){
-		setTimeout(function(){
-			$("#wipeImageBox").find("input.imagesInput").each(function(i,ele){
-				if($(ele).val()){
-					$(ele).next().find("li").css("z-index","99");
-					$(ele).parents(".conList").find(".cancel-upload").show();
-					$(ele).parents(".conList").next().removeClass("hide-pic")
-				}
-			})
-		},500);
-	});
-});
+            if (!accountBankVal.trim()) {
+                alertx("开户行不能为空");
+                return false;
+            }
+            if ($('#wipePayment').val() * 1 > 0) {
+                if (!$('#wipeRemarks').val().trim()) {
+                    alertx("抹平备注不能为空");
+                    return false;
+                }
+                var imgArr = [];
+                if ($('#image1').val()) {
+                    imgArr.push($('#image1').val());
+                }
+                if ($('#image2').val()) {
+                    imgArr.push($('#image2').val());
+                }
+                if ($('#image3').val()) {
+                    imgArr.push($('#image3').val());
+                }
+                if ($('#image4').val()) {
+                    imgArr.push($('#image4').val());
+                }
+                if ($('#image5').val()) {
+                    imgArr.push($('#image5').val());
+                }
+                if (imgArr.length > 0) {
+                    $('#wipeRemarkImages').val(imgArr.join("##"));
+                } else {
+                    $('#wipeRemarkImages').val('');
+                }
+                $('.tips-cfm-btn').removeClass('tips-cfm-directly');
+                $('.tips-cancel-btn').show();
+                showTips('确认提示', '本次付款存在付款抹平行为,付款抹平总额为¥' + $('#wipePayment').val() + ',确认无误后,请点击确定按钮提交付款申请!');
+            } else {
+                $('#wipePayment').val(0);
+                $('#wipeRemarks').val('');
+                $('#wipeRemarkImages').val('');
+                $('.tips-cfm-btn').removeClass('tips-cfm-directly');
+                $('.tips-cancel-btn').show();
+                showTips('确认提示', '确定要提交申请吗?');
+            }
+        })
+    })();
+
+    //图片初始化
+    $(function () {
+        $('.upload-content .conList .btn:nth-of-type(1)').html('<div><span>+</span><h5>选择图片</h5></div>');
+        $('.upload-content .conList .btn:nth-of-type(2)').after('<img class="cancel-upload" src="/static/images/close-btn1.png">').remove();
+        $('.upload-content .conList').find('.cancel-upload').hide();
+        var observeEle = document.getElementsByClassName('upload-content')[0];
+        var MutationObserver = window.MutationObserver || window.WebKitMutationObserver;
+        var MutationObserverConfig = {
+            childList: true,
+            subtree: true,
+            characterData: true
+        };
+        var observer = new MutationObserver(function (mutations) {
+            $.each(mutations, function (index, item) {
+                if (item.type === 'childList') {
+                    // 在创建新的 element 时调用
+                    var target = $(item.target),
+                        thisWrapper = target.closest('.conList'),
+                        nextEle = thisWrapper.next();
+                    thisWrapper.find('li').css('z-index', 99);
+                    thisWrapper.find('.cancel-upload').show();
+                    if (nextEle.hasClass('hide-pic')) {
+                        nextEle.removeClass('hide-pic');
+                    }
+                }
+            })
+        });
+        observer.observe(observeEle, MutationObserverConfig);
+
+        $('body').on('click', '.cancel-upload', function () {
+            var wrapper = $(this).closest('.conList');
+            wrapper.find('li').css('z-index', '-1');
+            wrapper.find('input').val('');
+            $(this).hide();
+            if ($('.cancel-upload:visible').length < 9) {
+                wrapper.addClass("hide-pic");
+            } else {
+                wrapper.removeClass("hide-pic");
+            }
+            wrapper.parent().append(wrapper.clone());
+            wrapper.remove();
+            $(".conList").each(function (i, ele) {
+                if ($(ele).find("input.imagesInput").val()) {
+                    $(ele).next().removeClass("hide-pic")
+                }
+            })
+        });
+        $(window).on("load", function () {
+            setTimeout(function () {
+                $("#wipeImageBox").find("input.imagesInput").each(function (i, ele) {
+                    if ($(ele).val()) {
+                        $(ele).next().find("li").css("z-index", "99");
+                        $(ele).parents(".conList").find(".cancel-upload").show();
+                        $(ele).parents(".conList").next().removeClass("hide-pic")
+                    }
+                })
+            }, 500);
+        });
+    });
 </script>
 </body>
 </html>

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

@@ -487,19 +487,15 @@
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
-
                         <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
-                            <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number"
-                                                                    pattern="#,##0.00"/></font>
+                            <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="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
+                            <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
                         </c:if>
-
                         <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                            <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
+                            <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
                         </c:if>
-
                     </td>
                     <input type="hidden" class="payedShopAmount" value="${s.payedShopAmount}">
                     <input type="hidden" class="productAmount" value="${s.productAmount}">

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

@@ -7,11 +7,11 @@
 <%--    <style>--%>
 <%--        .table th{text-align:center}--%>
 <%--        .table td{text-align:center}--%>
-<%--        .payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px solid #eee}--%>
+<%--        .payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px slid #eee}--%>
 <%--        .required{color:red}--%>
 <%--        .payment-form label{width:100px;text-align:right;vertical-align:middle;font-weight:600}--%>
 <%--        .payment-form-top{padding:10px 0}--%>
-<%--        .payment-form-top>div,.payment-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px solid #eee;white-space:nowrap}--%>
+<%--        .payment-form-top>div,.payment-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px slid #eee;white-space:nowrap}--%>
 <%--        .payment-form-top input{vertical-align:baseline}--%>
 <%--        .payment-form-top>div:last-child span{margin-left:15px}--%>
 <%--        .payment-form-top>div:last-child span:nth-of-type(1){margin-left:0}--%>
@@ -19,39 +19,39 @@
 <%--        .pay-table tr:first-child th{background:#eee !important}--%>
 <%--        .pay-table td{background:#fff !important}--%>
 <%--        .check-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}--%>
-<%--        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}--%>
+<%--        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px slid #ddd}--%>
 <%--        .payment-form-bottom label{width:140px}--%>
 <%--        .process-details span{width:140px;margin-left:50px;font-weight:600}--%>
 <%--        .process-details div{display:inline-block}--%>
-<%--        .payment-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}--%>
+<%--        .payment-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px slid #ddd}--%>
 <%--        .tips-popup-content div{width:100%;text-align:center}--%>
 <%--        .tips-popup-content p{text-align:center;padding:80px;font-size:20px}--%>
-<%--        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}--%>
+<%--        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px slid #eee;margin-bottom:20px}--%>
 <%--        .check-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}--%>
-<%--        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}--%>
+<%--        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px slid #ddd}--%>
 <%--        .mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}--%>
-<%--        .tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}--%>
+<%--        .tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:abslute;top:50%;left:50%;transform:translate(-50%,-50%)}--%>
 <%--        .tips-popup-content div{width:100%;text-align:center}--%>
 <%--        .tips-popup-content{width:30%}--%>
 <%--        .tips-popup-content p{text-align:center;padding:80px;font-size:20px}--%>
-<%--        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}--%>
+<%--        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px slid #eee;margin-bottom:20px}--%>
 <%--        .tips-cfm-btn,.tips-cancel-btn,.check-blue-btn,.check-grey-btn{width:100px;height:40px;margin:auto;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#3daae9;color:#fff;border:none}--%>
 <%--        .refuse-btn{margin-left:50px}--%>
 <%--        .return-btn,.tips-cancel-btn,.check-grey-btn{background:#fff;color:#555;margin-left:50px}--%>
-<%--        .tips-cancel-btn,.check-grey-btn{border:1px solid #ddd;margin-left:20px;display:none}--%>
-<%--        #close-btn1{top:8px;right:10px;width:18px;position:absolute;cursor:pointer}--%>
-<%--        .tips-popup-reason .tips-popup-content{height:250px}--%>
-<%--        .tips-popup-reason .tips-popup-content div{position:absolute;bottom:15px}--%>
-<%--        .tips-popup-reason .check-grey-btn{display:inline-block}--%>
-<%--        #refuse-reason{width:80%;height:48%;left:8%;position:absolute;resize:none}--%>
-<%--        .tips-popup-reason h5{color:#555;padding-left:8%;margin-bottom:4px;margin-top:-12px}--%>
+<%--        .tips-cancel-btn,.check-grey-btn{border:1px slid #ddd;margin-left:20px;display:none}--%>
+<%--        #close-btn1{top:8px;right:10px;width:18px;position:abslute;cursr:pointer}--%>
+<%--        .tips-popup-reasn .tips-popup-content{height:250px}--%>
+<%--        .tips-popup-reasn .tips-popup-content div{position:abslute;bottom:15px}--%>
+<%--        .tips-popup-reasn .check-grey-btn{display:inline-block}--%>
+<%--        #refuse-reasn{width:80%;height:48%;left:8%;position:abslute;resize:none}--%>
+<%--        .tips-popup-reasn h5{color:#555;padding-left:8%;margin-bottom:4px;margin-top:-12px}--%>
 <%--        .check-cfm-btn{background:#3daae9;color:#fff}--%>
 <%--    </style>--%>
 <%--    <style media="print">--%>
 <%--        .styleWidth{width:6%;word-break:break-all}--%>
 <%--        .styleWidth{}--%>
 <%--        .styleWidth3{width:10%;word-break:break-all}--%>
-<%--        .table{margin-left:0;margin-bottom:20px;padding-bottom:2px;border-bottom:1px solid #ddd;box-sizing:border-box}--%>
+<%--        .table{margin-left:0;margin-bottom:20px;padding-bottom:2px;border-bottom:1px slid #ddd;box-sizing:border-box}--%>
 <%--        .export{display:none}--%>
 <%--    </style>--%>
 <%--</head>--%>
@@ -135,7 +135,7 @@
 <%--        <c:if test="${cmPayShop.status == '2'}">--%>
 <%--            <div>--%>
 <%--                <label>原因:</label>--%>
-<%--                <span>${cmPayShop.reason}</span>--%>
+<%--                <span>${cmPayShop.reasn}</span>--%>
 <%--            </div>--%>
 <%--        </c:if>--%>
 <%--    </div>--%>
@@ -144,11 +144,11 @@
 <%--        <button class="refuse-btn" type="button">审核不通过</button>--%>
 <%--        <button class="return-btn" type="button" onclick="history.go(-1)">返回</button>--%>
 <%--    </div>--%>
-<%--    <div class="mask tips-popup-reason">--%>
+<%--    <div class="mask tips-popup-reasn">--%>
 <%--        <div class="tips-popup-content">--%>
 <%--            <h4>确认提示</h4>--%>
 <%--            <h5><span class="required">* </span>审核不通过原因:</h5>--%>
-<%--            <textarea id="refuse-reason" cols="30" rows="10" maxlength="200"></textarea>--%>
+<%--            <textarea id="refuse-reasn" cols="30" rows="10" maxlength="200"></textarea>--%>
 <%--            <div>--%>
 <%--                <button class="check-cfm-btn check-blue-btn" type="button">确定</button>--%>
 <%--                <button class="check-grey-btn" type="button">取消</button>--%>
@@ -206,10 +206,10 @@
 <%--            }--%>
 <%--        })--%>
 <%--        $('.refuse-btn').on('click',function() {--%>
-<%--            $('.tips-popup-reason').show();--%>
+<%--            $('.tips-popup-reasn').show();--%>
 <%--        })--%>
 <%--        $('.check-grey-btn').on('click',function() {--%>
-<%--            $('.tips-popup-reason').hide();--%>
+<%--            $('.tips-popup-reasn').hide();--%>
 <%--        })--%>
 
 <%--        function showTips(title,text) {--%>
@@ -229,13 +229,13 @@
 <%--            var payType = $('select[name="payType"]').val(),--%>
 <%--                id = $('#id').val();--%>
 <%--            if($(this).hasClass('check-blue-btn')) {--%>
-<%--                var textareaVal = $('#refuse-reason').val();--%>
+<%--                var textareaVal = $('#refuse-reasn').val();--%>
 <%--                if(!textareaVal.trim()) {--%>
 <%--                    showTips('信息提示','审核原因不能为空');--%>
 <%--                    return false;--%>
 <%--                }--%>
 <%--                if(unaccessFlag) {--%>
-<%--                    window.location.href = '${ctx}/order/cmPayShop/checkNotPass?id=' + id + '&reason=' + textareaVal;--%>
+<%--                    window.location.href = '${ctx}/order/cmPayShop/checkNotPass?id=' + id + '&reasn=' + textareaVal;--%>
 <%--                    unaccessFlag = false;--%>
 <%--                }--%>
 <%--            } else {--%>
@@ -260,11 +260,11 @@
     <style>
         .table th{text-align:center}
         .table td{text-align:center}
-        .payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px solid #eee}
+        .payment-form h4{width:96%;margin-left:2%;padding-bottom:20px;text-align:center;border-bottom:1px slid #eee}
         .required{color:red}
         .payment-form label{width:100px;text-align:right;vertical-align:middle;font-weight:600}
         .payment-form-top{padding:10px 0}
-        .payment-form-top>div,.payment-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px solid #eee;white-space:nowrap}
+        .payment-form-top>div,.payment-form-bottom>div{width:94%;margin-left:3%;height:50px;line-height:50px;border-bottom:1px slid #eee;white-space:nowrap}
         .payment-form-top input{vertical-align:baseline}
         .payment-form-top>div:last-child span{margin-left:15px}
         .payment-form-top>div:last-child span:nth-of-type(1){margin-left:0}
@@ -281,25 +281,25 @@
         .process-for-label{margin-left:0 !important}
         .process-details div{display:inline-block}
         .check-btn{width:96%;margin-left:2%;text-align:center;height:60px;line-height:60px;margin-top:30px}
-        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #ddd}
+        .check-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px slid #ddd}
         .check-cfm-btn{background:#3daae9;color:#fff}
         .cfm-btn:active,.return-btn:active{background:#ddd;color:#fff}
         .mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}
-        .tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}
+        .tips-popup-content{width:40%;height:auto;padding-bottom:30px;background:#fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:abslute;top:50%;left:50%;transform:translate(-50%,-50%)}
         .tips-popup-content div{width:100%;text-align:center}
         .tips-popup-content{width:30%}
         .tips-popup-content p{text-align:center;padding:80px;font-size:20px}
-        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}
+        .tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px slid #eee;margin-bottom:20px}
         .tips-cfm-btn,.tips-cancel-btn,.check-blue-btn,.check-grey-btn{width:100px;height:40px;margin:auto;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#3daae9;color:#fff;border:none}
         .refuse-btn{margin-left:50px}
         .return-btn,.tips-cancel-btn,.check-grey-btn{background:#fff;color:#555;margin-left:50px}
-        .tips-cancel-btn,.check-grey-btn{border:1px solid #ddd;margin-left:20px;display:none}
-        #close-btn1{top:8px;right:10px;width:18px;position:absolute;cursor:pointer}
-        .tips-popup-reason .tips-popup-content{height:250px}
-        .tips-popup-reason .tips-popup-content div{position:absolute;bottom:15px}
-        .tips-popup-reason .check-grey-btn{display:inline-block}
-        #refuse-reason{width:80%;height:48%;left:8%;position:absolute;resize:none}
-        .tips-popup-reason h5{color:#555;padding-left:8%;margin-bottom:4px;margin-top:-12px}
+        .tips-cancel-btn,.check-grey-btn{border:1px slid #ddd;margin-left:20px;display:none}
+        #close-btn1{top:8px;right:10px;width:18px;position:abslute;cursr:pointer}
+        .tips-popup-reasn .tips-popup-content{height:250px}
+        .tips-popup-reasn .tips-popup-content div{position:abslute;bottom:15px}
+        .tips-popup-reasn .check-grey-btn{display:inline-block}
+        #refuse-reasn{width:80%;height:48%;left:8%;position:abslute;resize:none}
+        .tips-popup-reasn h5{color:#555;padding-left:8%;margin-bottom:4px;margin-top:-12px}
         .red{color:red;}
         .payment-form-bottom .wipeImgs{height:auto;padding:8px 0;}
         .wipeImgs img{width:120px;height:90px;background-color:#eee;margin-right:15px;}
@@ -426,11 +426,11 @@
                             <c:if test="${s.differenceType ne 1 && s.differenceType ne 2}">应付:<fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
+                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
                             </c:if>
 
                             <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                                <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
+                                <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
                             </c:if>
                             , 已付:<fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/>
                         </div>
@@ -562,11 +562,11 @@
     </div>
 </div>
 <%--</form>--%>
-<div class="mask tips-popup-reason">
+<div class="mask tips-popup-reasn">
     <div class="tips-popup-content">
         <h4>确认提示</h4>
         <h5><span class="required">* </span>审核不通过原因:</h5>
-        <textarea id="refuse-reason" cols="30" rows="10" maxlength="200"></textarea>
+        <textarea id="refuse-reasn" cols="30" rows="10" maxlength="200"></textarea>
         <div>
             <button class="check-cfm-btn check-blue-btn" type="button">确定</button>
             <button class="check-grey-btn" type="button">取消</button>
@@ -623,10 +623,10 @@
             }
         })
         $('.refuse-btn').on('click',function() {
-            $('.tips-popup-reason').show();
+            $('.tips-popup-reasn').show();
         })
         $('.check-grey-btn').on('click',function() {
-            $('.tips-popup-reason').hide();
+            $('.tips-popup-reasn').hide();
         })
 
         function showTips(title,text) {
@@ -646,13 +646,13 @@
             var payType = $('select[name="payType"]').val(),
                 id = $('#id').val();
             if($(this).hasClass('check-blue-btn')) {
-                var textareaVal = $('#refuse-reason').val();
+                var textareaVal = $('#refuse-reasn').val();
                 if(!textareaVal.trim()) {
                     showTips('信息提示','审核原因不能为空');
                     return false;
                 }
                 if(unaccessFlag) {
-                    window.location.href = '${ctx}/order/cmPayShop/checkNotPass?id=' + id + '&reason=' + textareaVal;
+                    window.location.href = '${ctx}/order/cmPayShop/checkNotPass?id=' + id + '&reasn=' + textareaVal;
                     unaccessFlag = false;
                 }
             } else {

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

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

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

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

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

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

+ 2 - 3
src/main/webapp/WEB-INF/views/modules/order/paidShopOrderList.jsp

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

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

@@ -202,22 +202,15 @@
         </td>
         <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
         <td colspan="2" class="supplier-fee">
-            <%--                <div><span class="label-justify">应付:</span><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></div>--%>
-            <%--                <div><span class="label-justify">已付:</span><fmt:formatNumber value="${s.payedShopAmount}" type="number" pattern="#,##0.00"/></div>--%>
-            <%--                <div><span class="label-justify">待付:</span><fmt:formatNumber value="${s.shouldPayShopAmount - s.payedShopAmount}" type="number" pattern="#,##0.00"/></div>--%>
-
                 <c:if test="${s.differenceType ne 1 && s.differenceType ne 2 }">
-                    <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number"
-                                                            pattern="#,##0.00"/></font>
+                    <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="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
+                    <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
                 </c:if>
-
                 <c:if test="${s.differenceType eq 2 && s.differencePrice > 0}">
-                    <font color="red">${s.shouldPayShopAmount+s.differencePrice}(原应付:${s.shouldPayShopAmount},已补差价:${s.differencePrice})</font>
+                    <font color="red">${s.shouldPayShopAmount-s.differencePrice}(原应付:${s.shouldPayShopAmount},已退差价:${s.differencePrice})</font>
                 </c:if>
-
         </td>
     </tr>
     <tr>