|
|
@@ -71,7 +71,7 @@
|
|
|
<body>
|
|
|
<ul class="nav nav-tabs">
|
|
|
<li ><a href="${ctx}/user/distribution/settleList?parentId=0">分销订单佣金</a></li>
|
|
|
- <li class="active"><a href="${ctx}/user/reporting/settleClubList?parentId=${cmReportingClub.parentIds}&payWay=${cmReportingClub.payWay}">佣金明细</a></li>
|
|
|
+ <li class="active"><a href="${ctx}/user/reporting/settleClubList?parentIds=${cmReportingClub.parentIds}&payWay=${cmReportingClub.payWay}">佣金明细</a></li>
|
|
|
</ul>
|
|
|
<ul class="livelyProportion">
|
|
|
<li>
|
|
|
@@ -125,21 +125,21 @@
|
|
|
</tr>
|
|
|
</thead>
|
|
|
<tbody>
|
|
|
- <c:forEach items="${page.list}" var="cmReportingClub" varStatus="status">
|
|
|
+ <c:forEach items="${page.list}" var="item" varStatus="status">
|
|
|
<tr>
|
|
|
- <td>${cmReportingClub.distributionName}</td>
|
|
|
- <td>${cmReportingClub.distributionMobile}</td>
|
|
|
- <td>${cmReportingClub.orderId}</td>
|
|
|
- <td>${cmReportingClub.organizeCostPrice}</td>
|
|
|
- <td>${cmReportingClub.splitSettleStatus eq null?'----':cmReportingClub.splitSettleStatus==0?'待确认':cmReportingClub.splitSettleStatus==1?'待手动分账':cmReportingClub.splitSettleStatus==2?'待手动结算':'已结算'}</td>
|
|
|
- <td><fmt:formatDate value="${cmReportingClub.orderTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
|
|
- <td>${cmReportingClub.splitSettleTime eq null?'----':''}<c:if test="${cmReportingClub.splitSettleTime ne null}"><fmt:formatDate value="${cmReportingClub.splitSettleTime}" pattern="yyyy-MM-dd HH:mm:ss"/></c:if></td>
|
|
|
+ <td>${item.distributionName}</td>
|
|
|
+ <td>${item.distributionMobile}</td>
|
|
|
+ <td>${item.orderId}</td>
|
|
|
+ <td>${item.organizeCostPrice}</td>
|
|
|
+ <td>${item.splitSettleStatus eq null?'----':item.splitSettleStatus==0?'待确认':item.splitSettleStatus==1?'待手动分账':item.splitSettleStatus==2?'待手动结算':'已结算'}</td>
|
|
|
+ <td><fmt:formatDate value="${item.orderTime}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
|
|
+ <td>${item.splitSettleTime eq null?'----':''}<c:if test="${item.splitSettleTime ne null}"><fmt:formatDate value="${item.splitSettleTime}" pattern="yyyy-MM-dd HH:mm:ss"/></c:if></td>
|
|
|
<td>
|
|
|
- <c:if test="${cmReportingClub.payWay==2&&cmReportingClub.splitSettleStatus==2}">
|
|
|
- <a href="${ctx}/user/reporting/splitSettleStatus?id=${cmReportingClub.id}&parentId=${cmDistribution.parentId}&payWay=${cmReportingClub.payWay}">结算</a>
|
|
|
+ <c:if test="${item.payWay==2&&item.splitSettleStatus==2}">
|
|
|
+ <a href="${ctx}/user/reporting/splitSettleStatus?id=${item.id}&parentId=${cmReportingClub.parentIds}&payWay=${item.payWay}">结算</a>
|
|
|
</c:if>
|
|
|
- <a href="${ctx}/user/reporting/settleClubFrom?id=${cmReportingClub.id}">查看详情</a>
|
|
|
- <a href="${ctx}/order/detail?id=${cmReportingClub.orderId}">查看订单</a>
|
|
|
+ <a href="${ctx}/user/reporting/settleClubFrom?id=${item.id}">查看详情</a>
|
|
|
+ <a href="${ctx}/order/detail?id=${item.orderId}">查看订单</a>
|
|
|
</td>
|
|
|
</tr>
|
|
|
</c:forEach>
|
kaick