diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.ts b/src/app/routes/vehicle/components/audit/detail/detail.component.ts index d1adeea7..41becea9 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -42,9 +42,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy 10: '待审核', 20: '已审核', 30: '已驳回', - 40: '证件过期', - } - + 40: '证件过期' + }; scrollTop = 0; subscribeScoll!: Subscription; @@ -54,7 +53,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy private nzModalService: NzModalService, private modal: ModalHelper, private nzImageService: NzImageService - ) { } + ) {} ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } @@ -87,7 +86,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy }, { text: '上传协议', - click: _record => this.updateEvaluate(_record), + click: _record => this.updateEvaluate(_record) } ] } @@ -127,7 +126,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy nzContent: this.redectModal, nzOnOk: () => { if (!this.approvalOpinion) { - this.service.msgSrv.error('请填写备注!') + this.service.msgSrv.error('请填写备注!'); return false; } this.adjuctUser( @@ -159,9 +158,12 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); - console.log(this.detailData.roadTransportStartTime) - if ((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) { - this.service.msgSrv.error('发证日期起始不能大于结束日期!') + console.log(this.detailData.roadTransportStartTime); + 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_audit, this.detailData).subscribe(res => { diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index d38c31ae..3160df6c 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -87,8 +87,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 +103,7 @@ export class VehicleComponentsListDetailComponent implements OnInit { }, { text: '上传协议', - click: _record => this.updateEvaluate(_record), + click: _record => this.updateEvaluate(_record) // iif: item => item.auditStatusEnum == -1 } ] @@ -155,7 +155,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; @@ -270,16 +269,19 @@ export class VehicleComponentsListDetailComponent implements OnInit { 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; + console.log(this.detailData.roadTransportStartTime); + 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('修改成功!'); } }); diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index ff9837af..25e64bbb 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -162,7 +162,7 @@ export class ShipperBaseService extends BaseService { } const list = res.map((item: any) => { return { - label: item.contactName + '/' + item.contactMobile, + label: item.partnerType == 1 ? item.enterpriseName : item.contactName + '/' + item.contactMobile , value: item.id }; });