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-01-25 15:59:01 +08:00
parent 36757adc20
commit f2779a13d6
15 changed files with 235 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -182,10 +182,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '100px',
className: 'text-left',
className: 'text-center',
buttons: [
{
text: '查看',
acl: { ability: ['VEHICLE-AUDIT-view'] },
click: (item) => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar,queryParams: { carId: item.carId } });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });

6
src/app/routes/vehicle/components/audit/detail/detail.component.html
View File

@ -17,9 +17,9 @@
<span *ngIf="detailData?.approvalStatus === 40 || detailData?.approvalStatus === '40'">证件过期</span>
<div style="float: right;" *ngIf="detailData?.approvalStatus === 10 || detailData?.approvalStatus === '10'">
<ng-container *ngIf="!isEdit ">
<button nz-button nzType="default" nzDanger (click)="approveDriver()">通过</button>
<button nz-button nzType="default" nzDanger (click)="rejectedDriver()">驳回</button>
<button nz-button nzType="default" nzDanger (click)="ratify()">修改</button>
<button nz-button nzType="default" nzDanger (click)="approveDriver()" acl acl-ability="VEHICLE-AUDIT-DETAIL-pass">通过</button>
<button nz-button nzType="default" nzDanger (click)="rejectedDriver()" acl acl-ability="VEHICLE-AUDIT-DETAIL-reject">驳回</button>
<button nz-button nzType="default" nzDanger (click)="ratify()" acl acl-ability="VEHICLE-AUDIT-DETAIL-save">修改</button>
</ng-container>
<ng-container *ngIf="isEdit">
<button nz-button nzType="default" (click)="reset()">取消</button>

2
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -11,7 +11,7 @@
<sv-title style="font-weight: 700;">
<div style="float: right;">
<ng-container *ngIf="!isEdit">
<button nz-button nzType="default" nzDanger (click)="ratify()">修改</button>
<button nz-button nzType="default" nzDanger (click)="ratify()" acl acl-ability="VEHICLE-LIST-DETAIL-save">修改</button>
</ng-container>
<ng-container *ngIf="isEdit">
<button nz-button nzType="default" (click)="reset()">取消</button>

2
src/app/routes/vehicle/components/list/list.component.html
View File

@ -18,7 +18,7 @@
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportFire()" acl
[acl-ability]="'YUNLI-CART-DAOCHU'">导出</button>
[acl-ability]="'VEHICLE-LIST-view'">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}

5
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -245,12 +245,13 @@ export class VehicleComponentsListComponent implements OnInit {
title: '操作',
fixed: 'right',
width: '100px',
className: 'text-left',
className: 'text-center',
buttons: [
{
text: '查看',
acl: { ability: ['VEHICLE-LIST-view'] },
click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } });
this.router.navigate(['/vehicle/list/detail/' + item.id], { queryParams: { carId: item.carId } });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}
}

27
src/app/routes/vehicle/vehicle-routing.module.ts
View File

@ -16,29 +16,10 @@ import { VehicleComponentsListDetailComponent } from './components/list/detail/d
import { VehicleComponentsListComponent } from './components/list/list.component';
const routes: Routes = [
{
path: '',
canActivate: [AuthGuard],
canActivateChild: [AuthGuard],
children: [
{
path: 'list',
component: VehicleComponentsListComponent,
data: { guard: { ability: ['YUNLI-CART-SEARCH'] } as ACLGuardType }
},
{
path: 'list/detail/:id',
component: VehicleComponentsListDetailComponent,
data: { guard: { ability: ['YUNLI-CART-DETAIL'] } as ACLGuardType }
},
{
path: 'audit',
component: VehicleComponentsAuditComponent,
data: { guard: { ability: ['YUNLI-CART--AUDIT-SEARCH1'] } as ACLGuardType }
},
{ path: 'audit/detail/:id', component: VehicleComponentsAuditDetailComponent }
]
}
{ path: 'list', component: VehicleComponentsListComponent },
{ path: 'list/detail/:id', component: VehicleComponentsListDetailComponent },
{ path: 'audit', component: VehicleComponentsAuditComponent },
{ path: 'audit/detail/:id', component: VehicleComponentsAuditDetailComponent }
];
@NgModule({