Ver código fonte

付供应商优化

plf 3 anos atrás
pai
commit
a5f76b2a8d

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

@@ -5,70 +5,312 @@
     <title>订单财务信息</title>
     <meta name="decorator" content="default"/>
     <style type="text/css">
-        .table th{text-align:center}
-        .table td{text-align:center}
-        #searchForm{white-space:nowrap}
-        .pay-wrapper{padding:0 10px}
-        .pay-list-item{margin-bottom:30px}
-        .pay-table th{background:#f9f9f9!important;}
-        .pay-table tr.t2 td{background:#f2fbff!important;}
-        .pay-table tr.t2 th{background:#e9f3f7!important;}
-        .pay-table tr.t1 th{background:#eee!important}
-        .pay-table td{background:#fff !important}
-        .pay-table .item0{padding:0;margin:0;font-size:12px;}
-        input[type="checkbox"]::before{content:'\a0';display:inline-block;vertical-align:.2em;width:.8em;height:.8em;margin-right:.2em;border-radius:.2em;text-indent:.15em;line-height:.65}
-        #select-all{width:70px;height:30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;background:#fff;border:1px solid #ddd;margin-bottom:10px}
-        #select-all:active{background:#3daae9;color:#fff}
-        .pay-more-func{float:right;color:#2fa4e7;cursor:pointer}
-        .pay-more-func span:first-child{margin-right:6px}
-        .pay-more-func span:hover{color:#7aa9c3}
-        .mask{width:100%;height:100%;position:fixed;top:0;background:rgba(0,0,0,0.7);display:none}
-        .revise-popup-content,.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%)}
-        .revise-popup-content{width:450px;height:360px;overflow-y:scroll;padding:0 15px 30px 15px}
-        .tips-popup-content{width:30%}
-        .tips-popup-content p{text-align:center;padding:80px;font-size:20px}
-        .revise-popup-content h4,.tips-popup-content h4{padding-left:10px;height:40px;line-height:40px;border-bottom:1px solid #eee;margin-bottom:20px}
-        .revise-popup-content div{margin-top:7px;text-align:center}
-        .revise-popup-content label{width:70px;text-align:right;vertical-align:text-bottom}
-        .revise-popup-content button{width:80px;height:30px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
-        .revise-popup-content > div:nth-of-type(4) > span:first-child{margin-left:-104px}
-        .revise-popup-content > div:nth-of-type(4) > span:last-child{margin-left:30px}
-        .revise-popup-content > div:nth-of-type(4) > span span{margin-left:10px}
-        .revise-popup-content > div:last-child{text-align:center;margin-top:20px}
-        .revise-popup-content input{width:100px;margin-bottom:0px}
-        .popup-cfm-btn,.tips-cfm-btn{background:#3daae9;color:#fff;border:none}
-        .tips-cfm-btn{width:100px;height:40px;margin:auto;display:block;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}
-        .popup-cancel-btn{background:#fff;color:#555;border:1px solid #ddd;margin-left:20px}
-        .popup-tips{color:red;display:none}
-        #close-btn,#close-btn1{top:8px;right:10px;width:18px;position:absolute;cursor:pointer}
-        .tips-input-wrapper{width:100px}
-        .reset-btn{background:#fff;color:#555;border:1px solid #ddd;margin-right:20px}
-        .pay-status{height:40px;line-height:40px;display:block}
-        .form-search label{width:80px;text-align:left;margin-top:12px}
-        .remark-textarea{width:95%;height:100px;resize:none}
-        .remark-title{text-align:left !important}
-        .remark-title span{color:red}
-        .ul-form{white-space:nowrap;margin-left:-10px !important}
-        .ul-form label{width:90px;text-align:left;margin-top:15px}
-        .time-space-symbols{width:100px;display:inline-block;text-align:center}
-        #btnSubmit{width:128px;margin-left:435px}
-        .pay-status label{margin-left:0}
-        .pay-status label:first-child{margin-left:10px}
-        .zeroCost .message{
-            display:none;
-            position:absolute;
-            background:#FFF;
-            white-space:nowrap;
-            border:1px solid black;
-
-        }
-        .zeroCost:hover .message{
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        #searchForm {
+            white-space: nowrap
+        }
+
+        .pay-wrapper {
+            padding: 0 10px
+        }
+
+        .pay-list-item {
+            margin-bottom: 30px
+        }
+
+        .pay-table th {
+            background: #f9f9f9 !important;
+        }
+
+        .pay-table tr.t2 td {
+            background: #f2fbff !important;
+        }
+
+        .pay-table tr.t2 th {
+            background: #e9f3f7 !important;
+        }
+
+        .pay-table tr.t1 th {
+            background: #eee !important
+        }
+
+        .pay-table td {
+            background: #fff !important
+        }
+
+        .pay-table .item0 {
+            padding: 0;
+            margin: 0;
+            font-size: 12px;
+        }
+
+        input[type="checkbox"]::before {
+            content: '\a0';
+            display: inline-block;
+            vertical-align: .2em;
+            width: .8em;
+            height: .8em;
+            margin-right: .2em;
+            border-radius: .2em;
+            text-indent: .15em;
+            line-height: .65
+        }
+
+        #select-all {
+            width: 70px;
+            height: 30px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px;
+            background: #fff;
+            border: 1px solid #ddd;
+            margin-bottom: 10px
+        }
+
+        #select-all:active {
+            background: #3daae9;
+            color: #fff
+        }
+
+        .pay-more-func {
+            float: right;
+            color: #2fa4e7;
+            cursor: pointer
+        }
+
+        .pay-more-func span:first-child {
+            margin-right: 6px
+        }
+
+        .pay-more-func span:hover {
+            color: #7aa9c3
+        }
+
+        .mask {
+            width: 100%;
+            height: 100%;
+            position: fixed;
+            top: 0;
+            background: rgba(0, 0, 0, 0.7);
+            display: none
+        }
+
+        .revise-popup-content, .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%)
+        }
+
+        .revise-popup-content {
+            width: 450px;
+            height: 360px;
+            overflow-y: scroll;
+            padding: 0 15px 30px 15px
+        }
+
+        .tips-popup-content {
+            width: 30%
+        }
+
+        .tips-popup-content p {
+            text-align: center;
+            padding: 80px;
+            font-size: 20px
+        }
+
+        .revise-popup-content h4, .tips-popup-content h4 {
+            padding-left: 10px;
+            height: 40px;
+            line-height: 40px;
+            border-bottom: 1px solid #eee;
+            margin-bottom: 20px
+        }
+
+        .revise-popup-content div {
+            margin-top: 7px;
+            text-align: center
+        }
+
+        .revise-popup-content label {
+            width: 70px;
+            text-align: right;
+            vertical-align: text-bottom
+        }
+
+        .revise-popup-content button {
+            width: 80px;
+            height: 30px;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px
+        }
+
+        .revise-popup-content > div:nth-of-type(4) > span:first-child {
+            margin-left: -104px
+        }
+
+        .revise-popup-content > div:nth-of-type(4) > span:last-child {
+            margin-left: 30px
+        }
+
+        .revise-popup-content > div:nth-of-type(4) > span span {
+            margin-left: 10px
+        }
+
+        .revise-popup-content > div:last-child {
+            text-align: center;
+            margin-top: 20px
+        }
+
+        .revise-popup-content input {
+            width: 100px;
+            margin-bottom: 0px
+        }
+
+        .popup-cfm-btn, .tips-cfm-btn {
+            background: #3daae9;
+            color: #fff;
+            border: none
+        }
+
+        .tips-cfm-btn {
+            width: 100px;
+            height: 40px;
+            margin: auto;
+            display: block;
+            -webkit-border-radius: 5px;
+            -moz-border-radius: 5px;
+            border-radius: 5px
+        }
+
+        .popup-cancel-btn {
+            background: #fff;
+            color: #555;
+            border: 1px solid #ddd;
+            margin-left: 20px
+        }
+
+        .popup-tips {
+            color: red;
+            display: none
+        }
+
+        #close-btn, #close-btn1 {
+            top: 8px;
+            right: 10px;
+            width: 18px;
+            position: absolute;
+            cursor: pointer
+        }
+
+        .tips-input-wrapper {
+            width: 100px
+        }
+
+        .reset-btn {
+            background: #fff;
+            color: #555;
+            border: 1px solid #ddd;
+            margin-right: 20px
+        }
+
+        .pay-status {
+            height: 40px;
+            line-height: 40px;
+            display: block
+        }
+
+        .form-search label {
+            width: 80px;
+            text-align: left;
+            margin-top: 12px
+        }
+
+        .remark-textarea {
+            width: 95%;
+            height: 100px;
+            resize: none
+        }
+
+        .remark-title {
+            text-align: left !important
+        }
+
+        .remark-title span {
+            color: red
+        }
+
+        .ul-form {
+            white-space: nowrap;
+            margin-left: -10px !important
+        }
+
+        .ul-form label {
+            width: 90px;
+            text-align: left;
+            margin-top: 15px
+        }
+
+        .time-space-symbols {
+            width: 100px;
+            display: inline-block;
+            text-align: center
+        }
+
+        #btnSubmit {
+            width: 128px;
+            margin-left: 435px
+        }
+
+        .pay-status label {
+            margin-left: 0
+        }
+
+        .pay-status label:first-child {
+            margin-left: 10px
+        }
+
+        .zeroCost .message {
+            display: none;
+            position: absolute;
+            background: #FFF;
+            white-space: nowrap;
+            border: 1px solid black;
+
+        }
+
+        .zeroCost:hover .message {
             display: inline-block;
             color: black;
             padding: 5px;
             margin-left: 10px;
         }
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
 
     </style>
     <script type="text/javascript">
@@ -188,7 +430,8 @@
                         <c:if test="${s.status eq 0 || s.status eq 4 || s.status eq 5 || s.status eq 6 || s.status eq 7}">${fns:getDictLabel(s.status,"order_detail_status","" )}</c:if>
                     </td>
                     <td>
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"  style="text-decoration: underline">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                           style="text-decoration: underline">
                             <c:if test="${s.receiptStatus == 1}">
                                 <font color="red">待收款</font>
                             </c:if>
@@ -208,7 +451,8 @@
                         (余额抵扣:<fmt:formatNumber value="${s.balancePayFee}" type="number" pattern="#,##0.00"/>)
                     </td>
                     <td>
-                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"  style="text-decoration: underline">
+                        <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${s.orderID}&from=1"
+                           style="text-decoration: underline">
                             <c:if test="${s.alreadyReceipt eq '----'}">
                                 ${s.alreadyReceipt}
                             </c:if>
@@ -223,7 +467,8 @@
                         <c:if test="${s.payStatus == 2}"><font color="#ff8c00">部分付款</font></c:if>
                         <c:if test="${s.payStatus == 3}"><font color="green">已付款</font>
                             <c:if test="${s.zeroCostFlag eq 1}">
-                                <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>
+                                <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
+                                                                                   style="width: 15px;margin-bottom: 4px"></span>
                                     <div class="message">
                                         <span>商品成本为0,直接置为已付款,无需付款供应商</span>
                                     </div>
@@ -302,26 +547,44 @@
                     <tr class="t2">
                         <td colspan="3">${so.shopOrderNo}(${so.shopOrderID})</td>
                         <td colspan="3">${so.shopName}</td>
-                        <td colspan="2" class="product-fee"><fmt:formatNumber value="${so.shopProductAmount}" type="number" pattern="#,##0.00"/></td>
-                        <td colspan="2"><fmt:formatNumber value="${so.payedShopAmount}" type="number" pattern="#,##0.00"/></td>
+                        <td colspan="2" class="product-fee"><fmt:formatNumber value="${so.shopProductAmount}"
+                                                                              type="number" pattern="#,##0.00"/></td>
+                        <td colspan="2"><fmt:formatNumber value="${so.payedShopAmount}" type="number"
+                                                          pattern="#,##0.00"/></td>
                         <td>
                             <c:if test="${so.refundAmount > 0}">
                                 <fmt:formatNumber value="${so.refundAmount}" type="number" pattern="#,##0.00"/>
                             </c:if>
                         </td>
                         <td colspan="2">
-                            <fmt:formatNumber value="${so.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>
-                            <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">
-                                <font color="red">(需补差价¥${so.differencePrice})</font>
+                                <%--                            <fmt:formatNumber value="${so.shouldPayShopAmount}" type="number" pattern="#,##0.00"/>--%>
+                                <%--                            <c:if test="${so.differenceType eq 1 && so.differencePrice > 0}">--%>
+                                <%--                                <font color="red">(需补差价¥${so.differencePrice})</font>--%>
+                                <%--                            </c:if>--%>
+                                <%--                            <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">--%>
+                                <%--                                <font color="red">(需退差价¥${so.differencePrice})</font>--%>
+                                <%--                            </c:if>--%>
+
+                            <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>
                             </c:if>
-                            <c:if test="${so.differenceType eq 2 && so.differencePrice > 0}">
-                                <font color="red">(需退差价¥${so.differencePrice})</font>
+                            <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>
+
                         </td>
-                        <td colspan="3"><fmt:formatNumber value="${so.shopTaxFee}" type="number" pattern="#,##0.00"/></td>
-                        <td class="product-freight"><fmt:formatNumber value="${so.shopPostFee}" type="number" pattern="#,##0.00"/></td>
+                        <td colspan="3"><fmt:formatNumber value="${so.shopTaxFee}" type="number"
+                                                          pattern="#,##0.00"/></td>
+                        <td class="product-freight"><fmt:formatNumber value="${so.shopPostFee}" type="number"
+                                                                      pattern="#,##0.00"/></td>
                         <td><fmt:formatNumber value="${so.shopOtherFee}" type="number" pattern="#,##0.00"/></td>
-                        <td><c:if test="${empty so.costType || so.costType == '1'}">固定成本</c:if><c:if test="${so.costType == '2'}">比例成本</c:if></td>
+                        <td><c:if test="${empty so.costType || so.costType == '1'}">固定成本</c:if><c:if
+                                test="${so.costType == '2'}">比例成本</c:if></td>
                     </tr>
                     <tr>
                         <th colspan="3">商品名</th>
@@ -340,15 +603,16 @@
                             <td colspan="3" class="product-name">
                                 <c:if test="${p.productType eq 1}"><font color="red">协商赠品:</font></c:if>
                                 <c:if test="${p.productType eq 2}"><font color="red">促销赠品:</font></c:if>
-                                ${p.name}
+                                    ${p.name}
                             </td>
                             <td style="width:80px;">${p.unit}</td>
                             <td class="p-num" data-num="${p.num + p.presentNum}">
-                                ${p.num}
+                                    ${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"/>
+                            <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)?'不含税-能开票':'不含税-不能开票'})
@@ -362,10 +626,14 @@
                                     ---
                                 </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"/>
+                                    <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 colspan="2"><fmt:formatNumber
+                                    value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}"
+                                    type="number" pattern="#,##0.00"/></td>
                             <td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
                             <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
                             <td><c:choose>
@@ -373,11 +641,15 @@
                                     ---
                                 </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"/>
+                                    <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><fmt:formatNumber value="${p.costPrice}" type="number" pattern="#,##0.00"/></td>
-                            <td colspan="2"><fmt:formatNumber value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}" type="number" pattern="#,##0.00"/></td>
+                            <td colspan="2"><fmt:formatNumber
+                                    value="${p.costPrice * (p.num + p.presentNum - p.returnedNum)}" type="number"
+                                    pattern="#,##0.00"/></td>
                         </tr>
                     </c:forEach>
                 </c:forEach>

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

