Merge remote-tracking branch 'origin/developer' into developerH

src/main/webapp/WEB-INF/views/modules/bulkpurchase/refundRecord.jsp

@@ -323,50 +323,52 @@
         </c:if>
     </c:forEach>
 </c:if>
-<c:if test="${empty receipt}">
-    <div class="record-title">收款记录: 无</div>
-</c:if>
-<br><br>
-<c:if test="${not empty cmReturnedPurchaseList}">
-    <div class="record-title">退款记录：</div>
-    <table id="cmReturnedPurchaseTable" class="table table-striped table-bordered table-condensed">
-        <tr>
-            <th class="table-order">序号</th>
-            <th class="table-id">退款编号</th>
-            <th class="table-cell3">退款金额</th>
-            <th class="table-cell4">申请时间</th>
-            <th class="table-cell5">退款状态</th>
-        </tr>
-        <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">
-            <tr>
-                <td>
-                        ${cmReturnedPurchaseStatus.index + 1}
-                </td>
-                <td>
-                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}"
-                       style="cursor: pointer">
-                            ${cmReturnedPurchase.returnedNo}</a>
-                </td>
-                <td><fmt:formatNumber value="${cmReturnedPurchase.refundFee}" type="currency"/></td>
-                <td>${cmReturnedPurchase.returnTime}</td>
-                <td><c:if test="${cmReturnedPurchase.status eq 1}">
-                    待审核
-                </c:if>
-                    <c:if test="${cmReturnedPurchase.status eq 2}">
-                        审核通过
-                    </c:if>
-                    <c:if test="${cmReturnedPurchase.status eq 3}">
-                        审核不通过
-                    </c:if>
-                </td>
-            </tr>
-        </c:forEach>
-    </table>
-</c:if>
+<%--<c:if test="${empty receipt}">--%>
+<%--    <div class="record-title">收款记录: 无</div>--%>
+<%--</c:if>--%>
+<%--<br><br>--%>
+<%--<c:if test="${not empty cmReturnedPurchaseList}">--%>
+<%--    <div class="record-title">退款记录：</div>--%>
+<%--    <table id="cmReturnedPurchaseTable" class="table table-striped table-bordered table-condensed">--%>
+<%--        <tr>--%>
+<%--            <th class="table-order">序号</th>--%>
+<%--            <th class="table-id">退款编号</th>--%>
+<%--            <th class="table-cell3">退款金额</th>--%>
+<%--            <th class="table-cell4">申请时间</th>--%>
+<%--            <th class="table-cell5">退款状态</th>--%>
+<%--        </tr>--%>
+<%--        <c:forEach items="${cmReturnedPurchaseList}" var="cmReturnedPurchase" varStatus="cmReturnedPurchaseStatus">--%>
+<%--            <tr>--%>
+<%--                <td>--%>
+<%--                        ${cmReturnedPurchaseStatus.index + 1}--%>
+<%--                </td>--%>
+<%--                <td>--%>
+<%--                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRecturnRecord.rpc?id=${cmReturnedPurchase.id}&orderID=${cmReturnedPurchase.orderID}"--%>
+<%--                       style="cursor: pointer">--%>
+<%--                            ${cmReturnedPurchase.returnedNo}</a>--%>
+<%--                </td>--%>
+<%--                <td><fmt:formatNumber value="${cmReturnedPurchase.refundFee}" type="currency"/></td>--%>
+<%--                <td>${cmReturnedPurchase.returnTime}</td>--%>
+<%--                <td><c:if test="${cmReturnedPurchase.status eq 1}">--%>
+<%--                    待审核--%>
+<%--                </c:if>--%>
+<%--                    <c:if test="${cmReturnedPurchase.status eq 2}">--%>
+<%--                        审核通过--%>
+<%--                    </c:if>--%>
+<%--                    <c:if test="${cmReturnedPurchase.status eq 3}">--%>
+<%--                        审核不通过--%>
+<%--                    </c:if>--%>
+<%--                </td>--%>
+<%--            </tr>--%>
+<%--        </c:forEach>--%>
+<%--    </table>--%>
+<%--</c:if>--%>
 <c:if test="${empty pr}">
     <div class="record-title">付款记录：无</div>
 </c:if>
-    <table id="contentTable" class="payment" width="70%" border="1">
+<c:if test="${not empty pr}">
+    <div class="record-title">付款记录：</div>
+    <table id="contentTable" class="table table-striped table-bordered table-condensed" width="70%" border="1">
         <thead>
         <tr>
             <th>序号</th>
@@ -377,14 +379,14 @@
         </tr>
         </thead>
         <tbody>
-        <c:forEach items="${pr}" var="p">
+        <c:forEach items="${pr}" var="p" varStatus="pp">
             <tr>
-                <td>${p.id}</td>
+                <td>${pp.index + 1}</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>
+                        建设银行7297
+                    </c:if>
                     <c:if test="${p.payType == '2'}">
                         中信银行0897
                     </c:if>
@@ -403,6 +405,7 @@
         </c:forEach>
         </tbody>
     </table>
+</c:if>
     <br>