-
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
@@ -192,17 +215,7 @@
-
-
-
-
-
-
-
+
@@ -214,6 +227,24 @@
{{licenseDetail?.regionCodeName }}
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
@@ -262,10 +293,10 @@
银行结算信息
- {{ detailData?.name }}
+ {{ userIdentityDetail?.name }}
- {{ detailData?.certificateNumber }}
+ {{ userIdentityDetail?.certificateNumber }}
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 df824556..bb13924b 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@@ -312,6 +312,11 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
return;
}
}
+ if (!licenseDetail.licenseNo || !licenseDetail.regionCode || !licenseDetail.validStartTime) {
+ this.service.msgSrv.warning('请完善从业资格证信息');
+ return;
+ }
+
const params: any = {
userId: this.route.snapshot.params.id,
mobile: this.userDetail?.phone,
@@ -332,27 +337,8 @@ 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,
- // 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 = {
+ },
+ userPracticeSeniorityDTO: {
appUserId: licenseDetail.appUserId || this.route.snapshot.params.id,
approvalStatus: licenseDetail.approvalStatus,
certificatePhoto: licenseDetail.certificatePhoto,
@@ -368,8 +354,27 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
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,
+ // 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);
this.service.request(this.service.$api_update_driver_license, params).subscribe(res => {
if (res) {
diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
index 6f115213..c9fa67f7 100644
--- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
+++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
@@ -270,21 +270,21 @@ export class FreightConfigComponent implements OnInit {
{
title: '货源单费率',
className: 'text-right',
- index: 'contractSurchargeRatio',
- width: 130,
- format: item => `${item.contractSurchargeRatio}%`
- },
- {
- title: '合同单费率',
- className: 'text-right',
index: 'goodsSurchargeRatio',
width: 130,
format: item => `${item.goodsSurchargeRatio}%`
},
+ {
+ title: '合同单费率',
+ className: 'text-right',
+ index: 'contractSurchargeRatio',
+ width: 130,
+ format: item => `${item.contractSurchargeRatio}%`
+ },
{
title: '合同单业务量（元）',
index: 'contractQuota',
- width: 160,
+ width: 170,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@@ -292,7 +292,7 @@ export class FreightConfigComponent implements OnInit {
{
title: '货源单业务量（元）',
index: 'goodsQuota',
- width: 160,
+ width: 170,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }
diff --git a/src/app/routes/usercenter/usercenter-routing.module.ts b/src/app/routes/usercenter/usercenter-routing.module.ts
index 3f11ed47..9754d2e4 100644
--- a/src/app/routes/usercenter/usercenter-routing.module.ts
+++ b/src/app/routes/usercenter/usercenter-routing.module.ts
@@ -14,19 +14,17 @@ import { UserCenterComponentsDriverDetailComponent } from './components/driver/d
import { UserCenterComponentsDriverConfigComponent } from './components/driver/driver-config/driver-config.component';
import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component';
-import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component';
import { FreightConfigComponent } from './components/freight/freight-config/freight-config.component';
import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component';
import { FreightComponentsListComponent } from './components/freight/list/list.component';
import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component';
-import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component';
import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
import { FreightComponentsUserComponent } from './components/freight/user/user.component';
const routes: Routes = [
{ path: 'freight/list', component: FreightComponentsListComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-LIST-list'] } } },
- { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
+ // { path: 'freight/list/view/:id', component: FreightComponentsListViewComponent },
{ path: 'freight/list/new', component: FreightComponentsListNewComponent, data: { guard: { ability: ['USERCENTER-FREIGHT-NEW-save'] } } },
{
path: 'freight/list/detail/:id',
diff --git a/src/app/routes/usercenter/usercenter.module.ts b/src/app/routes/usercenter/usercenter.module.ts
index 3a0ea35c..1cc35d5b 100644
--- a/src/app/routes/usercenter/usercenter.module.ts
+++ b/src/app/routes/usercenter/usercenter.module.ts
@@ -12,11 +12,9 @@ import { UserCenterComponentsDriverCaptainComponent } from './components/driver/
import { UserCenterComponentsDriverDetailComponent } from './components/driver/detail/detail.component';
import { UserCenterComponentsDriverComponent } from './components/driver/driver.component';
import { FreightComponentsEnterpriseAuditComponent } from './components/freight/enterprise-audit/enterprise-audit.component';
-import { FreightComponentsEnterpriseAuditViewComponent } from './components/freight/enterprise-audit/view/view.component';
import { FreightComponentsListDetailComponent } from './components/freight/list/detail/detail.component';
import { FreightComponentsListComponent } from './components/freight/list/list.component';
import { FreightComponentsListNewComponent } from './components/freight/list/new/new.component';
-import { FreightComponentsListViewComponent } from './components/freight/list/view/view.component';
import { FreightComponentsUserDetailComponent } from './components/freight/user/detail/detail.component';
import { FreightComponentsUserComponent } from './components/freight/user/user.component';
import { UsercenterRoutingModule } from './usercenter-routing.module';
@@ -29,11 +27,11 @@ import { UserCenterComponentsDriverConfigComponent } from './components/driver/d
const COMPONENTS = [
FreightComponentsListComponent,
- FreightComponentsListViewComponent,
+ // FreightComponentsListViewComponent,
FreightComponentsListNewComponent,
FreightComponentsListDetailComponent,
FreightComponentsEnterpriseAuditComponent,
- FreightComponentsEnterpriseAuditViewComponent,
+ // FreightComponentsEnterpriseAuditViewComponent,
FreightComponentsUserComponent,
FreightComponentsUserDetailComponent,
UserCenterComponentsDriverComponent,
diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
index fb9441d3..3dd17484 100644
--- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
+++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
@@ -1,5 +1,5 @@
import AMapLoader from '@amap/amap-jsapi-loader';
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular/core';
import { amapConf } from '@conf/amap.config';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { throwError } from 'rxjs';
@@ -27,7 +27,10 @@ export class AmapPoiPickerComponent implements OnInit {
infoWindow: any;
geocoder: any;
- constructor(private modalRef: NzModalRef, private service: AmapService) {}
+ @Input()
+ selectedAddress!: string;
+
+ constructor(private modalRef: NzModalRef, private service: AmapService, private cdr: ChangeDetectorRef) {}
ngOnInit(): void {
this.mapInit();
// this.PoiPicker();
@@ -77,12 +80,12 @@ export class AmapPoiPickerComponent implements OnInit {
// 地图创建成功
this.aMap.on('complete', () => {
+ console.log('地图创建成功');
+ this.cdr.detectChanges();
this.poiPickerReady(poiPicker);
});
this.aMap.on('click', (e: any) => {
- console.log(e);
-
this.selectedPOI(e.lnglat);
});
})
@@ -113,12 +116,21 @@ export class AmapPoiPickerComponent implements OnInit {
radius: 1000 //范围，默认：500
});
- // 获取当前定位
- this.service.getCurrentPosition().subscribe(res => {
- if (res) {
- this.selectedPOI(res.position);
- }
- });
+ if (this.selectedAddress) {
+ this.geocoder.getLocation(this.selectedAddress, (status: any, result: any) => {
+ if (status === 'complete' && result.info === 'OK') {
+ // result中对应详细地理坐标信息
+ this.selectedPOI(result.geocodes?.[0].location);
+ }
+ });
+ } else {
+ // 获取当前定位
+ this.service.getCurrentPosition().subscribe(res => {
+ if (res) {
+ this.selectedPOI(res.position);
+ }
+ });
+ }
//选取了某个POI
poiPicker.on('poiPicked', (poiResult: any) => {