|
|
@ -2,7 +2,7 @@ |
|
|
|
<app-breadcrumb></app-breadcrumb> |
|
|
|
<app-breadcrumb></app-breadcrumb> |
|
|
|
<!-- end 面包屑 --> |
|
|
|
<!-- end 面包屑 --> |
|
|
|
<!--条件搜索--> |
|
|
|
<!--条件搜索--> |
|
|
|
<nz-spin [nzSpinning]="loading" nzTip="处理中..."> |
|
|
|
<nz-spin [nzSpinning]="loadingObject.spinning" nzTip="{{loadingObject.msg}}"> |
|
|
|
<div class="inner-content"> |
|
|
|
<div class="inner-content"> |
|
|
|
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)"> |
|
|
|
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)"> |
|
|
|
<div nz-row> |
|
|
|
<div nz-row> |
|
|
@ -94,10 +94,8 @@ |
|
|
|
<div class="inner-content"> |
|
|
|
<div class="inner-content"> |
|
|
|
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span> |
|
|
|
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span> |
|
|
|
<div class="operating-button"> |
|
|
|
<div class="operating-button"> |
|
|
|
<!-- <button nz-button nzType="primary" class="right-btn" [routerLink]="'/admin/agent/add'"><i nz-icon nzType="plus" nzTheme="outline"></i>添加</button> |
|
|
|
<button nz-button nzType="primary" class="right-btn" (click)="exportTradeOrder()" >导出交易</button> |
|
|
|
--> |
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
<!--数组表格 --> |
|
|
|
<!--数组表格 --> |
|
|
|
<nz-table #basicTable |
|
|
|
<nz-table #basicTable |
|
|
|
[nzData]="dataObject.list" |
|
|
|
[nzData]="dataObject.list" |
|
|
@ -111,19 +109,18 @@ |
|
|
|
<tr> |
|
|
|
<tr> |
|
|
|
<th nzWidth="100px">序号</th> |
|
|
|
<th nzWidth="100px">序号</th> |
|
|
|
<th nzWidth="150px">商户名称</th> |
|
|
|
<th nzWidth="150px">商户名称</th> |
|
|
|
<th nzWidth="160px">平台商户号</th> |
|
|
|
|
|
|
|
<th nzWidth="150px">门店名称</th> |
|
|
|
<th nzWidth="150px">门店名称</th> |
|
|
|
<th nzWidth="200px">设备编号SN</th> |
|
|
|
<th nzWidth="270px">商户订单号</th> |
|
|
|
<th nzWidth="250px">商户订单号</th> |
|
|
|
<th nzWidth="100px">支付方式</th> |
|
|
|
<th nzWidth="100px">支付模式</th> |
|
|
|
|
|
|
|
<th nzWidth="100px">平台类型</th> |
|
|
|
|
|
|
|
<th nzWidth="100px">交易金额</th> |
|
|
|
<th nzWidth="100px">交易金额</th> |
|
|
|
|
|
|
|
<th nzWidth="100px">门店优惠</th> |
|
|
|
|
|
|
|
<th nzWidth="130px">优惠券优惠</th> |
|
|
|
<th nzWidth="100px">实付金额</th> |
|
|
|
<th nzWidth="100px">实付金额</th> |
|
|
|
<th nzWidth="100px">业务员</th> |
|
|
|
|
|
|
|
<th nzWidth="100px">状态</th> |
|
|
|
<th nzWidth="100px">状态</th> |
|
|
|
<th nzWidth="160px">创建时间</th> |
|
|
|
<th nzWidth="160px">创建时间</th> |
|
|
|
<th nzWidth="160px">支付时间</th> |
|
|
|
<th nzWidth="160px">支付时间</th> |
|
|
|
<th nzWidth="160px">取消时间</th> |
|
|
|
<th nzWidth="160px">入账商户号</th> |
|
|
|
|
|
|
|
<th nzWidth="100px">业务员</th> |
|
|
|
<th nzWidth="150px" nzRight="0px">操作</th> |
|
|
|
<th nzWidth="150px" nzRight="0px">操作</th> |
|
|
|
</tr> |
|
|
|
</tr> |
|
|
|
</thead> |
|
|
|
</thead> |
|
|
@ -131,19 +128,18 @@ |
|
|
|
<tr *ngFor="let data of basicTable.data;let i = index"> |
|
|
|
<tr *ngFor="let data of basicTable.data;let i = index"> |
|
|
|
<td>{{i + 1}}</td> |
|
|
|
<td>{{i + 1}}</td> |
|
|
|
<td>{{data.merName}}</td> |
|
|
|
<td>{{data.merName}}</td> |
|
|
|
<td>{{data.platformMerNo}}</td> |
|
|
|
|
|
|
|
<td>{{data.storeName}}</td> |
|
|
|
<td>{{data.storeName}}</td> |
|
|
|
<td>{{data.deviceSn}}</td> |
|
|
|
|
|
|
|
<td>{{data.outTradeNo}}</td> |
|
|
|
<td>{{data.outTradeNo}}</td> |
|
|
|
<td>{{data.payMode | payMode}}</td> |
|
|
|
<td>{{data.payMode | payMode}}</td> |
|
|
|
<td>{{data.platformType | platformType}}</td> |
|
|
|
|
|
|
|
<td>¥{{data.tradeAmount}}</td> |
|
|
|
<td>¥{{data.tradeAmount}}</td> |
|
|
|
<td>{{data.tradeActualAmount?'¥'+data.tradeActualAmount:'¥0'}}</td> |
|
|
|
<td>¥{{data.storeDiscountActualPrice?data.storeDiscountActualPrice:0}}</td> |
|
|
|
<td>{{data.salesmanName}}</td> |
|
|
|
<td>¥{{data.userDiscountActualPrice?data.userDiscountActualPrice:0}}</td> |
|
|
|
|
|
|
|
<td>¥{{data.tradeActualAmount?data.tradeActualAmount:0}}</td> |
|
|
|
<td>{{data.status | tradeOrderStatus}}</td> |
|
|
|
<td>{{data.status | tradeOrderStatus}}</td> |
|
|
|
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
|
|
|
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
|
|
|
<td>{{data.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
|
|
|
<td>{{data.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
|
|
|
<td>{{data.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
|
|
|
<td>{{data.platformMerNo}}</td> |
|
|
|
|
|
|
|
<td>{{data.salesmanName}}</td> |
|
|
|
<td nzRight="0px" class="table-td-operation"> |
|
|
|
<td nzRight="0px" class="table-td-operation"> |
|
|
|
<a [routerLink]="['/admin/trade-order/trade-order-detail']" [queryParams]="{outTradeNo: data.outTradeNo}">详情</a> |
|
|
|
<a [routerLink]="['/admin/trade-order/trade-order-detail']" [queryParams]="{outTradeNo: data.outTradeNo}">详情</a> |
|
|
|
<a nz-dropdown [nzDropdownMenu]="menu">其他操作 <i nz-icon nzType="down"></i> </a> |
|
|
|
<a nz-dropdown [nzDropdownMenu]="menu">其他操作 <i nz-icon nzType="down"></i> </a> |
|
|
|