diff --git a/src/app/routes/insurance-management/components/list/list.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts index cd5107cc..91c69de1 100644 --- a/src/app/routes/insurance-management/components/list/list.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -8,6 +8,8 @@ import { of } from 'rxjs'; import { ShipperBaseService } from '@shared'; import { Router } from '@angular/router'; import { InsuranceManagementService } from '../../services/insurance-management.service'; +import { VehicleImgViewComponent } from 'src/app/routes/vehicle/components/list/img-view/img-view.component'; +import { ImageViewComponent } from 'src/app/shared/components/imagelist'; @Component({ selector: 'app-insurance-management-list', @@ -60,7 +62,8 @@ export class insuranceManagementListComponent implements OnInit { public service: InsuranceManagementService, private modal: NzModalService, public shipperservice: ShipperBaseService, - private router: Router + private router: Router, + private modale: ModalHelper, ) {} /** @@ -443,7 +446,7 @@ export class insuranceManagementListComponent implements OnInit { }, { text: '查看保单', - click: _record => console.log('') + click: _record => this.showImg(_record) // iif: item => // item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' }, @@ -455,7 +458,13 @@ export class insuranceManagementListComponent implements OnInit { } ]; } - + showImg(_record: any) { + const params = { + imgList: [_record.policyUrl], + index: 0 + }; + this.modal.create({ nzContent: ImageViewComponent, nzComponentParams: { params } }); + } /** * 查询字段个数 */ diff --git a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts index ea019d69..3fcc41c6 100644 --- a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts +++ b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts @@ -610,7 +610,7 @@ export class CarSettleAddDriverComponent implements OnInit { if(JSON.stringify(params.userPracticeSeniorityDTO) === '{}') { params.userPracticeSeniorityDTO = null } - this.service.request(this.service.$api_enterpriseVehicleSave, params).subscribe(res => { + this.service.request(this.service.$api_driver_add, params).subscribe(res => { if(res){ this.service.msgSrv.success('添加成功') this.modal.close(true) diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts index be248207..4a1a8378 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts @@ -223,7 +223,6 @@ export class CtcCaptatinAddComponent implements OnInit { observer.complete(); }); }, - previewFile: (file: any) => { } }, default: this.detailData.identityInfoDTO.certificatePhotoFrontWatermark }, @@ -274,7 +273,6 @@ export class CtcCaptatinAddComponent implements OnInit { observer.complete(); }); }, - previewFile: (file: any) => { } }, default: this.detailData.identityInfoDTO.certificatePhotoBackWatermark }, @@ -361,8 +359,8 @@ export class CtcCaptatinAddComponent implements OnInit { mobile: this.sf.value.mobile, remark: this.sf.value.remark, identityInfoDTO: { - certificatePhotoBackWatermark: this.sf.value.certificatePhotoBackWatermark, - certificatePhotoFrontWatermark: this.sf.value.certificatePhotoFrontWatermark, + certificatePhotoBackWatermark: this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark, + certificatePhotoFrontWatermark: this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf.value?.certificatePhotoFrontWatermark, certificatePhotoFront: this.detailData.certificatePhotoFront, certificatePhotoBack: this.detailData.certificatePhotoBack, certificateNumber: this.sf.value.certificateNumber, @@ -373,7 +371,7 @@ export class CtcCaptatinAddComponent implements OnInit { params.id = this.i.id } delete params.showName - this.service.request(this.service.$api_saveCaptainr, params).subscribe(res => { + this.service.request(this.service.$api_saveCaptainr_new, params).subscribe(res => { if (res) { this.service.msgSrv.success('保存成功') this.modal.close(true) diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index a9017fb5..422cb328 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-11-29 15:22:34 - * @LastEditTime : 2022-02-16 09:55:50 + * @LastEditTime : 2022-02-17 14:13:13 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\services\\usercenter.service.ts @@ -122,6 +122,12 @@ export class UsermanageService extends ShipperBaseService { $api_captainrDetail = '/api/mdc/cuc/enterpriseSettleDriver/captainrDetail'; // 根据手机号码查询结算单司机 $api_getByMobile = '/api/mdc/cuc/identityInfo/getByMobile'; + + // 添加司机 + $api_driver_add = '/api/mdc/cuc/driver/add'; + // 添加车队长 + $api_saveCaptainr_new = '/api/mdc/userDriverExpand/saveCaptainr'; + constructor(public injector: Injector, private nzModalService: NzModalService, public eaCacheSrv: EACacheService) { super(injector, eaCacheSrv); }