diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index ab219c3c..f7ba1063 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -491,8 +491,8 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone enum: [ { label: '全部', value: '' }, { label: '待审核', value: 10 }, - { label: '已撤销', value: 15 }, - { label: '已成功', value: 20 }, + // { label: '已撤销', value: 15 }, + // { label: '已成功', value: 20 }, { label: '审核失败', value: 30 } ], default: '', @@ -548,8 +548,8 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone enum: [ { label: '全部', value: '' }, { label: '待审核', value: 10 }, - { label: '已撤销', value: 15 }, - { label: '已成功', value: 20 }, + // { label: '已撤销', value: 15 }, + // { label: '已成功', value: 20 }, { label: '审核失败', value: 30 } ], default: '', 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 132fd7a5..520e64ae 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -44,9 +44,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy 10: '待审核', 20: '已审核', 30: '已驳回', - 40: '证件过期', - } - + 40: '证件过期' + }; scrollTop = 0; subscribeScoll!: Subscription; @@ -57,7 +56,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy private modal: ModalHelper, private nzImageService: NzImageService, private dateTimePickerUtil: DateTimePickerUtil - ) { } + ) {} ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } @@ -86,11 +85,11 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy { text: '查看协议', click: _record => this.viewEvaluate(_record), - iif: item => item.auditStatusEnum == 10 || item.auditStatusEnum == 20 + iif: item => (item.auditStatusEnum == 10 || item.auditStatusEnum == 20) && item.carProtocal }, { text: '上传协议', - click: _record => this.updateEvaluate(_record), + click: _record => this.updateEvaluate(_record) } ] } @@ -130,7 +129,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( @@ -163,9 +162,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 b000c22e..52d66e59 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -273,7 +273,6 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); - console.log(this.detailData); if ( this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime || this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime 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 }; });