Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-08 16:54:58 +08:00
parent b0c9165b66
commit 0a4591acc3
2 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,7 +10,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service';
import { CarSettleCarauthComponent } from '../list/carauth/carauth.component'; import { CarSettleCarauthComponent } from '../list/carauth/carauth.component';
@Component({ @Component({
selector: 'app-Vehicle-components-audit', selector: 'app-Vehicle-components-audit',
templateUrl: './audit.component.html', templateUrl: './audit.component.html'
}) })
export class VehicleComponentsAuditComponent implements OnInit { export class VehicleComponentsAuditComponent implements OnInit {
_$expand = false; _$expand = false;
@ -22,7 +22,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute, private modalHelper: ModalHelper) { } constructor(
public service: VehicleService,
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
private modalHelper: ModalHelper
) {}
/** /**
* 查询字段个数navigate * 查询字段个数navigate
*/ */
@ -36,26 +42,26 @@ export class VehicleComponentsAuditComponent implements OnInit {
get reqParams() { get reqParams() {
const a: any = {}; const a: any = {};
if (this.resourceStatus === 1) { if (this.resourceStatus === 1) {
a.approvalStatus = 10 a.approvalStatus = 10;
} else if (this.resourceStatus === 2) { } else if (this.resourceStatus === 2) {
a.approvalStatus = 20 a.approvalStatus = 20;
} else if (this.resourceStatus === 3) { } else if (this.resourceStatus === 3) {
a.approvalStatus = 30 a.approvalStatus = 30;
} }
return { return {
...a, ...a,
...this.sf?.value, ...this.sf?.value
}; };
} }
get selectedRows() { get selectedRows() {
return this.st?.list.filter((item) => item.checked) || []; return this.st?.list.filter(item => item.checked) || [];
} }
ngOnInit() { ngOnInit() {
this.initSF(); this.initSF();
this.initST(); this.initST();
this.ar.url.subscribe((params) => { this.ar.url.subscribe(params => {
this.st?.load(1); this.st?.load(1);
}); });
} }
@ -71,8 +77,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
expand: { expand: {
type: 'boolean', type: 'boolean',
ui: { ui: {
hidden: true, hidden: true
}, }
}, },
carNo: { carNo: {
title: '车牌号', title: '车牌号',
@ -106,7 +112,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'car:color' }, params: { dictKey: 'car:color' },
containsAllLabel: true, containsAllLabel: true
} }
}, },
isSelf: { isSelf: {
@ -114,11 +120,11 @@ export class VehicleComponentsAuditComponent implements OnInit {
title: '是否挂靠', title: '是否挂靠',
enum: [ enum: [
{ label: '是', value: 1 }, { label: '是', value: 1 },
{ label: '否', value: 0 }, { label: '否', value: 0 }
], ],
ui: { ui: {
widget: 'select', widget: 'select',
allowClear: true, allowClear: true
} }
}, },
saveUser: { saveUser: {
@ -126,10 +132,10 @@ export class VehicleComponentsAuditComponent implements OnInit {
title: '录入人员', title: '录入人员',
ui: { ui: {
visibleIf: { visibleIf: {
expand: (value: boolean) => value, expand: (value: boolean) => value
}, }
}, }
}, }
// approvalStatus: { // approvalStatus: {
// type: 'string', // type: 'string',
// title: '审核状态', // title: '审核状态',
@ -149,7 +155,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
// }, // },
// }, // },
// }, // },
}, }
}; };
this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
} }
@ -162,7 +168,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
{ title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' }, { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
{ title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' }, { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
{ title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },
{ title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser', }, { title: '录入人员', width: '180px', className: 'text-center', index: 'saveUser' },
{ {
title: '审核状态', title: '审核状态',
className: 'text-center', className: 'text-center',
@ -176,8 +182,8 @@ export class VehicleComponentsAuditComponent implements OnInit {
10: { text: '待审核', color: 'warning' }, 10: { text: '待审核', color: 'warning' },
20: { text: '已审核', color: 'success' }, 20: { text: '已审核', color: 'success' },
30: { text: '已驳回', color: 'error' }, 30: { text: '已驳回', color: 'error' },
40: { text: '证件过期', color: 'error' }, 40: { text: '证件过期', color: 'error' }
}, }
}, },
{ title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' }, { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
{ {
@ -189,13 +195,13 @@ export class VehicleComponentsAuditComponent implements OnInit {
{ {
text: '查看', text: '查看',
acl: { ability: ['VEHICLE-AUDIT-view'] }, acl: { ability: ['VEHICLE-AUDIT-view'] },
click: (item) => { click: item => {
this.router.navigate(['./detail', item.id], { relativeTo: this.ar, queryParams: { carId: item.carId } }); 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 } }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
}, }
}, }
], ]
}, }
]; ];
} }
selectChange(e: number) { selectChange(e: number) {
@ -213,7 +219,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
this.sf?.setValue('/expand', this._$expand); this.sf?.setValue('/expand', this._$expand);
} }
creat() { creat() {
this.router.navigate(['./new',], { relativeTo: this.ar }); this.router.navigate(['./new'], { relativeTo: this.ar });
} }
/** /**
* 重置表单 * 重置表单
@ -224,19 +230,16 @@ export class VehicleComponentsAuditComponent implements OnInit {
} }
// 导出 // 导出
exportFire() { exportFire() {
this.service.request(this.service.$api_carLicenseAudit_export, this.reqParams).subscribe((res: any) => { let params = Object.assign({}, this.reqParams || {});
if(res) { params.pageSize = -1;
this.service.msgSrv.success('导出成功,请去右上角下载中心下载') this.service.exportStart(params, this.service.$api_carLicenseAudit_export);
return
}
});
} }
addModal() { addModal() {
const i = { const i = {
appUserId: '', appUserId: ''
} };
this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe((res) => { this.modalHelper.create(CarSettleCarauthComponent, { i }, { size: 900 }).subscribe(res => {
this.st.load() this.st.load();
}); });
} }
} }

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

@ -19,7 +19,7 @@ export class VehicleComponentsListComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) { } constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
/** /**
* 查询参数 * 查询参数
@ -199,7 +199,7 @@ export class VehicleComponentsListComponent implements OnInit {
expand: (value: boolean) => value expand: (value: boolean) => value
} }
} }
}, }
// putOnRecord: { // putOnRecord: {
// type: 'string', // type: 'string',
// title: '是否已备案', // title: '是否已备案',
@ -278,7 +278,7 @@ export class VehicleComponentsListComponent implements OnInit {
text: '查看', text: '查看',
acl: { ability: ['VEHICLE-LIST-view'] }, acl: { ability: ['VEHICLE-LIST-view'] },
click: item => { click: item => {
this.router.navigate(['/vehicle/list/detail/' + item.id] ); this.router.navigate(['/vehicle/list/detail/' + item.id]);
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
} }
} }
@ -308,11 +308,8 @@ export class VehicleComponentsListComponent implements OnInit {
} }
// 导出 // 导出
exportFire() { exportFire() {
this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => { let params = Object.assign({}, this.reqParams || {});
if(res) { params.pageSize = -1;
this.service.msgSrv.success('导出成功,请去右上角下载中心下载') this.service.exportStart(params, this.service.$api_carLicense_export);
return
}
});
} }
} }