From 69f9cb937760966fcc4010e76f9c1162680e0965 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 15 Feb 2022 16:22:19 +0800 Subject: [PATCH 1/3] edit --- .../freight/list/detail/detail.component.html | 47 ++++++++++++------- .../list/detail/detail.component.spec.ts | 31 ------------ 2 files changed, 31 insertions(+), 47 deletions(-) delete mode 100644 src/app/routes/usercenter/components/freight/list/detail/detail.component.spec.ts diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 8ad39bc4..6f93cb01 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -1,5 +1,5 @@ - + - - - - @@ -172,8 +175,8 @@ - - + + @@ -188,7 +191,19 @@ - + + + + + + + + + + + @@ -229,7 +244,7 @@ - + diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.spec.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.spec.ts deleted file mode 100644 index 00666a0b..00000000 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.spec.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * @Author: your name - * @Date: 2021-11-29 20:19:08 - * @LastEditTime: 2021-11-29 20:31:00 - * @LastEditors: your name - * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\detail\detail.component.spec.ts - */ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FreightComponentsListDetailComponent } from './detail.component'; - -describe('FreightComponentsListDetailComponent', () => { - let component: FreightComponentsListDetailComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [FreightComponentsListDetailComponent], - }).compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(FreightComponentsListDetailComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); From 5da35efeb01b358f9a1e9a0cd8dcac2dba553894 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 15 Feb 2022 16:47:14 +0800 Subject: [PATCH 2/3] edit --- .../driver/detail/detail.component.ts | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts index 1cf0ffe9..7c3e052c 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -86,13 +86,13 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { }); // 获取人脸识别结果 this.service.request(this.service.$api_getFaceFlowQuery, { id: this.route.snapshot.params.id }).subscribe(res => { - console.log(res) - if(res) { - this.faceStatus = res.status - if(res.status == 4) { - this.facetext= res.failReason + console.log(res); + if (res) { + this.faceStatus = res.status; + if (res.status == 4) { + this.facetext = res.failReason; } - } + } }); // 获取用户个人信息 this.service.request(this.service.$api_get_user_identity, { id: this.route.snapshot.params.id }).subscribe(res => { @@ -115,7 +115,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => { if (res?.id) { this.licenseDetail = res; - console.log(res) + console.log(res); this.tempalateLicenseDetail = { ...this.licenseDetail }; } }); @@ -290,10 +290,23 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { * 修改驾驶证，从业资格证信息 */ saveDriver() { - console.log(this.route.snapshot.params.id); const driverDetail = this.driverDetail; const licenseDetail = this.licenseDetail; - console.log(this.driverDetail); + // console.log(this.driverDetail); + if (driverDetail.validStartTime && driverDetail.validEndTime) { + let validStartTime = driverDetail.validStartTime; + let validEndTime = driverDetail.validEndTime; + if (typeof driverDetail.validStartTime === 'string') { + validStartTime = new Date(driverDetail.validStartTime); + } + if (typeof driverDetail.validEndTime === 'string') { + validEndTime = new Date(driverDetail.validEndTime); + } + if (validStartTime?.getTime() >= validEndTime?.getTime()) { + this.service.msgSrv.warning('结束时间必须大于开始时间'); + return; + } + } const params: any = { userId: this.route.snapshot.params.id, mobile: this.userDetail?.phone, @@ -314,7 +327,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { driverDetail.validStartTime?.length === 10 ? driverDetail.validStartTime : this.datePipe.transform(driverDetail.validStartTime, 'yyyy-MM-dd') - }, + } // userPracticeSeniorityDTO: { // appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, // approvalStatus: licenseDetail.approvalStatus, @@ -333,7 +346,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { // : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') // } }; - if(licenseDetail.approvalStatus && licenseDetail.licenseNo && licenseDetail.regionCode) { + if (licenseDetail.approvalStatus && licenseDetail.licenseNo && licenseDetail.regionCode) { params.userPracticeSeniorityDTO = { appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, approvalStatus: licenseDetail.approvalStatus, @@ -350,9 +363,9 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { licenseDetail.validStartTime?.length === 10 ? licenseDetail.validStartTime : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') - } + }; } - console.log(params) + console.log(params); this.service.request(this.service.$api_update_driver_license, params).subscribe(res => { if (res) { this.service.msgSrv.success('修改成功'); From e431261f9dcb9f8b06c05ff1806136a5ad0c8d06 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 15 Feb 2022 16:55:42 +0800 Subject: [PATCH 3/3] edit --- .../freight/list/detail/detail.component.html | 12 ++++++++++++ .../freight/list/detail/detail.component.ts | 11 ++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 6f93cb01..4a9c1bce 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -148,6 +148,18 @@ +

+ 四要素验证： + + + +

{ if (res) { this.ltdId = res; - console.log(this.ltdId ); - + console.log(this.ltdId); } }); } @@ -68,7 +73,7 @@ export class FreightComponentsListDetailComponent implements OnInit { Number(this.detailData.fullRegionVO?.cityCode), Number(this.detailData.fullRegionVO?.areaCode) ]; - console.log(this.enterpriseAddressCode) + console.log(this.enterpriseAddressCode); } console.log(res); });