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:
wangshiming
2022-03-03 15:36:57 +08:00
parent 691567904b fc83ed140f
commit 263a8323de
1 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,6 +312,11 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
return; return;
} }
} }
if (!licenseDetail.licenseNo || !licenseDetail.regionCode || !licenseDetail.validStartTime) {
this.service.msgSrv.warning('请完善从业资格证信息');
return;
}
const params: any = { const params: any = {
userId: this.route.snapshot.params.id, userId: this.route.snapshot.params.id,
mobile: this.userDetail?.phone, mobile: this.userDetail?.phone,
@ -332,27 +337,8 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
driverDetail.validStartTime?.length === 10 driverDetail.validStartTime?.length === 10
? 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,
@ -368,8 +354,27 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
licenseDetail.validStartTime?.length === 10 licenseDetail.validStartTime?.length === 10
? licenseDetail.validStartTime ? licenseDetail.validStartTime
: this.datePipe.transform(licenseDetail.validStartTime, 'yyyy-MM-dd') : 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,
// 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')
// };
// }
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) {