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-05-16 11:16:16 +08:00
parent e18fdd158c
commit 34150e10f9
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -417,6 +417,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
},
{ title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },
{ title: '审核时间', className: 'text-center', index: 'approvalTime', width: 180, type: 'date' },
{ title: '迁移认证时间', className: 'text-center', index: 'transferApprovalTime', width: 180, type: 'date' },
{ title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
{
title: '保险认证状态',

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

@ -16,11 +16,13 @@ import { VehicleImgViewComponent } from '../../list/img-view/img-view.component'
import { VehicleComponentsListEditComponent } from '../../list/edit/edit.component';
import { NzImageService } from 'ng-zorro-antd/image';
import { fromEvent, Subscription } from 'rxjs';
import { DateTimePickerUtil } from '@delon/util';
@Component({
selector: 'app-Vehicle-components-Audit-detail',
templateUrl: './detail.component.html',
styleUrls: ['./detail.component.less']
styleUrls: ['./detail.component.less'],
providers: [DateTimePickerUtil]
})
export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy {
@ViewChild('st', { static: false }) st!: STComponent;
@ -53,7 +55,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
private route: ActivatedRoute,
private nzModalService: NzModalService,
private modal: ModalHelper,
private nzImageService: NzImageService
private nzImageService: NzImageService,
private dateTimePickerUtil: DateTimePickerUtil
) { }
ngOnDestroy(): void {
this.subscribeScoll.unsubscribe();
@ -154,7 +157,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDateTime(this.detailData?.driverLicenseGetTime);
this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss');
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
@ -241,6 +245,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
useNature: null,
driverLicenseRegisterTime: null,
driverLicenseGetTime: null,
scrapTime: null,
driverLicenseEndTime: null,
roadTransportStartTime: null,
roadTransportEndTime: null,

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

@ -10,11 +10,13 @@ import { apiConf } from '@conf/api.conf';
import { NzModalService } from 'ng-zorro-antd/modal';
import { EADateUtil } from '@shared';
import { NzImageService } from 'ng-zorro-antd/image';
import { DateTimePickerUtil } from '@delon/util';
@Component({
selector: 'app-supplier-components-list-view',
templateUrl: './detail.component.html',
styleUrls: ['./detail.component.less']
styleUrls: ['./detail.component.less'],
providers: [DateTimePickerUtil]
})
export class VehicleComponentsListDetailComponent implements OnInit {
i: any;
@ -46,7 +48,8 @@ export class VehicleComponentsListDetailComponent implements OnInit {
public service: VehicleService,
private route: ActivatedRoute,
private nzModalService: NzModalService,
private nzImageService: NzImageService
private nzImageService: NzImageService,
private dateTimePickerUtil: DateTimePickerUtil
) {}
ngOnInit() {
@ -87,8 +90,8 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.columns = [
{ title: '司机姓名', index: 'name', width: 150, className: 'text-center' },
{ title: '司机手机号', index: 'mobile', width: 200, className: 'text-center' },
{ title: '身份证号', index: 'idCardNo',width: 200, className: 'text-center' },
{ title: '挂靠协议', render: 'auditStatusEnum', width: 100,className: 'text-center' },
{ title: '身份证号', index: 'idCardNo', width: 200, className: 'text-center' },
{ title: '挂靠协议', render: 'auditStatusEnum', width: 100, className: 'text-center' },
{ title: '录入人员', index: 'saveUser', className: 'text-center' },
{
title: '车主申明/挂靠协议',
@ -103,7 +106,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
},
{
text: '上传协议',
click: _record => this.updateEvaluate(_record),
click: _record => this.updateEvaluate(_record)
// iif: item => item.auditStatusEnum == -1
}
]
@ -155,7 +158,6 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.Serveice('car:model');
this.Serveice('car:length');
this.Serveice('car:energy:type');
}
Serveice(param: any) {
let value: any;
@ -266,20 +268,24 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss');
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData);
console.log(this.detailData.roadTransportStartTime)
if((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) {
this.service.msgSrv.error('发证日期起始不能大于结束日期！')
return;
if (
this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime ||
this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime
) {
this.service.msgSrv.error('发证日期起始不能大于结束日期！');
return;
}
this.service.request(this.service.$api_get_update, this.detailData).subscribe(res => {
console.log(res);
if (res) {
this.getDetailList();
this.isEdit = false;
this.isEdit = false;
this.service.msgSrv.success('修改成功！');
}
});
@ -303,6 +309,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
useNature: null,
driverLicenseRegisterTime: null,
driverLicenseGetTime: null,
scrapTime: null,
driverLicenseEndTime: null,
roadTransportStartTime: null,
roadTransportEndTime: null,