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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-01-24 19:55:14 +08:00
parent 89242d8d15 220ffa2d6d
commit 41a3c528f4
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/routes/usercenter/components/driver/detail/detail.component.ts
View File

@ -294,7 +294,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
const driverDetail = this.driverDetail; const driverDetail = this.driverDetail;
const licenseDetail = this.licenseDetail; const licenseDetail = this.licenseDetail;
console.log(this.driverDetail); console.log(this.driverDetail);
const params = { const params: any = {
userId: this.route.snapshot.params.id, userId: this.route.snapshot.params.id,
mobile: this.userDetail?.phone, mobile: this.userDetail?.phone,
appUserId: driverDetail.appUserId || this.route.snapshot.params.id, appUserId: driverDetail.appUserId || this.route.snapshot.params.id,
@ -315,7 +315,26 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
? driverDetail.validStartTime ? driverDetail.validStartTime
: this.datePipe.transform(driverDetail.validStartTime, 'yyyy-MM-dd') : this.datePipe.transform(driverDetail.validStartTime, 'yyyy-MM-dd')
}, },
userPracticeSeniorityDTO: { // userPracticeSeniorityDTO: {
// appUserId: licenseDetail.appUserId || this.route.snapshot.params.id,
// approvalStatus: licenseDetail.approvalStatus,
// certificatePhoto: licenseDetail.certificatePhoto,
// certificatePhotoWatermark: licenseDetail.certificatePhotoWatermark,
// id: licenseDetail.id,
// licenseNo: licenseDetail.licenseNo,
// regionCode: licenseDetail.regionCode,
// validEndTime:
// licenseDetail.validEndTime?.length === 10
// ? licenseDetail.validEndTime
// : this.datePipe.transform(licenseDetail.validEndTime, 'yyyy-MM-dd'),
// validStartTime:
// licenseDetail.validStartTime?.length === 10
// ? licenseDetail.validStartTime
// : this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd')
// }
};
if(licenseDetail.approvalStatus && licenseDetail.licenseNo && licenseDetail.regionCode) {
params.userPracticeSeniorityDTO = {
appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, appUserId: licenseDetail.appUserId || this.route.snapshot.params.id,
approvalStatus: licenseDetail.approvalStatus, approvalStatus: licenseDetail.approvalStatus,
certificatePhoto: licenseDetail.certificatePhoto, certificatePhoto: licenseDetail.certificatePhoto,
@ -332,7 +351,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
? licenseDetail.validStartTime ? licenseDetail.validStartTime
: this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') : 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 => { this.service.request(this.service.$api_update_driver_license, params).subscribe(res => {
if (res) { if (res) {