From 3168fd2dcac4fe35d41be39de6e78c40d385cc7d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 31 Dec 2021 17:32:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/order-management.service.ts | 11 +++-- .../driver/detail/detail.component.html | 13 ++++++ .../driver/detail/detail.component.ts | 45 ++++++++++++++++--- 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 5f997365..bce35689 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-30 16:09:00 + * @LastEditTime: 2021-12-31 15:26:07 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\src\app\routes\order-management\services\order-management.service.ts @@ -111,14 +111,17 @@ export class OrderManagementService extends ShipperBaseService { * @returns */ getNetworkFreightForwarderHistory(params: any) { - return this.request(this.$api_get_getEnterpriseNetTransHis, params).pipe( + const param = { + enterpriseIds: params.ids + } + return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe( map((res: any) => { if (!res) { return []; } const list = res.map((item: any) => ({ - label: item.enterpriseName, - value: item.id + label: item.networkTransporterName, + value: item.networkTransporterId })); return [{ value: '', label: '全部' }, ...list]; }) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index 6cc0afb8..f60574cf 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -169,6 +169,19 @@ [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''"> + + + + + + + + + + {{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{ + detailData?.fullRegionVO?.areaName }} + + 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 6978f3e4..15245acf 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts @@ -21,9 +21,22 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { userDetail: any; userIdentityDetail: any = {}; tempalateUserIdentityDetail = { ...this.userIdentityDetail }; - driverDetail: any = {}; + driverDetail: any = { + licenseNo: '', + driverModel: '', + validStartTime: '', + validEndTime: '', + signingOrganization: '', + certificatePhotoWatermark: '' + }; tempalateDriverData = { ...this.driverDetail }; - licenseDetail: any = {}; + licenseDetail: any = { + licenseNo: '', + validStartTime: '', + validEndTime: '', + certificatePhotoWatermark: '', + regionCode: '', + }; tempalateLicenseDetail = { ...this.licenseDetail }; columns: STColumn[] = [ { title: '企业名称', className: 'text-center', index: 'enterpriseName' }, @@ -36,6 +49,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { redectModal!: any; @ViewChild('rejectedDriverModal', { static: false }) rejectedDriverModal!: any; + adressCodeList: any = []; approvalOpinion = ''; isEditUser = false; @@ -52,6 +66,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { ngOnInit() { this.initData(); + this.initDetailByCode(); } initData() { // 获取司机头部信息 @@ -69,14 +84,15 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { }); // 获取驾驶证信息 this.service.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }).subscribe(res => { - if (res) { + if (res?.id) { + console.log('driverDetail' ,res); this.driverDetail = res; this.tempalateDriverData = { ...this.driverDetail }; } }); // 获取从业资格证信息 this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => { - if (res) { + if (res?.id) { this.licenseDetail = res; this.tempalateLicenseDetail = { ...this.licenseDetail }; } @@ -213,6 +229,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { */ ratify(type: number) { if (type) { + console.log(this.driverDetail) this.isEditDriver = true; } else { this.isEditUser = true; @@ -233,17 +250,33 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { this.isEditUser = false; } } + /* + * 根据地区code查询地区详情 + * code：请求参数 + * type：参数 name：获取省市区名称，fullcode：获取省市区code + * num：参数 1：第一个地区选择，2：第二个地区选择 + */ + initDetailByCode() { + // 根据地区code查询地区详情 + this.service.request(this.service.$api_get_region_by_code, { regionCode:'' }).subscribe((res: any) => { + console.log(res) + this.adressCodeList = res + }) + } /** * 修改驾驶证，从业资格证信息 */ saveDriver() { + console.log(this.route.snapshot.params.id) const driverDetail = this.driverDetail; const licenseDetail = this.licenseDetail; + console.log(this.driverDetail) const params = { userId: this.route.snapshot.params.id, + appUserId: driverDetail.appUserId || this.route.snapshot.params.id, userDriverLicenseDTO: { - appUserId: driverDetail.appUserId, + appUserId: driverDetail?.appUserId || this.route.snapshot.params.id, certificatePhoto: driverDetail.certificatePhoto, certificatePhotoWatermark: driverDetail.certificatePhotoWatermark, driverModel: driverDetail.driverModel, @@ -260,7 +293,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit { : this.datePipe.transform(driverDetail.validStartTime, 'yyyy-MM-dd') }, userPracticeSeniorityDTO: { - appUserId: licenseDetail.appUserId, + appUserId: licenseDetail.appUserId || this.route.snapshot.params.id, approvalStatus: licenseDetail.approvalStatus, certificatePhoto: licenseDetail.certificatePhoto, certificatePhotoWatermark: licenseDetail.certificatePhotoWatermark,