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

This commit is contained in:
Taric Xin
2022-01-14 15:53:41 +08:00
26 changed files with 395 additions and 146 deletions

View File

@ -115,6 +115,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
if (res?.id) {
this.licenseDetail = res;
console.log(res)
this.tempalateLicenseDetail = { ...this.licenseDetail };
}
});

View File

@ -296,11 +296,11 @@ export class UserCenterComponentsDriverComponent implements OnInit {
{ title: '注册时间', className: 'text-center', index: 'createTime' },
{
title: '操作',
width: '170px',
width: '110px',
className: 'text-center',
buttons: [
{
text: '查看',
text: '查看  ',
click: item => {
this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
@ -311,7 +311,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
click: item => this.settingAction(item)
},
{
text: '资金账户',
text: '资金账户 ',
click: item => this.showAccountDetail(item)
}
]

View File

@ -68,6 +68,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
Number(this.detailData.fullRegionVO?.cityCode),
Number(this.detailData.fullRegionVO?.areaCode)
];
console.log(this.enterpriseAddressCode)
}
console.log(res);
});

View File

@ -202,11 +202,11 @@ export class FreightComponentsListComponent implements OnInit {
},
{
title: '操作',
width: '170px',
width: '110px',
className: 'text-center',
buttons: [
{
text: '查看',
text: '查看  ',
click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
@ -217,7 +217,7 @@ export class FreightComponentsListComponent implements OnInit {
click: item => this.settingAction(item)
},
{
text: '资金账户',
text: '资金账户 ',
click: item => this.showAccountDetail(item)
}
]