Jelajahi Sumber

付第三方付款单页面优化

plf 3 tahun lalu
induk
melakukan
07cc12dc74

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

@@ -1,3 +1,256 @@
+<%--<%@ page contentType="text/html;charset=UTF-8" %>--%>
+<%--<%@ 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-table th{background:#f9f9f9}--%>
+<%--        .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}--%>
+<%--        .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}--%>
+<%--        .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}--%>
+<%--        .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}--%>
+<%--        .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}--%>
+<%--        .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}--%>
+<%--        .export{display:none}--%>
+<%--    </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>订单编号(ID):</label>&nbsp;&nbsp;--%>
+<%--            <span><a href="${ctx}/order/detail?id=${cmPayShop.shopOrders.get(0).orderID}">${cmPayShop.shopOrders.get(0).orderNo}(${cmPayShop.shopOrders.get(0).orderID})</a></span>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>子订单编号(ID):</label>&nbsp;&nbsp;&nbsp;&nbsp;--%>
+<%--            <span><a href="${ctx}/order/detail?id=${cmPayShop.shopOrders.get(0).orderID}">${cmPayShop.shopOrders.get(0).shopOrderNo}(${cmPayShop.shopOrders.get(0).shopOrderID})</a></span>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>付款单名称:</label>--%>
+<%--            <span>${cmPayShop.name}</span>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>付款账号:</label>--%>
+<%--            <c:if test="${cmPayShop.payType eq '6'}">--%>
+<%--                无--%>
+<%--            </c:if>--%>
+<%--            <c:if test="${cmPayShop.payType ne '6'}">--%>
+<%--                <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>--%>
+<%--            </c:if>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>付第三方金额:</label>--%>
+<%--            <span>${cmPayShop.totalAmount}</span>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>付款银行:</label><span>--%>
+<%--					<select name="payType">--%>
+<%--						<option value="1">建设银行7297</option>--%>
+<%--						<option value="2">中信银行0897</option>--%>
+<%--						<option value="3">中信银行7172</option>--%>
+<%--						<option value="4">广发银行0115</option>--%>
+<%--						<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>--%>
+<%--            <label>申请人:</label>--%>
+<%--            <span>${cmPayShop.applicantName}</span>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>申请时间:</label>--%>
+<%--            <span>${cmPayShop.applyTime}</span>--%>
+<%--        </div>--%>
+<%--        <div>--%>
+<%--            <label>审核状态:</label>--%>
+<%--            <span>--%>
+<%--                <c:if test="${cmPayShop.status == '0'}">--%>
+<%--						<font color="red">--%>
+<%--							<strong>待审核</strong>--%>
+<%--						</font>--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${cmPayShop.status == '1'}">--%>
+<%--                    审核通过--%>
+<%--                </c:if>--%>
+<%--                <c:if test="${cmPayShop.status == '2'}">--%>
+<%--                    审核不通过--%>
+<%--                </c:if>--%>
+<%--            </span>--%>
+<%--        </div>--%>
+<%--        <c:if test="${cmPayShop.status == '2'}">--%>
+<%--            <div>--%>
+<%--                <label>原因:</label>--%>
+<%--                <span>${cmPayShop.reason}</span>--%>
+<%--            </div>--%>
+<%--        </c:if>--%>
+<%--    </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 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>--%>
+<%--</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);--%>
+<%--        })--%>
+
+<%--        $('.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('信息提示','审核通过');--%>
+<%--        }--%>
+
+<%--        $('.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>--%>
+<%--</body>--%>
+<%--</html>--%>
+
 <%@ page contentType="text/html;charset=UTF-8" %>
 <%@ include file="/WEB-INF/views/include/taglib.jsp"%>
 <html>
@@ -15,20 +268,22 @@
         .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}
-        .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}
+        .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}
-        .payment-btn button{width:100px;height:35px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:none;border:1px solid #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}
         .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}
@@ -45,56 +300,230 @@
         .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}
-        .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}
-        .export{display:none}
+        .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><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>订单编号(ID):</label>&nbsp;&nbsp;
-            <span><a href="${ctx}/order/detail?id=${cmPayShop.shopOrders.get(0).orderID}">${cmPayShop.shopOrders.get(0).orderNo}(${cmPayShop.shopOrders.get(0).orderID})</a></span>
+            <label><span class="required">* </span>付款单名称:</label>
+            <span>${cmPayShop.name}</span>
         </div>
         <div>
-            <label>子订单编号(ID):</label>&nbsp;&nbsp;&nbsp;&nbsp;
-            <span><a href="${ctx}/order/detail?id=${cmPayShop.shopOrders.get(0).orderID}">${cmPayShop.shopOrders.get(0).shopOrderNo}(${cmPayShop.shopOrders.get(0).shopOrderID})</a></span>
+            <label>供应商名称:</label>
+            <span>${cmPayShop.shopName}</span>
         </div>
         <div>
-            <label>付款单名称:</label>
-            <span>${cmPayShop.name}</span>
-        </div>
-        <div>
-            <label>付款账号:</label>
-            <c:if test="${cmPayShop.payType eq '6'}">
-                无
-            </c:if>
-            <c:if test="${cmPayShop.payType ne '6'}">
-                <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>
-            </c:if>
+            <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">
+                        <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>
+                                    <c:if test="${s.discountTotalFee le s.returnedPurchaseTotalFee}">
+                                        <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 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"><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.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"/>
+                        </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>付第三方金额:</label>
             <span>${cmPayShop.totalAmount}</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>
@@ -108,64 +537,49 @@
             <span>${cmPayShop.payTime}</span>
             <input name="id" value="${cmPayShop.id}" id="id" type="hidden">
         </div>
-        <div>
-            <label>申请人:</label>
-            <span>${cmPayShop.applicantName}</span>
+        <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>
-        <div>
-            <label>申请时间:</label>
-            <span>${cmPayShop.applyTime}</span>
+            <span>审核时间:</span><div>
+            <c:if test="${cmPayShop.status == 1 || cmPayShop.status == 2}">
+                ${cmPayShop.reviewTime}
+            </c:if>
         </div>
-        <div>
-            <label>审核状态:</label>
-            <span>
-                <c:if test="${cmPayShop.status == '0'}">
-						<font color="red">
-							<strong>待审核</strong>
-						</font>
-                </c:if>
-                <c:if test="${cmPayShop.status == '1'}">
-                    审核通过
-                </c:if>
-                <c:if test="${cmPayShop.status == '2'}">
-                    审核不通过
-                </c:if>
-            </span>
         </div>
-        <c:if test="${cmPayShop.status == '2'}">
-            <div>
-                <label>原因:</label>
-                <span>${cmPayShop.reason}</span>
-            </div>
-        </c:if>
     </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 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>
+<%--</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 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 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>
@@ -247,6 +661,8 @@
         })
 
     })()
+
 </script>
 </body>
 </html>
+