付款页面/收款列表

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -93,6 +93,7 @@ public class CmDiscernReceiptController extends BaseController {
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findOrganize();
         model.addAttribute("cmUserOrganizeList", cmUserOrganizeList);
+        //
         model.addAttribute("page", page);
         return "modules/order/cmDiscernReceiptList";
     }

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -90,6 +90,9 @@
             <if test="payWay != null and payWay != ''">
                 AND a.payWay = #{payWay}
             </if>
+            <if test="payType != null and payType != ''">
+                AND a.payType = #{payType}
+            </if>
             <if test="receiptType != null and receiptType != ''">
                 AND a.receiptType = #{receiptType}
             </if>

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

@@ -187,30 +187,34 @@
                         <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>
-                        <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>
-                        <c:if test="${s.receiptStatus == 4}">
-                            ----
-                        </c:if>
+                        <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>
+                            <c:if test="${s.receiptStatus == 4}">
+                                ----
+                            </c:if>
+                        </a>
                     </td>
                     <td>
                         <fmt:formatNumber value="${s.payableAmount}" type="number" pattern="#,##0.00"/>
                         (余额抵扣:<fmt:formatNumber value="${s.balancePayFee}" type="number" pattern="#,##0.00"/>)
                     </td>
                     <td>
-                        <c:if test="${s.alreadyReceipt eq '----'}">
-                            ${s.alreadyReceipt}
-                        </c:if>
-                        <c:if test="${s.alreadyReceipt ne '----'}">
-                            <fmt:formatNumber value="${s.alreadyReceipt}" type="number" pattern="#,##0.00"/>
-                        </c:if>
+                        <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>
+                            <c:if test="${s.alreadyReceipt ne '----'}">
+                                <fmt:formatNumber value="${s.alreadyReceipt}" type="number" pattern="#,##0.00"/>
+                            </c:if>
+                        </a>
                     </td>
                     <td>
                         <c:if test="${s.payStatus == 1 || empty s.payStatus || s.payStatus == 0}"><font

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

@@ -32,7 +32,7 @@
 
         #btnSubmit {
             width: 128px;
-            margin-left: 489px;
+            margin-left: 200px;
         }
 
         .select-ele {
@@ -90,16 +90,12 @@
             <form:input path="id" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
             <label>订单ID：</label>
             <form:input path="orderID" htmlEscape="false" maxlength="20" class="input-medium" onchange="onlynum(this)"/>
-            <label>收款时间：</label>
-            <form:input path="startTime" type="text" maxlength="20" class="input-medium Wdate" value="${startTime}"
-                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-            <span class="time-space-symbols">至</span>
-            <form:input path="endTime" type="text" maxlength="20" class="input-medium Wdate" value="${endTime}"
-                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
-        </div>
-        <div>
             <label>订单编号：</label>
             <form:input path="orderNo" htmlEscape="false" maxlength="50" class="input-medium"/>
+            <label>机构名称：</label>
+            <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
+        </div>
+        <div>
             <label>收款方式：</label>
             <form:select path="payWay" class="select-ele input-medium">
                 <form:option value="" label="全部"/>
@@ -118,6 +114,12 @@
                 <form:options items="${fns:getDictList('discernReceiptStatus')}" itemLabel="label" itemValue="value"
                               htmlEscape="false"/>
             </form:select>
+            <label>收款账号：</label>
+            <form:select path="payType" class="select-ele input-medium">
+                <form:option value="" label="全部"/>
+                <form:options items="${fns:getDictList('payType')}" itemLabel="label" itemValue="value"
+                              htmlEscape="false"/>
+            </form:select>
         </div>
         <div>
             <label>收款进度：</label>
@@ -138,12 +140,7 @@
                 <form:options items="${fns:getDictList('associationNum')}" itemLabel="label" itemValue="value"
                               htmlEscape="false"/>
             </form:select>
-            <label>机构名称：</label>
-            <form:input path="userName" htmlEscape="false" maxlength="25" class="input-medium"/>
-            <div class="clearfix"></div>
 
-        </div>
-        <div class="check-btn-wrapper">
             <label>组织：</label>
             <form:select path="organizeID" class="input-medium">
                 <form:option value="" label="请选择"/>
@@ -151,6 +148,15 @@
                 <form:options items="${cmUserOrganizeList}" itemLabel="organizeName" itemValue="id"
                               htmlEscape="false"/>
             </form:select>
+            <div class="clearfix"></div>
+        </div>
+        <div class="check-btn-wrapper">
+            <label>收款时间：</label>
+            <form:input path="startTime" type="text" maxlength="20" class="input-medium Wdate" value="${startTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+            <span class="time-space-symbols">至</span>
+            <form:input path="endTime" type="text" maxlength="20" class="input-medium Wdate" value="${endTime}"
+                        onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
             <input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
             <input id="export" class="btn btn-primary" value="导出筛选结果"/>
         </div>

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

@@ -101,10 +101,11 @@
 						<td colspan="2">${s.payTotalFee}</td>
 						<td colspan="3">${s.orderTime}</td>
 						<%--此处对应订单列表收款状态--%>
-						<td><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></td>
-						<td>${s.receiptTotalFee}</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}">

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

