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-03-03 11:25:03 +08:00
parent c66e1ae3a9
commit d840353041
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,7 @@
{{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a> {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
</ng-template> </ng-template>
<ng-template st-row="amountDetails" let-item let-index="index" let-column="column"> <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'"> <ng-container *ngIf="item.payType==='1'">
附加费: {{ item.surcharge| currency }} 附加费: {{ item.surcharge| currency }}
</ng-container> </ng-container>

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

@ -258,6 +258,7 @@ export class PaymentRecordComponent implements OnInit {
}); });
item.surcharge = surcharge.toFixed(2); item.surcharge = surcharge.toFixed(2);
item.price = item.amountDetails?.[0]?.price || 0; item.price = item.amountDetails?.[0]?.price || 0;
item.costName = item.amountDetails?.[0]?.costName;
return ''; return '';
} }
}, },

4
src/app/routes/usercenter/usercenter-routing.module.ts
View File

@ -14,19 +14,17 @@ import { UserCenterComponentsDriverDetailComponent } from './components/driver/d
import { UserCenterComponentsDriverConfigComponent } from './components/driver/driver-config/driver-config.component'; import { UserCenterComponentsDriverConfigComponent } from './components/driver/driver-config/driver-config.component';
import { UserCenterComponentsDriverComponent } from './components/driver/driver.component'; import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.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 { FreightConfigComponent } from './components/freight/freight-config/freight-config.component';
import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component'; import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component';
import { FreightComponentsListComponent } from './components/freight/list/list.component'; import { FreightComponentsListComponent } from './components/freight/list/list.component';
import { FreightComponentsListNewComponent } from './components/freight/list/new/new.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 { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
import { FreightComponentsUserComponent } from './components/freight/user/user.component'; import { FreightComponentsUserComponent } from './components/freight/user/user.component';
const routes: Routes = [ const routes: Routes = [
{ path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } }, { 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/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } },
{ {
path: 'freight/list/detail/:id', path: 'freight/list/detail/:id',

6
src/app/routes/usercenter/usercenter.module.ts
View File

@ -12,11 +12,9 @@ import { UserCenterComponentsDriverCaptainComponent } from './components/driver/
import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component'; import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component';
import { UserCenterComponentsDriverComponent } from './components/driver/driver.component'; import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.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 { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component';
import { FreightComponentsListComponent } from './components/freight/list/list.component'; import { FreightComponentsListComponent } from './components/freight/list/list.component';
import { FreightComponentsListNewComponent } from './components/freight/list/new/new.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 { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
import { FreightComponentsUserComponent } from './components/freight/user/user.component'; import { FreightComponentsUserComponent } from './components/freight/user/user.component';
import { UsercenterRoutingModule } from './usercenter-routing.module'; import { UsercenterRoutingModule } from './usercenter-routing.module';
@ -29,11 +27,11 @@ import { UserCenterComponentsDriverConfigComponent } from './components/driver/d
const COMPONENTS = [ const COMPONENTS = [
FreightComponentsListComponent, FreightComponentsListComponent,
FreightComponentsListViewComponent, // FreightComponentsListViewComponent,
FreightComponentsListNewComponent, FreightComponentsListNewComponent,
FreightComponentsListDetailComponent, FreightComponentsListDetailComponent,
FreightComponentsEnterpriseAuditComponent, FreightComponentsEnterpriseAuditComponent,
FreightComponentsEnterpriseAuditViewComponent, // FreightComponentsEnterpriseAuditViewComponent,
FreightComponentsUserComponent, FreightComponentsUserComponent,
FreightComponentsUserDetailComponent, FreightComponentsUserDetailComponent,
UserCenterComponentsDriverComponent, UserCenterComponentsDriverComponent,