From d840353041b9adcf936bc44f0d284aaf2ce39898 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 3 Mar 2022 11:25:03 +0800
Subject: [PATCH] edit

---
 .../components/payment-record/payment-record.component.html | 2 +-
 .../components/payment-record/payment-record.component.ts   | 1 +
 src/app/routes/usercenter/usercenter-routing.module.ts      | 4 +---
 src/app/routes/usercenter/usercenter.module.ts              | 6 ++----
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
index 38aa1e2f..5d57d415 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
@@ -36,7 +36,7 @@
             {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
         </ng-template>
         <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
-            预付:{{ item.price | currency }}<br />
+           {{item.costName}}:{{ item.price | currency }}<br />
             <ng-container *ngIf="item.payType==='1'">
                 附加费: {{ item.surcharge| currency }}
             </ng-container>
diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
index a6383c75..39524123 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts
@@ -258,6 +258,7 @@ export class PaymentRecordComponent implements OnInit {
           });
           item.surcharge = surcharge.toFixed(2);
           item.price = item.amountDetails?.[0]?.price || 0;
+          item.costName = item.amountDetails?.[0]?.costName;
           return '';
         }
       },
diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts
index 3f11ed47..9754d2e4 100644
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@@ -14,19 +14,17 @@ import { UserCenterComponentsDriverDetailComponent } from './components/driver/d
 import { UserCenterComponentsDriverConfigComponent } from './components/driver/driver-config/driver-config.component';
 import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
 import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component';
-import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component';
 import { FreightConfigComponent } from './components/freight/freight-config/freight-config.component';
 import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component';
 
 import { FreightComponentsListComponent } from './components/freight/list/list.component';
 import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component';
-import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component';
 import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
 import { FreightComponentsUserComponent } from './components/freight/user/user.component';
 
 const routes: Routes = [
   { path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } },
-  { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
+  // { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
   { path: 'freight/list/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } },
   {
     path: 'freight/list/detail/:id',
diff --git a/src/app/routes/usercenter/usercenter.module.ts b/src/app/routes/usercenter/usercenter.module.ts
index 3a0ea35c..1cc35d5b 100644
--- a/src/app/routes/usercenter/usercenter.module.ts
+++ b/src/app/routes/usercenter/usercenter.module.ts
@@ -12,11 +12,9 @@ import { UserCenterComponentsDriverCaptainComponent } from './components/driver/
 import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component';
 import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
 import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component';
-import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component';
 import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component';
 import { FreightComponentsListComponent } from './components/freight/list/list.component';
 import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component';
-import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component';
 import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
 import { FreightComponentsUserComponent } from './components/freight/user/user.component';
 import { UsercenterRoutingModule } from './usercenter-routing.module';
@@ -29,11 +27,11 @@ import { UserCenterComponentsDriverConfigComponent } from './components/driver/d
 
 const COMPONENTS = [
   FreightComponentsListComponent,
-  FreightComponentsListViewComponent,
+  // FreightComponentsListViewComponent,
   FreightComponentsListNewComponent,
   FreightComponentsListDetailComponent,
   FreightComponentsEnterpriseAuditComponent,
-  FreightComponentsEnterpriseAuditViewComponent,
+  // FreightComponentsEnterpriseAuditViewComponent,
   FreightComponentsUserComponent,
   FreightComponentsUserDetailComponent,
   UserCenterComponentsDriverComponent,