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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-02-16 16:47:19 +08:00
parent 331c3207a7
commit 56068f5337
7 changed files with 45 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/platform-account/platform-account.component.html
View File

@ -52,7 +52,7 @@
</nz-card> </nz-card>
<nz-card class="content-box"> <nz-card class="content-box">
<st #st [data]="url" [columns]="columns" [req]="{ process: beforeReq }" [scroll]="{ x: '1200px' }" <st #st [data]="service.$api_get_platform_page" [columns]="columns" [req]="{ process: beforeReq }"
[loading]="service.http.loading"> [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
</st> </st>
</nz-card> </nz-card>

5
src/app/routes/financial-management/components/platform-account/platform-account.component.ts
View File

@ -18,9 +18,6 @@ export class PlatformAccountComponent implements OnInit {
searchSchema: SFSchema = this.initSF(); searchSchema: SFSchema = this.initSF();
columns: STColumn[] = this.initST(); columns: STColumn[] = this.initST();
url = `/rule?_allow_anonymous=true`;
constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService) {} constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService) {}
ngOnInit(): void {} ngOnInit(): void {}
@ -88,7 +85,7 @@ export class PlatformAccountComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '网络货运人', index: 'description', width: 180 }, { title: '网络货运人', index: 'ltdName', width: 180 },
{ title: '银行类型', index: 'description', width: 120 }, { title: '银行类型', index: 'description', width: 120 },
{ title: '虚拟账户', index: 'description', width: 140 }, { title: '虚拟账户', index: 'description', width: 140 },
{ {

2
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -21,6 +21,8 @@ export class FreightAccountService extends ShipperBaseService {
$api_get_shipper_account_page = '/api/fcc/accountBalance/getShipperAccountBalanceByOperator'; $api_get_shipper_account_page = '/api/fcc/accountBalance/getShipperAccountBalanceByOperator';
// 运营端获取司机账户信息 // 运营端获取司机账户信息
$api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator'; $api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator';
// 运营端获取平台余额
$api_get_platform_page = '/api/fcc/accountBalance/getPlatformBalanceByOperator';
// 运营端获取货主账户明细信息 // 运营端获取货主账户明细信息
$api_get_shipper_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperByOperatorPage'; $api_get_shipper_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperByOperatorPage';

69
src/app/routes/usercenter/components/driver/detail/detail.component.html
View File

@ -17,11 +17,11 @@
</p> </p>
<div style="margin-right: 24px;"> <div style="margin-right: 24px;">
<button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary" <button *ngIf="userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzType="primary"
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']"> nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
启用 启用
</button> </button>
<button *ngIf="!userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzDanger nzGhost <button *ngIf="!userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']"> (click)="userAction(0)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
冻结 冻结
</button> </button>
</div> </div>
@ -49,24 +49,21 @@
<label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f;" class="ml-md"><i nz-icon <label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f;" class="ml-md"><i nz-icon
nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回 nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回
</label> </label>
<label *ngIf="faceStatus == 1" style="color: #bec8c8; position: relative; <label *ngIf="faceStatus == 1" style="color: #bec8c8; position: relative;
bottom: 2px;" class="ml-md"><i nz-icon bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
</label> </label>
<label *ngIf="faceStatus == 0" style="color: #bec8c8; position: relative; <label *ngIf="faceStatus == 0" style="color: #bec8c8; position: relative;
bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：无</i> bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：无</i>
</label> </label>
<label *ngIf="faceStatus == 2" style="color: #bec8c8; position: relative; <label *ngIf="faceStatus == 2" style="color: #bec8c8; position: relative;
bottom: 2px;" class="ml-md"><i nz-icon bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：进行中</i>
nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：进行中</i>
</label> </label>
<label *ngIf="faceStatus == 3" style="color: #52c41a; position: relative; <label *ngIf="faceStatus == 3" style="color: #52c41a; position: relative;
bottom: 2px;" class="ml-md"><i nz-icon bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已成功</i>
nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已成功</i>
</label> </label>
<label *ngIf="faceStatus == 4" style="color: #ff4d4f; position: relative; <label *ngIf="faceStatus == 4" style="color: #ff4d4f; position: relative;
bottom: 2px;" class="ml-md"><i nz-icon bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill"
nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已失败;失败原因：{{facetext}}</i> class="mr-xs">人脸识别结果：已失败;失败原因：{{facetext}}</i>
</label> </label>
<div style="float: right;"> <div style="float: right;">
<ng-container *ngIf="isEditUser; else elseTemplate"> <ng-container *ngIf="isEditUser; else elseTemplate">
@ -79,10 +76,13 @@
</ng-container> </ng-container>
<ng-template #elseTemplate> <ng-template #elseTemplate>
<button nz-button nzType="default" nzDanger (click)="approveUser()" <button nz-button nzType="default" nzDanger (click)="approveUser()"
*ngIf="userIdentityDetail?.certificationStatus===0" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">审核通过</button> *ngIf="userIdentityDetail?.certificationStatus===0" acl
[acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="rejectedUser()" <button nz-button nzType="default" nzDanger (click)="rejectedUser()"
*ngIf="userIdentityDetail?.certificationStatus===0" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">驳回审核</button> *ngIf="userIdentityDetail?.certificationStatus===0" acl
<button nz-button nzType="default" nzDanger (click)="ratify(0)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editUser']">修改</button> [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">驳回审核</button>
<button nz-button nzType="default" nzDanger (click)="ratify(0)" acl
[acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editUser']">修改</button>
</ng-template> </ng-template>
</div> </div>
</sv-title> </sv-title>
@ -128,10 +128,11 @@
</ng-container> </ng-container>
<ng-template #editDriverButton> <ng-template #editDriverButton>
<button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger <button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger
(click)="approveDriver()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditDriver']">审核通过</button> (click)="approveDriver()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditDriver']">审核通过</button>
<button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger <button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger
(click)="rejectedDriver()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditDriver']">驳回审核</button> (click)="rejectedDriver()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditDriver']">驳回审核</button>
<button nz-button nzType="default" nzDanger (click)="ratify(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editDriver']">修改</button> <button nz-button nzType="default" nzDanger (click)="ratify(1)" acl
[acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editDriver']">修改</button>
</ng-template> </ng-template>
</div> </div>
</sv-title> </sv-title>
@ -140,21 +141,11 @@
[nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'"> [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
</sv> </sv>
<sv label="准驾车型"> <sv label="准驾车型">
<nz-select <nz-select [nzMaxTagCount]="3" nzPlaceHolder="Please select" [(ngModel)]="driverDetail.driverModel"
[nzMaxTagCount]="3" nzMode="multiple" [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
nzPlaceHolder="Please select" [nzShowArrow]="isEditDriver" [nzDisabled]="!isEditDriver">
[(ngModel)]="driverDetail.driverModel" <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.label"></nz-option>
nzMode="multiple" </nz-select>
[nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
[nzShowArrow]="isEditDriver"
[nzDisabled]="!isEditDriver"
>
<nz-option
*ngFor="let i of contencarModel"
[nzLabel]="i.label"
[nzValue]="i.label"
></nz-option>
</nz-select>
</sv> </sv>
<sv label="有效期起"> <sv label="有效期起">
<nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver" <nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver"
@ -205,12 +196,12 @@
<ng-container *ngIf="isEditDriver; else cascaderelseTemplate"> <ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
<nz-select [(ngModel)]="licenseDetail.regionCode"> <nz-select [(ngModel)]="licenseDetail.regionCode">
<ng-container *ngFor="let item of adressCodeList"> <ng-container *ngFor="let item of adressCodeList">
<nz-option [nzValue]="item.regionFullCodes" [nzLabel]="item.regionFullName"></nz-option> <nz-option [nzValue]="item.regionFullCodes" [nzLabel]="item.regionFullName"></nz-option>
</ng-container> </ng-container>
</nz-select> </nz-select>
</ng-container> </ng-container>
<ng-template #cascaderelseTemplate> <ng-template #cascaderelseTemplate>
{{licenseDetail?.regionCodeName }} {{licenseDetail?.regionCodeName }}
</ng-template> </ng-template>
</sv> </sv>
<sv label="从业资格证照片" col="1"> <sv label="从业资格证照片" col="1">
@ -270,7 +261,9 @@
<nz-divider></nz-divider> <nz-divider></nz-divider>
<sv-container col="3" class="mt16"> <sv-container col="3" class="mt16">
<sv-title>服务评级</sv-title> <sv-title>服务评级
<ng-container *ngIf="billEvaluateList?.length===0">(暂无评级)</ng-container>
</sv-title>
<sv [label]="item.evaluateType" *ngFor="let item of billEvaluateList"> <sv [label]="item.evaluateType" *ngFor="let item of billEvaluateList">
<nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate> <nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
</sv> </sv>

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

@ -81,13 +81,11 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
}); });
this.service.request(this.service.$api_getDictValue, { dictKey: 'driverModel' }).subscribe(res => { this.service.request(this.service.$api_getDictValue, { dictKey: 'driverModel' }).subscribe(res => {
if (res) { if (res) {
console.log(res);
this.contencarModel = res; this.contencarModel = res;
} }
}); });
// 获取人脸识别结果 // 获取人脸识别结果
this.service.request(this.service.$api_getFaceFlowQuery, { id: this.route.snapshot.params.id }).subscribe(res => { this.service.request(this.service.$api_getFaceFlowQuery, { id: this.route.snapshot.params.id }).subscribe(res => {
console.log(res);
if (res) { if (res) {
this.faceStatus = res.status; this.faceStatus = res.status;
if (res.status == 4) { if (res.status == 4) {
@ -106,7 +104,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
this.service.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }).subscribe(res => { this.service.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
if (res?.id) { if (res?.id) {
Object.assign(res, { driverModel: res.driverModel ? res.driverModel.split(',') : [] }); Object.assign(res, { driverModel: res.driverModel ? res.driverModel.split(',') : [] });
console.log('driverDetail', res);
this.driverDetail = res; this.driverDetail = res;
this.tempalateDriverData = { ...this.driverDetail }; this.tempalateDriverData = { ...this.driverDetail };
@ -116,7 +113,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => { this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
if (res?.id) { if (res?.id) {
this.licenseDetail = res; this.licenseDetail = res;
console.log(res);
this.tempalateLicenseDetail = { ...this.licenseDetail }; this.tempalateLicenseDetail = { ...this.licenseDetail };
} }
}); });
@ -132,7 +128,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
this.billEvaluateList = res; this.billEvaluateList = res;
console.log(this.billEvaluateList);
} }
}); });
} }
@ -261,7 +256,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
*/ */
ratify(type: number) { ratify(type: number) {
if (type) { if (type) {
console.log(this.driverDetail);
this.isEditDriver = true; this.isEditDriver = true;
} else { } else {
this.isEditUser = true; this.isEditUser = true;
@ -291,7 +285,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
initDetailByCode() { initDetailByCode() {
// 根据地区code查询地区详情 // 根据地区code查询地区详情
this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe((res: any) => { this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe((res: any) => {
console.log(res);
this.adressCodeList = res; this.adressCodeList = res;
}); });
} }

8
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -29,7 +29,13 @@
</div> </div>
</div> </div>
<div> <div>
服务评级：<nz-rate [ngModel]="billEvaluate" nzDisabled></nz-rate> 服务评级：
<ng-container *ngIf="billEvaluate!==null; else billEvaluateelseTemplate">
<nz-rate [ngModel]="billEvaluate" nzDisabled></nz-rate>
</ng-container>
<ng-template #billEvaluateelseTemplate>
暂无评价
</ng-template>
</div> </div>
</div> </div>
</div> </div>

4
src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
View File

@ -40,7 +40,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
2: '未认证' 2: '未认证'
}; };
billEvaluate = 0; billEvaluate = null;
constructor( constructor(
public service: UsermanageService, public service: UsermanageService,
private route: ActivatedRoute, private route: ActivatedRoute,
@ -81,7 +81,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
this.service this.service
.request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false) .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false)
.subscribe(res => { .subscribe(res => {
if (res) { if (res?.length > 0) {
this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => { this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => {
if (billEvaluate) { if (billEvaluate) {
this.billEvaluate = billEvaluate.totalScore; this.billEvaluate = billEvaluate.totalScore;