Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-19 14:27:11 +08:00
parent e728f0346b
commit a5b97bc4ed
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html
View File

@ -65,7 +65,7 @@
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="inputST?.load(1)">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="inputST?.load(1)">查询</button>
<button nz-button (click)="resetInputSF()">重置</button> <button nz-button (click)="resetInputSF()">重置</button>
<button nz-button> 导出</button> <button nz-button (click)="exprot()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -81,11 +81,11 @@
</ng-template> </ng-template>
<ng-template st-row="billId" let-item let-index="index" let-column="column"> <ng-template st-row="billId" let-item let-index="index" let-column="column">
{{item.billCode}}<br> {{item.billCode}}<br>
{{item.billStatus}}<br> {{item.billStatusLabel}}<br>
</ng-template> </ng-template>
<ng-template st-row="wayBillId" let-item let-index="index" let-column="column"> <ng-template st-row="wayBillId" let-item let-index="index" let-column="column">
{{item.wayBillCode}}<br> {{item.wayBillCode}}<br>
{{item.wayBillStatus}}<br> {{item.wayBillStatusLabel}}<br>
</ng-template> </ng-template>
<ng-template st-row="driverId" let-item let-index="index" let-column="column"> <ng-template st-row="driverId" let-item let-index="index" let-column="column">
{{item.driverName}}<br> {{item.driverName}}<br>

21
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -123,6 +123,11 @@ export class WithdrawalsDetailComponent implements OnInit {
history.go(-1); history.go(-1);
} }
// 导出
exprot() {
this.service.exportStart({ ...this.inputSF.value, pageSize: -1 }, this.service.$api_export_refund_detail_page);
}
private initInputSF(): SFSchema { private initInputSF(): SFSchema {
return { return {
properties: { properties: {
@ -220,11 +225,11 @@ export class WithdrawalsDetailComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) }, widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) },
width: 140 width: 140
}, },
{ title: '运费明细', render: 'amountDetails', className: 'text-center', width: 150 }, { title: '运费明细', render: 'amountDetails', className: 'text-right', width: 150 },
{ title: '货主', index: 'ltdName', className: 'text-center', width: 200 }, { title: '货主', index: 'ltdName', className: 'text-left', width: 200 },
{ title: '订单号', render: 'billId', className: 'text-center', width: 150 }, { title: '订单号', render: 'billId', width: 200 },
{ title: '运单号', render: 'wayBillId', className: 'text-center', width: 150 }, { title: '运单号', render: 'wayBillId', width: 200 },
{ title: '货源编号', index: 'resourceCode', className: 'text-center', width: 150 }, { title: '货源编号', index: 'resourceCode', width: 200 },
{ {
title: '服务类型', title: '服务类型',
index: 'serviceType', index: 'serviceType',
@ -233,9 +238,9 @@ export class WithdrawalsDetailComponent implements OnInit {
type: 'enum', type: 'enum',
enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' } enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' }
}, },
{ title: '承运司机', render: 'driverId', className: 'text-center', width: 150 }, { title: '承运司机', render: 'driverId', width: 150 },
{ title: '收款人', render: 'captainName', className: 'text-center', width: 150 }, { title: '收款人', render: 'captainName', className: 'text-left', width: 150 },
{ title: '银行类型', index: 'bankType', className: 'text-center', width: 150 } { title: '银行类型', index: 'bankTypeLabel', className: 'text-center', width: 150 }
]; ];
} }
} }

4
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -55,7 +55,9 @@ export class FreightAccountService extends ShipperBaseService {
// 获取提现申请表详情 // 获取提现申请表详情
$api_get_refund_detail = '/api/fcc/refundApplicationOBC/get'; $api_get_refund_detail = '/api/fcc/refundApplicationOBC/get';
// 获取提现支付详情 // 获取提现支付详情
$api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/payList'; $api_get_refund_detail_page = '/api/fcc/refundApplicationOBC/get/getPayList';
// 提现支付详情导出
$api_export_refund_detail_page = '/api/fcc/refundApplicationOBC/asyncExportPayList';
// 同意提现 // 同意提现
$api_agree_refund = '/api/fcc/refundApplicationOBC/agreeRefund'; $api_agree_refund = '/api/fcc/refundApplicationOBC/agreeRefund';
// 拒绝提现 // 拒绝提现