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

edit

Browse Source
This commit is contained in:
Taric Xin
2021-12-29 19:46:29 +08:00
parent f6f17a410d
commit a99a15e570
20 changed files with 425 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/financial-management/components/payment-record/payment-record.component.html
View File

@ -24,10 +24,10 @@
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="全部" (nzClick)="changePaymentStatus()"></nz-tab>
<nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('3')"></nz-tab>
<nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('1')"></nz-tab>
<nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('4')"></nz-tab>
<nz-tab nzTitle="全部" (nzClick)="changePaymentStatus()"></nz-tab>
<nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('4')"></nz-tab>
<nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('2')"></nz-tab>
<nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('5')"></nz-tab>
</nz-tabset>
<st #st [data]="service.$api_get_order_payment_page" [columns]="columns"
@ -36,16 +36,16 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
<ng-template st-row="orderPaymentCode" let-item let-index="index" let-column="column">
{{ item.orderPaymentCode }} <br> <a>{{ paymentStatusEm[item.paymentStatus] }}</a>
{{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
</ng-template>
<ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
预付:￥{{ item.price }}<br />附加费:￥ {{ item.surcharge }}
</ng-template>
<ng-template st-row="billCode" let-item let-index="index" let-column="column">
{{ item.billCode }} <br> {{billStatus[item.billStatus] }}
{{ item.billCode }} <br> {{item.billStatusLabel }}
</ng-template>
<ng-template st-row="wayBillCode" let-item let-index="index" let-column="column">
{{ item.wayBillCode }} <br> {{wayBillStatus[item.wayBillStatus ] }}
{{ item.wayBillCode }} <br> {{item.wayBillStatusLabel }}
</ng-template>
<ng-template st-row="driverId" let-item let-index="index" let-column="column">
{{ item.driverName }} <br> {{ item.driverTelephone }} <br> {{ item.driverLicensePlate }}

48
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -23,30 +23,6 @@ export class PaymentRecordComponent implements OnInit {
paymentStatus: any = '';
paymentStatusEm: any = {
0: '待支付',
1: '已支付',
2: '已拒绝',
3: '支付中',
4: '支付失败'
};
billStatus: any = {
1: '待接单',
2: '待发车',
3: '运输中',
4: '待签收',
5: '已完成',
6: '已取消'
};
wayBillStatus: any = {
1: '待接单',
2: '待发车',
3: '运输中',
4: '待签收',
5: '已完成',
6: '已取消'
};
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
@ -56,14 +32,14 @@ export class PaymentRecordComponent implements OnInit {
Object.assign(requestOptions.body, {
...this.sf.value,
applyDate: {
start: this.sf.value.applyDate?.[0] || null,
end: this.sf.value.applyDate?.[1] || null
start: this.sf.value.applyDate?.[0] || '',
end: this.sf.value.applyDate?.[1] || ''
},
handlerDate: {
start: this.sf.value.handlerDate?.[0] || null,
end: this.sf.value.handlerDate?.[1] || null
start: this.sf.value.handlerDate?.[0] || '',
end: this.sf.value.handlerDate?.[1] || ''
},
paymentStatus: this.paymentStatus || ''
paymentStatus: this.paymentStatus || null
});
}
return requestOptions;
@ -243,7 +219,7 @@ export class PaymentRecordComponent implements OnInit {
},
default: ''
},
ltdid: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -280,10 +256,8 @@ export class PaymentRecordComponent implements OnInit {
},
{
title: '支付类型',
index: 'payType',
width: 130,
type: 'enum',
enum: { 1: '货主支付平台', 2: '平台支付司机', 3: '司机支付车队长' }
index: 'payTypeLabel',
width: 130
},
{ title: '货主', index: 'enterpriseInfoName', width: 100 },
{ title: '订单号', render: 'billCode', width: 120 },
@ -291,10 +265,8 @@ export class PaymentRecordComponent implements OnInit {
{ title: '货源编号', index: 'resourceCode', width: 120 },
{
title: '服务类型',
index: 'serviceType',
width: 150,
type: 'enum',
enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' }
index: 'serviceTypeLabel',
width: 150
},
{ title: '承运司机', render: 'driverId', width: 120 },
{ title: '收款人', render: 'captainName', width: 120 },