@@ -170,13 +170,16 @@
 						<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.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.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}">

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

@@ -182,10 +182,11 @@
 					<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.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.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>

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

@@ -167,10 +167,11 @@
                         <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.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.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>

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

@@ -194,12 +194,14 @@
 					<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 test="${s.differenceType eq 1 && s.differencePrice > 0}">
-								<font color="red">(需补差价¥${s.differencePrice})</font>
+                            <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.differencePrice})</font>
-							</c:if>,</span>
+
+                            <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">

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

@@ -487,13 +487,19 @@
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
-                        <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
+
+                        <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>
+                        </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="red">(需补差价¥${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.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}">

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

@@ -424,12 +424,13 @@
                     <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.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.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}">

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

@@ -587,10 +587,11 @@
                     <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.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.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>

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

@@ -410,12 +410,15 @@
                     <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"/>
+
                             <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                                <font color="red">(需补差价¥${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.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>

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

@@ -171,10 +171,11 @@
 					<td 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.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.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>

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

@@ -396,12 +396,16 @@
                     <td colspan="3" class="taxes"><fmt:formatNumber value="${s.shopTaxFee}" type="number"
                                                                     pattern="#,##0.00"/></td>
                     <td class="supplier-fee">
-                        <font color="#E15616"><fmt:formatNumber value="${s.shouldPayShopAmount}" type="number" pattern="#,##0.00"/></font>
+                        <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>
+                        </c:if>
                         <c:if test="${s.differenceType eq 1 && s.differencePrice > 0}">
-                            <font color="red">(需补差价¥${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.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}">

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

@@ -1,93 +1,140 @@
 <%@ 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 type="text/css">
-        .table th{text-align:center}
-        .table td{text-align:center}
-        .payment th{text-align:center;background-color:#199ed8;color:#ffffff;height:25px}
-        .payment td{text-align:center}
-        .label-justify{float:left}
-        .text-left{display:flex;justify-content:center;-webkit-display:flex;-webkit-justify-content:center;-moz-display:flex;-moz-justify-content:center;-ms-display:flex;-ms-justify-content:center}
-        .zeroCost .message{
-            display:none;
-            position:absolute;
-            background:#FFF;
-            white-space:nowrap;
-            border:1px solid black;
+    <title>退/付款记录</title>
+    <meta name="decorator" content="default"/>
+    <style type="text/css">
+        .table th {
+            text-align: center
+        }
+
+        .table td {
+            text-align: center
+        }
+
+        .payment th {
+            text-align: center;
+            background-color: #199ed8;
+            color: #ffffff;
+            height: 25px
+        }
+
+        .payment td {
+            text-align: center
+        }
+
+        .label-justify {
+            float: left
+        }
 
+        .text-left {
+            display: flex;
+            justify-content: center;
+            -webkit-display: flex;
+            -webkit-justify-content: center;
+            -moz-display: flex;
+            -moz-justify-content: center;
+            -ms-display: flex;
+            -ms-justify-content: center
         }
-        .zeroCost:hover .message{
+
+        .zeroCost .message {
+            display: none;
+            position: absolute;
+            background: #FFF;
+            white-space: nowrap;
+            border: 1px solid black;
+
+        }
+
+        .zeroCost:hover .message {
             display: inline-block;
             color: black;
             padding: 5px;
             margin-left: 10px;
         }
-        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
+
+        .weishaIcon {
+            background: darkorange;
+            color: white;
+            margin: 0 0px;
+            padding: 0 3px;
+            font-style: normal;
+            font-size: 12px;
+            display: inline-block;
+            border-radius: 2px
+        }
 
     </style>
-	<script type="text/javascript">
-		function page(n,s){
-			$("#pageNo").val(n);
-			$("#pageSize").val(s);
-			$("#searchForm").submit();
-        	return false;
+    <script type="text/javascript">
+        function page(n, s) {
+            $("#pageNo").val(n);
+            $("#pageSize").val(s);
+            $("#searchForm").submit();
+            return false;
         }
-	</script>
+    </script>
 </head>
 <body>
-	<ul class="nav nav-tabs">
-        <c:if test="${operatingMode == 1}">
-		    <li><a href="${ctx}/shopOrder/payOrderList">付款列表</a></li>
-            <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
-            <li class="active"><a href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=1">退/付款记录</a></li>
-        </c:if>
-        <c:if test="${operatingMode == 2}">
-            <li><a href="${ctx}/order/cmRefundShop/">退款列表</a></li>
-            <li><a href="${ctx}/shopOrder/refundRecordList?operatingMode=2">记录退款</a></li>
-            <li class="active"><a href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=2">退/付款记录</a></li>
-        </c:if>
-        <c:if test="${operatingMode == 3}">
-            <li><a href="${ctx}/shopOrder/payOrderList">付款列表</a></li>
-            <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
-            <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
-            <li class="active"><a href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=1">退/付款记录</a></li>
-        </c:if>
+<ul class="nav nav-tabs">
+    <c:if test="${operatingMode == 1}">
+        <li><a href="${ctx}/shopOrder/payOrderList">付款列表</a></li>
+        <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+        <li class="active"><a
+                href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=1">退/付款记录</a>
+        </li>
+    </c:if>
+    <c:if test="${operatingMode == 2}">
+        <li><a href="${ctx}/order/cmRefundShop/">退款列表</a></li>
+        <li><a href="${ctx}/shopOrder/refundRecordList?operatingMode=2">记录退款</a></li>
+        <li class="active"><a
+                href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=2">退/付款记录</a>
+        </li>
+    </c:if>
+    <c:if test="${operatingMode == 3}">
+        <li><a href="${ctx}/shopOrder/payOrderList">付款列表</a></li>
+        <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=1">申请付款</a></li>
+        <li><a href="${ctx}/shopOrder/payOrderList?operatingMode=3">已付款子订单</a></li>
+        <li class="active"><a
+                href="${ctx}/shopOrder/payedAndRefundRecordList?shopOrderID=${s.shopOrderID}&operatingMode=1">退/付款记录</a>
+        </li>
+    </c:if>
 
-	</ul>
-    <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="3">经理折扣</th>
-            <th>成本类型</th>
-            <th>付第三方</th>
-        </tr>
-        <tr>
-            <td><a href="${ctx}/order/detail?id=${s.orderID}">${s.shopOrderNo}(${s.shopOrderID})</a></td>
-            <td colspan="3"><a href="${ctx}/order/detail?id=${s.orderID}">${s.orderNo}(${s.orderID})</a></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="3">
-                <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}">
+</ul>
+<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="3">经理折扣</th>
+        <th>成本类型</th>
+        <th>付第三方</th>
+    </tr>
+    <tr>
+        <td><a href="${ctx}/order/detail?id=${s.orderID}">${s.shopOrderNo}(${s.shopOrderID})</a></td>
+        <td colspan="3"><a href="${ctx}/order/detail?id=${s.orderID}">${s.orderNo}(${s.orderID})</a></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="3">
+            <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}">
@@ -97,246 +144,271 @@
                                         <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>
+            </c:if>
+            <c:if test="${s.discountTotalFee le 0}">¥0.00</c:if>
+        </td>
+        <td><c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if><c:if
+                test="${s.costType == '2'}">比例成本</c:if></td>
+        <td 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="3">应付税费</th>
+        <th colspan="2">付供应商</th>
+    </tr>
+    <tr>
+        <td>${s.shopName}</td>
+        <td colspan="3">
+            <c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
+            ${s.buyer}
+            <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 test="${s.zeroCostFlag eq 1}">
+                    <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg"
+                                                                       style="width: 15px;margin-bottom: 4px"></span>
+                        <div class="message">
+                            <span>商品成本为0,直接置为已付款,无需付款供应商</span>
+                        </div>
+                    </a>
+                </c:if>
+            </c:if>
+        </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>
+                </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>
+
+        </td>
+    </tr>
+    <tr>
+        <th>商品名</th>
+        <th>规格</th>
+        <th>数量<%--(赠品)--%></th>
+        <th>退货</th>
+        <th colspan="2">单价</th>
+        <th colspan="3">机构税率 / 单税费 / 总税费</th>
+        <th colspan="2">总价</th>
+        <th colspan="3">供应商税率 / 单税费 / 总税费</th>
+        <th>成本(单)</th>
+        <th>成本(总)</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><c:if test="${empty s.costType || s.costType == '1'}">固定成本</c:if><c:if test="${s.costType == '2'}">比例成本</c:if></td>
-            <td 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="3">应付税费</th>
-            <th colspan="2">付供应商</th>
-        </tr>
-        <tr>
-            <td>${s.shopName}</td>
-            <td colspan="3">
-                <c:if test="${s.organizeID == 1}"><span class="org-note">星范</span></c:if>
-                ${s.buyer}<c:if test="${s.organizeID == 3}"></c:if>
+            <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>
-                        <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 test="${s.zeroCostFlag eq 1}">
-                        <a href="javascript:;" class="zeroCost"><span><img src="/static/images/info.jpg" style="width: 15px;margin-bottom: 4px"></span>
-                            <div class="message">
-                                <span>商品成本为0,直接置为已付款,无需付款供应商</span>
-                            </div>
-                        </a>
-                    </c:if>
+            <td><font color="${p.returnedNum>0?'red':''}">${p.returnedNum}</font></td>
+            <td colspan="2"><fmt:formatNumber value="${empty p.touchPrice?p.discountPrice:p.touchPrice}" type="number"
+                                              pattern="#,##0.00"/>
+                <c:if test="${p.includedTax != null and p.includedTax != '' and p.includedTax ne 2}">
+                    <label style="color: red">
+                        (${p.includedTax eq 1?'含税':(p.invoiceType eq 1 or p.invoiceType eq 2)?'不含税-能开票':'不含税-不能开票'})
+                    </label>
                 </c:if>
             </td>
-            <td colspan="3" 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>
-            </td>
-        </tr>
-        <tr>
-            <th>商品名</th>
-            <th>规格</th>
-            <th>数量<%--(赠品)--%></th>
-            <th>退货</th>
-            <th colspan="2">单价</th>
-            <th colspan="3">机构税率 / 单税费 / 总税费</th>
-            <th colspan="2">总价</th>
-            <th colspan="3">供应商税率 / 单税费 / 总税费</th>
-            <th>成本(单)</th>
-            <th>成本(总)</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>${(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 colspan="2"><fmt:formatNumber
+                    value="${((empty p.touchPrice?p.discountPrice:p.touchPrice) + p.addedValueTax)*(p.num+p.presentNum-p.returnedNum)}"
+                    type="number" pattern="#,##0.00"/></td>
 
-                <td>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
-                <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
-                <td><c:choose>
-								<c: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>${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'---':empty p.supplierTaxRate?0.0:p.supplierTaxRate}${(p.includedTax ne '' and p.includedTax eq 0 and p.invoiceType eq 3)?'':'%'}</td>
+            <td>${(p.includedTax ne '' and (p.includedTax eq 1 or (p.includedTax eq 0 and p.invoiceType eq 3)))?'---': empty p.singleShouldPayTotalTax ?0.00:p.singleShouldPayTotalTax}</td>
+            <td><c:choose>
+                <c: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>
-    <span style="font-weight:bold">付款记录</span>
-    <table id="contentTable" class="payment" width="70%" border="1">
-        <thead>
+            <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>
+<span style="font-weight:bold">付款记录</span>
+<table id="contentTable" class="payment" width="70%" border="1">
+    <thead>
+    <tr>
+        <th>序号</th>
+        <th>付款单ID</th>
+        <th>付款时间</th>
+        <th>付款方式</th>
+        <th>付款金额</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${pr}" var="p">
         <tr>
-            <th>序号</th>
-            <th>付款单ID</th>
-            <th>付款时间</th>
-            <th>付款方式</th>
-            <th>付款金额</th>
+            <td>${p.id}</td>
+            <td><a href="${ctx}/order/cmPayShop/applyDetail?id=${p.payShopID}">${p.payShopID}</a></td>
+            <td>${p.payTime}</td>
+            <td><c:if test="${p.payType == '1'}">
+                建设银行7297
+            </c:if>
+                <c:if test="${p.payType == '2'}">
+                    中信银行0897
+                </c:if>
+                <c:if test="${p.payType == '3'}">
+                    中信银行7172
+                </c:if>
+                <c:if test="${p.payType == '4'}">
+                    广发银行0115
+                </c:if>
+                <c:if test="${p.payType == '5'}">
+                    广发银行5461
+                </c:if>
+            </td>
+            <td>${p.payAmount}</td>
         </tr>
-        </thead>
-        <tbody>
-        <c:forEach items="${pr}" var="p">
-            <tr>
-                <td>${p.id}</td>
-                <td><a href="${ctx}/order/cmPayShop/applyDetail?id=${p.payShopID}">${p.payShopID}</a></td>
-                <td>${p.payTime}</td>
-                <td><c:if test="${p.payType == '1'}">
+    </c:forEach>
+    </tbody>
+</table>
+<br>
+<span style="font-weight:bold">退款记录</span>
+<table id="contentTable" class="payment" width="70%" border="1">
+    <thead>
+    <tr>
+        <th>序号</th>
+        <th>退款记录ID</th>
+        <th>退款时间</th>
+        <th width="350px">退款方式</th>
+        <th>退款金额</th>
+    </tr>
+    </thead>
+    <tbody>
+    <c:forEach items="${receipt}" var="r">
+        <tr>
+            <td>${r.id}</td>
+            <td><a href="${ctx}/order/cmDiscernReceipt/detail?id=${r.id}">${r.id}</a></td>
+            <td>${r.receiptDate}</td>
+            <td>
+                <div class="text-left">
+                    线下转账:
+                    <c:if test="${r.payType == '1'}">
                         建设银行7297
                     </c:if>
-                    <c:if test="${p.payType == '2'}">
+                    <c:if test="${r.payType == '2'}">
                         中信银行0897
                     </c:if>
-                    <c:if test="${p.payType == '3'}">
+                    <c:if test="${r.payType == '3'}">
                         中信银行7172
                     </c:if>
-                    <c:if test="${p.payType == '4'}">
+                    <c:if test="${r.payType == '4'}">
                         广发银行0115
                     </c:if>
-                    <c:if test="${p.payType == '5'}">
+                    <c:if test="${r.payType == '5'}">
                         广发银行5461
                     </c:if>
-                </td>
-                <td>${p.payAmount}</td>
-            </tr>
-        </c:forEach>
-        </tbody>
-    </table>
-    <br>
-    <span style="font-weight:bold">退款记录</span>
-    <table id="contentTable" class="payment" width="70%" border="1">
-        <thead>
-        <tr>
-            <th>序号</th>
-            <th>退款记录ID</th>
-            <th>退款时间</th>
-            <th width="350px">退款方式</th>
-            <th>退款金额</th>
+                    &nbsp&nbsp
+                    ¥${r.receiptAmount}<br>
+                </div>
+            </td>
+            <td>${r.receiptAmount}</td>
         </tr>
-        </thead>
-        <tbody>
-        <c:forEach items="${receipt}" var="r">
-            <tr>
-                <td>${r.id}</td>
-                <td><a href="${ctx}/order/cmDiscernReceipt/detail?id=${r.id}">${r.id}</a></td>
-                <td>${r.receiptDate}</td>
-                <td>
-                    <div class="text-left">
-                        线下转账:
-                        <c:if test="${r.payType == '1'}">
-                            建设银行7297
-                        </c:if>
-                        <c:if test="${r.payType == '2'}">
-                            中信银行0897
-                        </c:if>
-                        <c:if test="${r.payType == '3'}">
-                            中信银行7172
-                        </c:if>
-                        <c:if test="${r.payType == '4'}">
-                            广发银行0115
-                        </c:if>
-                        <c:if test="${r.payType == '5'}">
-                            广发银行5461
-                        </c:if>
-                        &nbsp&nbsp
-                        ¥${r.receiptAmount}<br>
-                    </div>
-                </td>
-                <td>${r.receiptAmount}</td>
-            </tr>
-        </c:forEach>
-        <c:forEach items="${rr}" var="r">
-            <tr>
-                <td>${r.id}</td>
-                <td><a href="${ctx}/order/cmRefundShop/toRefund?id=${r.refundShopID}">${r.refundShopID}</a></td>
-                <td>${r.refundTime}</td>
-                <td>
-                    <div class="text-left">
-                        线下转账:
-                        <c:if test="${r.cmRefundShop.refundType == '1'}">
-                            建设银行7297
-                        </c:if>
-                        <c:if test="${r.cmRefundShop.refundType == '2'}">
-                            中信银行0897
-                        </c:if>
-                        <c:if test="${r.cmRefundShop.refundType == '3'}">
-                            中信银行7172
-                        </c:if>
-                        <c:if test="${r.cmRefundShop.refundType == '4'}">
-                            广发银行0115
-                        </c:if>
-                        <c:if test="${r.cmRefundShop.refundType == '5'}">
-                            广发银行5461
-                        </c:if>
-                        &nbsp&nbsp
-                        <c:if test="${r.cmRefundShop.refundAmount > 0}">
-                            ¥${r.cmRefundShop.refundAmount}<br>
-                        </c:if>
-                        欠款账簿:&nbsp&nbsp¥${r.cmRefundShop.refundBalanceAmount}
-                    </div>
-                    <c:if test="${(r.cmRefundShop.refundAmount+r.cmRefundShop.refundBalanceAmount) != r.refundAmount}">
-                        <span style="color: #9c0408">(本次退款涉及其他子订单,每种退款方式的金额为多个子订单的该方式退款总和)</span>
+    </c:forEach>
+    <c:forEach items="${rr}" var="r">
+        <tr>
+            <td>${r.id}</td>
+            <td><a href="${ctx}/order/cmRefundShop/toRefund?id=${r.refundShopID}">${r.refundShopID}</a></td>
+            <td>${r.refundTime}</td>
+            <td>
+                <div class="text-left">
+                    线下转账:
+                    <c:if test="${r.cmRefundShop.refundType == '1'}">
+                        建设银行7297
+                    </c:if>
+                    <c:if test="${r.cmRefundShop.refundType == '2'}">
+                        中信银行0897
+                    </c:if>
+                    <c:if test="${r.cmRefundShop.refundType == '3'}">
+                        中信银行7172
                     </c:if>
-                </td>
-                <td>${r.refundAmount}</td>
-            </tr>
-        </c:forEach>
-        </tbody>
-    </table>
+                    <c:if test="${r.cmRefundShop.refundType == '4'}">
+                        广发银行0115
+                    </c:if>
+                    <c:if test="${r.cmRefundShop.refundType == '5'}">
+                        广发银行5461
+                    </c:if>
+                    &nbsp&nbsp
+                    <c:if test="${r.cmRefundShop.refundAmount > 0}">
+                        ¥${r.cmRefundShop.refundAmount}<br>
+                    </c:if>
+                    欠款账簿:&nbsp&nbsp¥${r.cmRefundShop.refundBalanceAmount}
+                </div>
+                <c:if test="${(r.cmRefundShop.refundAmount+r.cmRefundShop.refundBalanceAmount) != r.refundAmount}">
+                    <span style="color: #9c0408">(本次退款涉及其他子订单,每种退款方式的金额为多个子订单的该方式退款总和)</span>
+                </c:if>
+            </td>
+            <td>${r.refundAmount}</td>
+        </tr>
+    </c:forEach>
+    </tbody>
+</table>
 </body>
 <script>
 </script>