@@ -108,10 +108,11 @@
 					<td colspan="2">${s.payTotalFee}</td>
 					<td colspan="3">${s.orderTime}</td>
 					<%--此处对应订单列表收款状态--%>
-					<td><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></td>
-					<td>${s.receiptTotalFee}</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}">

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

@@ -106,10 +106,11 @@
                         <td colspan="2">${s.payTotalFee}</td>
                         <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                        <td><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></td>
-                        <td>${s.receiptTotalFee}</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}">

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

@@ -123,10 +123,11 @@
 					<td colspan="2">${s.payTotalFee}</td>
 					<td colspan="3">${s.orderTime}</td>
 					<%--此处对应订单列表收款状态--%>
-					<td><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></td>
-					<td>${s.receiptTotalFee}</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}">

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

@@ -408,10 +408,12 @@
                     <td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
                     <td colspan="3">${s.orderTime}</td>
                         <%--此处对应订单列表收款状态--%>
-                    <td><c:if test="${s.receiptStatus == 1}"><font color="red">待收款</font></c:if>
+                    <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></td>
-                    <td>${s.receiptTotalFee}</td>
+                        <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}">

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

@@ -186,10 +186,11 @@
 					<td colspan="2"><fmt:formatNumber value="${s.payTotalFee}" type="number" pattern="#,##0.00"/></td>
 					<td colspan="3">${s.orderTime}</td>
 					<%--此处对应订单列表收款状态--%>
-					<td><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></td>
-					<td>${s.receiptTotalFee}</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}">

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

@@ -100,10 +100,11 @@
 							<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><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></td>
-							<td>${s.receiptTotalFee}</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}">

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

@@ -105,10 +105,11 @@
 						<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><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></td>
-						<td>${s.receiptTotalFee}</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}">

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

@@ -68,10 +68,11 @@
             <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><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></td>
-            <td>${s.receiptTotalFee}</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}">

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

@@ -122,30 +122,34 @@
                     <c:if test="${order.status eq 0 || order.status eq 4 || order.status eq 5 || order.status eq 6 || order.status eq 7}">${fns:getDictLabel(order.status,"order_detail_status","" )}</c:if>
                 </td>
                 <td>
-                    <c:if test="${order.receiptStatus == 1}">
-                        <font color="red">待收款</font>
-                    </c:if>
-                    <c:if test="${order.receiptStatus == 2}">
-                        <font color="#ff8c00">部分收款</font>
-                    </c:if>
-                    <c:if test="${order.receiptStatus == 3}">
-                        <font color="green">已收款</font>
-                    </c:if>
-                    <c:if test="${order.receiptStatus == 4}">
-                        ----
-                    </c:if>
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=1"  style="text-decoration: underline">
+                        <c:if test="${order.receiptStatus == 1}">
+                            <font color="red">待收款</font>
+                        </c:if>
+                        <c:if test="${order.receiptStatus == 2}">
+                            <font color="#ff8c00">部分收款</font>
+                        </c:if>
+                        <c:if test="${order.receiptStatus == 3}">
+                            <font color="green">已收款</font>
+                        </c:if>
+                        <c:if test="${order.receiptStatus == 4}">
+                            ----
+                        </c:if>
+                    </a>
                 </td>
                 <td>
                     <fmt:formatNumber value="${order.payableAmount}" type="number" pattern="#,##0.00"/>
                     (余额抵扣:<fmt:formatNumber value="${order.balancePayFee}" type="number" pattern="#,##0.00"/>)
                 </td>
                 <td>
-                    <c:if test="${order.alreadyReceipt eq '----'}">
-                        ${order.alreadyReceipt}
-                    </c:if>
-                    <c:if test="${order.alreadyReceipt ne '----'}">
-                        <fmt:formatNumber value="${order.alreadyReceipt}" type="number" pattern="#,##0.00"/>
-                    </c:if>
+                    <a href="${ctx}/bulkpurchase/cmRefundsProduct/toRefundRecord.rpc?orderID=${order.orderID}&from=1"  style="text-decoration: underline">
+                        <c:if test="${order.alreadyReceipt eq '----'}">
+                            ${order.alreadyReceipt}
+                        </c:if>
+                        <c:if test="${order.alreadyReceipt ne '----'}">
+                            <fmt:formatNumber value="${order.alreadyReceipt}" type="number" pattern="#,##0.00"/>
+                        </c:if>
+                    </a>
                 </td>
                 <td>
                     <c:if test="${order.payStatus == 1 || empty order.payStatus || order.payStatus == 0}"><font