|
|
|
@ -57,6 +57,24 @@ |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div *ngIf="accountType == 1 || accountType == 4 || accountType == 5" nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>渠道</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-select formControlName="channelType" nzAllowClear [nzPlaceHolder]="'请选择'"> |
|
|
|
|
<nz-option *ngFor="let item of channelTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option> |
|
|
|
|
</nz-select> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div *ngIf="accountType == 1 || accountType == 4 || accountType == 5" nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>渠道单号</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<input nz-input formControlName="channelOrderNo" placeholder="请输入" /> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div *ngIf="accountType == 1 || accountType == 2 || accountType == 3" nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>客户电话</nz-form-label> |
|
|
|
@ -126,7 +144,7 @@ |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<nz-table #basicTable |
|
|
|
|
[nzScroll]="{ x: '4500px'}" |
|
|
|
|
[nzScroll]="{ x: '5000px'}" |
|
|
|
|
[nzBordered]="true" |
|
|
|
|
[nzFrontPagination]="false" |
|
|
|
|
[nzShowQuickJumper]="true" |
|
|
|
@ -140,6 +158,8 @@ |
|
|
|
|
<th *ngIf="accountType == 1" rowspan="2" nzWidth="100px">代理商</th> |
|
|
|
|
<th *ngIf="accountType == 1 || accountType == 4" rowspan="2" nzWidth="100px">业务员</th> |
|
|
|
|
<th rowspan="2" nzWidth="200px">交易单号</th> |
|
|
|
|
<th *ngIf="accountType == 1 || accountType == 4 || accountType == 5" rowspan="2" nzWidth="150px">渠道</th> |
|
|
|
|
<th *ngIf="accountType == 1 || accountType == 4 || accountType == 5" rowspan="2" nzWidth="250px">渠道单号</th> |
|
|
|
|
<th *ngIf="accountType == 1 || accountType == 2 || accountType == 3" rowspan="2" nzWidth="120px">客户电话</th> |
|
|
|
|
<th *ngIf="accountType == 1 || accountType == 4 || accountType == 5" rowspan="2" nzWidth="200px">加油站</th> |
|
|
|
|
<th *ngIf="accountType == 1 || accountType == 2" rowspan="2" nzWidth="120px">加油员</th> |
|
|
|
@ -172,10 +192,13 @@ |
|
|
|
|
</tr> |
|
|
|
|
</thead> |
|
|
|
|
<tbody> |
|
|
|
|
<tr *ngFor="let data of basicTable.data;let i = index"> |
|
|
|
|
<tr *ngFor="let data of basicTable.data;let i = index" [style]="{ color: data.color}"> |
|
|
|
|
<!--<span nz-tooltip nzTooltipTitle="prompt text">Tooltip will show when mouse enter.</span>--> |
|
|
|
|
<td *ngIf="accountType == 1">{{data.agentName?data.agentName:'无'}}</td> |
|
|
|
|
<td *ngIf="accountType == 1 || accountType == 4">{{data.agentStaffName?data.agentStaffName:'无'}}</td> |
|
|
|
|
<td>{{data.orderNo}}</td> |
|
|
|
|
<td *ngIf="accountType == 1 || accountType == 4 || accountType == 5">{{data.channelType | dictionary: 'MER_SOURCE_TYPE'}}</td> |
|
|
|
|
<td *ngIf="accountType == 1 || accountType == 4 || accountType == 5">{{data.channelOrderNo!=null?data.channelOrderNo:'无'}}</td> |
|
|
|
|
<td *ngIf="accountType == 1 || accountType == 2 || accountType == 3">{{data.userPhone!=null?data.userPhone:'无'}}</td> |
|
|
|
|
<td *ngIf="accountType == 1 || accountType == 4 || accountType == 5">{{data.merName}}</td> |
|
|
|
|
<td *ngIf="accountType == 1 || accountType == 2">{{data.gasStaffName?data.gasStaffName:'未知'}}</td> |
|
|
|
@ -192,7 +215,7 @@ |
|
|
|
|
<td>{{data.deductionOilPrice}}元</td> |
|
|
|
|
<td>{{data.payablePrice}}元</td> |
|
|
|
|
<td>{{data.payIntegral / 100}}元</td> |
|
|
|
|
<td>{{data.actualPayPrice!=null?data.payPrice+'元':'未支付'}}</td> |
|
|
|
|
<td>{{data.actualPayPrice!=null?data.actualPayPrice+'元':'未支付'}}</td> |
|
|
|
|
<td>{{data.payType | dictionary: 'ORDER_PAY_TYPE'}}</td> |
|
|
|
|
<td>{{data.paySerialNo}}</td> |
|
|
|
|
<td>{{data.status | dictionary: 'GAS_ORDER_STATUS'}}</td> |
|
|
|
@ -206,7 +229,7 @@ |
|
|
|
|
<ul nz-menu nzSelectable> |
|
|
|
|
<li nz-menu-item (click)="showOrderDetail(data.orderNo)">交易详情</li> |
|
|
|
|
<li *ngIf="data.status == 2 && GAS_REFUND_BTN" (click)="showRefund(data.orderNo, data.orderChildNo)" nz-menu-item>交易退款</li> |
|
|
|
|
<li *ngIf="data.status == 2 && GAS_ORDER_PRINT_BTN" (click)="showOrderPrint(data.orderNo);" nz-menu-item>打印小票</li> |
|
|
|
|
<li *ngIf="data.channelType == 1 && data.status == 2 && GAS_ORDER_PRINT_BTN" (click)="showOrderPrint(data.orderNo);" nz-menu-item>打印小票</li> |
|
|
|
|
</ul> |
|
|
|
|
</nz-dropdown-menu> |
|
|
|
|
</td> |
|
|
|
@ -224,6 +247,8 @@ |
|
|
|
|
<nz-tab nzTitle="加油详情"> |
|
|
|
|
<nz-descriptions nzBordered [nzColumn]="2" [nzSize]="'middle'"> |
|
|
|
|
<nz-descriptions-item nzSpan="2" nzTitle="加油站">{{orderDetailObject.gasOrder.merName}}</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item *ngIf="accountType == 1 || accountType == 4 || accountType == 5" nzTitle="渠道">{{orderDetailObject.gasOrder.channelType | dictionary: 'MER_SOURCE_TYPE'}}</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item *ngIf="accountType == 1 || accountType == 4 || accountType == 5" nzTitle="渠道单号">{{orderDetailObject.gasOrder.channelOrderNo?orderDetailObject.gasOrder.channelOrderNo:'无'}}</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="加油单号">{{orderDetailObject.tradeOrder.orderNo}}</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="交易状态">{{orderDetailObject.tradeOrder.orderStatus| dictionary: 'GAS_ORDER_STATUS' }}</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="支付方式">{{orderDetailObject.tradeOrder.payType | dictionary: 'ORDER_PAY_TYPE'}}</nz-descriptions-item> |
|
|
|
@ -254,6 +279,8 @@ |
|
|
|
|
<nz-descriptions-item *ngIf="accountType == 1 || accountType == 4" nzTitle="业务员"> |
|
|
|
|
{{orderDetailObject.gasOrder.agentStaffName?orderDetailObject.gasOrder.agentStaffName:'无'}} |
|
|
|
|
</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzSpan="1" *ngIf="orderDetailObject.gasOrder.abnormal == 1" nzTitle="异常状态"> <nz-badge nzStatus="error" nzText="交易异常"></nz-badge></nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzSpan="1" *ngIf="orderDetailObject.gasOrder.abnormal == 1" nzTitle="异常原因">{{orderDetailObject.gasOrder.abnormalContent}}</nz-descriptions-item> |
|
|
|
|
</nz-descriptions> |
|
|
|
|
</nz-tab> |
|
|
|
|
<nz-tab nzTitle="交易时间"> |
|
|
|
@ -284,7 +311,7 @@ |
|
|
|
|
</nz-form-item> |
|
|
|
|
|
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>退款备注</nz-form-label> |
|
|
|
|
<nz-form-label nzRequired>退款备注</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<textarea rows="4" nz-input formControlName="remarks" maxlength="100"></textarea> |
|
|
|
|
</nz-form-control> |
|
|
|
|