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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-03-01 13:28:00 +08:00
parent bbd4daa4f6 b405f2403e
commit d974a06c10
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/refund-record/refund-record.component.html
View File

@ -25,8 +25,8 @@
<nz-tabset>
<nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
<nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
<nz-tab nzTitle="退款中" (nzClick)="changeRefundStatus('2')"></nz-tab>
<nz-tab nzTitle="退款成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
<nz-tab nzTitle="退款中" (nzClick)="changeRefundStatus('4')"></nz-tab>
<nz-tab nzTitle="退款成功" (nzClick)="changeRefundStatus('2')"></nz-tab>
<nz-tab nzTitle="退款失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
</nz-tabset>

2
src/app/routes/financial-management/components/refund-record/refund-record.component.ts
View File

@ -253,7 +253,7 @@ export class RefundRecordComponent implements OnInit {
{ title: '退款类型', index: 'refundTypeLabel', width: 140 },
{ title: '退款金额', render: 'refundAmount', className: 'text-right', width: 180 },
{ title: '退款时间', index: 'refundExecuteTime', width: 170 },
{ title: '货主', index: 'shipperId', width: 150 },
{ title: '企业名称', index: 'shipperId', width: 150 },
{ title: '所属项目', index: 'enterpriseProjectName', width: 140 },
{ title: '支付单', render: 'billRefundPaymentVOS', width: 150 },
{ title: '订单号', index: 'billCode', width: 150 },

2
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -158,6 +158,8 @@ export class FreightConfigComponent implements OnInit {
modal.destroy();
} else {
this.service.msgSrv.error(`企业${res?.join(',')}修改失败`);
modal.destroy();
this.st.load();
}
});
return false;

2
src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
View File

@ -326,6 +326,8 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
this.service.request(this.service.$api_get_next_audit_freight, { id: this.route.snapshot.params.id }).subscribe(res => {
if (res?.id) {
this.router.navigate(['/usercenter/freight/enterprise/detail/' + res.id]);
} else {
this.initData();
}
});
} else {