|
|
|
|
@ -338,14 +338,14 @@
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<!--AlipayPlus (aps) -->
|
|
|
|
|
<!--Alipay+ (aps) -->
|
|
|
|
|
<div class="box box-warning">
|
|
|
|
|
<div class="box-header">
|
|
|
|
|
<h4 class="text-green">AlipayPlus Logs</h4>
|
|
|
|
|
<h4 class="text-green">Alipay+ Logs</h4>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="box-body table-responsive">
|
|
|
|
|
<p ng-if="!wechatLogs.length">No Data</p>
|
|
|
|
|
<table class="table table-hover" ng-if="wechatLogs.length">
|
|
|
|
|
<p ng-if="!apsInStoreLogs.length">No Data</p>
|
|
|
|
|
<table class="table table-hover" ng-if="apsInStoreLogs.length">
|
|
|
|
|
<thead>
|
|
|
|
|
<tr>
|
|
|
|
|
<th>Date Start</th>
|
|
|
|
|
@ -361,7 +361,7 @@
|
|
|
|
|
</tr>
|
|
|
|
|
</thead>
|
|
|
|
|
<tbody>
|
|
|
|
|
<tr ng-repeat="log in wechatLogs">
|
|
|
|
|
<tr ng-repeat="log in apsInStoreLogs">
|
|
|
|
|
<td ng-bind="log.start_date.substr(0,10)"></td>
|
|
|
|
|
<td ng-bind="log.end_date.substr(0,10)"></td>
|
|
|
|
|
<td ng-bind="log.settle_date.substr(0,10)"></td>
|
|
|
|
|
@ -391,23 +391,97 @@
|
|
|
|
|
</table>
|
|
|
|
|
<div class="panel-footer">
|
|
|
|
|
<div class="row">
|
|
|
|
|
<uib-pagination ng-if="wechatLogs.length"
|
|
|
|
|
<uib-pagination ng-if="apsInStoreLogs.length"
|
|
|
|
|
class="pagination"
|
|
|
|
|
total-items="wechatPagination.totalCount"
|
|
|
|
|
total-items="apsInStorePagination.totalCount"
|
|
|
|
|
boundary-links="true"
|
|
|
|
|
ng-model="wechatPagination.page"
|
|
|
|
|
items-per-page="wechatPagination.limit"
|
|
|
|
|
ng-model="apsInStorePagination.page"
|
|
|
|
|
items-per-page="apsInStorePagination.limit"
|
|
|
|
|
max-size="10"
|
|
|
|
|
ng-change="loadWechatLogs()"
|
|
|
|
|
ng-change="loadAlipayApsInStoreLogs()"
|
|
|
|
|
previous-text="‹"
|
|
|
|
|
next-text="›"
|
|
|
|
|
first-text="«"
|
|
|
|
|
last-text="»"></uib-pagination>
|
|
|
|
|
<div class="col-xs-12">Total Records:{{wechatPagination.totalCount}};Total
|
|
|
|
|
Pages:{{wechatPagination.totalPages}}
|
|
|
|
|
<div class="col-xs-12">Total Records:{{apsInStorePagination.totalCount}};Total
|
|
|
|
|
Pages:{{apsInStorePagination.totalPages}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
<!--Alipay+(Online) (aps) -->
|
|
|
|
|
|
|
|
|
|
<div class="box box-warning">
|
|
|
|
|
<div class="box-header">
|
|
|
|
|
<h4 class="text-green">Alipay+(Online) Logs</h4>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="box-body table-responsive">
|
|
|
|
|
<p ng-if="!apsCashierLogs.length">No Data</p>
|
|
|
|
|
<table class="table table-hover" ng-if="apsCashierLogs.length">
|
|
|
|
|
<thead>
|
|
|
|
|
<tr>
|
|
|
|
|
<th>Date Start</th>
|
|
|
|
|
<th>Date End</th>
|
|
|
|
|
<th>Settle Date</th>
|
|
|
|
|
<th>Pay Fee</th>
|
|
|
|
|
<th>Refund Fee</th>
|
|
|
|
|
<th>Net Fee</th>
|
|
|
|
|
<th>Poundage</th>
|
|
|
|
|
<th>Settlement Fee</th>
|
|
|
|
|
<th>Unsettled</th>
|
|
|
|
|
<th style="text-align: center;">Validation</th>
|
|
|
|
|
</tr>
|
|
|
|
|
</thead>
|
|
|
|
|
<tbody>
|
|
|
|
|
<tr ng-repeat="log in apsCashierLogs">
|
|
|
|
|
<td ng-bind="log.start_date.substr(0,10)"></td>
|
|
|
|
|
<td ng-bind="log.end_date.substr(0,10)"></td>
|
|
|
|
|
<td ng-bind="log.settle_date.substr(0,10)"></td>
|
|
|
|
|
<td ng-bind="log.pay_fee"></td>
|
|
|
|
|
<td ng-bind="log.refund_fee"></td>
|
|
|
|
|
<td>{{log.net_fee}}
|
|
|
|
|
<span ng-if="log.sys_net_fee==log.net_fee" style="color: #0BB20C"> (System:{{log.sys_net_fee}})</span>
|
|
|
|
|
<span ng-if="log.sys_net_fee!=log.net_fee" style="color: crimson"> (System:{{log.sys_net_fee}})</span>
|
|
|
|
|
</td>
|
|
|
|
|
<td>{{log.surcharge}}
|
|
|
|
|
<span ng-if="log.sys_surcharge==log.surcharge" style="color: #0BB20C"> (System:{{log.sys_surcharge}})</span>
|
|
|
|
|
<span ng-if="log.sys_surcharge!=log.surcharge" style="color: crimson"> (System:{{log.sys_surcharge}})</span>
|
|
|
|
|
</td>
|
|
|
|
|
<td>{{log.settlement_fee}}
|
|
|
|
|
<span ng-if="log.sys_settlement_fee==log.settlement_fee" style="color: #0BB20C"> (System:{{log.sys_settlement_fee}})</span>
|
|
|
|
|
<span ng-if="log.sys_settlement_fee!=log.settlement_fee" style="color: crimson"> (System:{{log.sys_settlement_fee}})</span>
|
|
|
|
|
</td>
|
|
|
|
|
<td ng-bind="log.unsettle_fee"></td>
|
|
|
|
|
<td ng-if="log.sys_settlement_fee==log.settlement_fee" style="font-size:25px;text-align: center;"><a
|
|
|
|
|
role="button" ng-click="verifySettleLog(log)"><i
|
|
|
|
|
class="fa fa-check-circle text-green" uib-tooltip="校验通过"></i></a></td>
|
|
|
|
|
<td ng-if="log.sys_settlement_fee!=log.settlement_fee" style="font-size:25px;text-align: center;"><a
|
|
|
|
|
role="button" ng-click="verifySettleLog(log)"><i
|
|
|
|
|
class="fa fa-exclamation-circle text-red" uib-tooltip="校验未通过:点击重新验证"></i></a></td>
|
|
|
|
|
</tr>
|
|
|
|
|
</tbody>
|
|
|
|
|
</table>
|
|
|
|
|
<div class="panel-footer">
|
|
|
|
|
<div class="row">
|
|
|
|
|
<uib-pagination ng-if="apsCashierLogs.length"
|
|
|
|
|
class="pagination"
|
|
|
|
|
total-items="apsCashierPagination.totalCount"
|
|
|
|
|
boundary-links="true"
|
|
|
|
|
ng-model="apsCashierPagination.page"
|
|
|
|
|
items-per-page="apsCashierPagination.limit"
|
|
|
|
|
max-size="10"
|
|
|
|
|
ng-change="loadAlipayApsCashierLogs()"
|
|
|
|
|
previous-text="‹"
|
|
|
|
|
next-text="›"
|
|
|
|
|
first-text="«"
|
|
|
|
|
last-text="»"></uib-pagination>
|
|
|
|
|
<div class="col-xs-12">Total Records:{{apsCashierPagination.totalCount}};Total
|
|
|
|
|
Pages:{{apsCashierPagination.totalPages}}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
|
yixian
3 years ago