退款申请bugfix

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

@@ -279,12 +279,22 @@
             <td><b>申请时间：</b>
                     ${returnTime}
             </td>
+            <c:if test="${cmReturnedPurchase.refundType eq 1}">
             <td id="spt"><b>申请金额：</b>
                 <span class="refundFee"><fmt:formatNumber value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}" pattern="#0.00"/></span>元
             </td>
             <td id="zdy" hidden><b>申请金额：</b>
                 <from:input id="freeRefundFee" path="freeRefundFee" onkeyup="num(this)"   placeholder="￥0.00" value="${empty cmReturnedPurchase.freeRefundFee?'':(cmReturnedPurchase.freeRefundFee)}"></from:input>
             </td>
+            </c:if>
+            <c:if test="${cmReturnedPurchase.refundType eq 2}">
+                <td id="spt" hidden><b>申请金额：</b>
+                    <span class="refundFee"><fmt:formatNumber value="${empty cmReturnedPurchase.refundFee?'0.00':(cmReturnedPurchase.refundFee)}" pattern="#0.00"/></span>元
+                </td>
+                <td id="zdy"><b>申请金额：</b>
+                    <from:input id="freeRefundFee" path="freeRefundFee" onkeyup="num(this)"   placeholder="￥0.00" value="${empty cmReturnedPurchase.freeRefundFee?'':(cmReturnedPurchase.freeRefundFee)}"></from:input>
+                </td>
+            </c:if>
             <td><b>退款状态：</b>
                 <c:if test="${empty status}">
                     待申请

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

@@ -298,7 +298,7 @@
      <shiro:hasPermission name="order:cmPayShop:split">
          <li class="active tab-li"><a href="${ctx}/shopOrder/splitList">子订单手动分账</a></li>
      </shiro:hasPermission>
-     <li class="active tab-li"><a href="${ctx}/shopOrder/settlement">子订单手动结算</a></li>
+     <li><a href="${ctx}/shopOrder/settlement">子订单手动结算</a></li>
 </ul>
 <form:form id="searchForm"
            action="${ctx}/splitAccount/split" method="post" class="breadcrumb form-search">