From b03ed166ed36db1cb9c6fc90c85fb2cd5169c2b0 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 28 Feb 2022 20:59:10 +0800
Subject: [PATCH 1/3] edit

---
 .../freight/freight-config/freight-config.component.ts          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
index bc94a1e2..62f6e819 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
@@ -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;

From f31b8a0d12218b13195f6c752668de8be8e9baa0 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 1 Mar 2022 09:00:00 +0800
Subject: [PATCH 2/3] edit

---
 .../components/freight/list/detail/detail.component.ts          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
index b36f6b4a..de63985a 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
@@ -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 {

From b405f2403e07222922c54704ecfca06b1b272c81 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Tue, 1 Mar 2022 10:51:46 +0800
Subject: [PATCH 3/3] edit

---
 .../components/refund-record/refund-record.component.html     | 4 ++--
 .../components/refund-record/refund-record.component.ts       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.html b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
index 975f2433..a611a196 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.html
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html
@@ -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>
 
diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
index 787616cf..c2a8a6de 100644
--- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
+++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts
@@ -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 },