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-07 10:43:40 +08:00
parent 740d7317d4 198d9bf776
commit 2bb30f16b3
17 changed files with 174 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
View File

@ -11,7 +11,7 @@
<img [src]="userDetail?.avatar" />
<div style="flex: 1">
<div style="display: flex; width: 100%; justify-content: space-between">
<p style="padding-right: 80px; width: 400px">{{ userDetail?.name }}
<p style="padding-right: 80px; width: 400px">{{ userDetail?.realName }}
<nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"> </nz-badge>
<nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"> </nz-badge>
</p>
@ -103,10 +103,10 @@
<sv-container col="3" class="mt-md">
<sv-title>银行结算信息</sv-title>
<sv label="开户银行">
<!-- {{ detailData?.name }} -->
{{ userIdentityDetail?.name }}
</sv>
<sv label="银行卡号">
<!-- {{ detailData?.certificateNumber }} -->
{{ userIdentityDetail?.certificateNumber }}
</sv>
</sv-container>
</nz-card>

2
src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.ts
View File

@ -65,8 +65,6 @@ export class CaptainDetailComponent implements OnInit {
/** 启用/冻结司机 */
userAction(status: number) {
console.log(this.userDetail);
this.nzModalService.warning({
nzTitle: status === 1 ? '确定启用该司机吗？' : '确定冻结该司机吗？',
nzContent: status === 1 ? '启用后，该司机将恢复正常使用功能，请再次确认！' : '冻结后，司机将被限制使用，无法登陆，请谨慎操作！',

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

@ -11,7 +11,7 @@
<img [src]="userDetail?.avatar" />
<div style="flex: 1">
<div style="display: flex;width: 100%;justify-content: space-between;">
<p style="padding-right: 80px; width: 400px;">{{ userDetail?.name }}
<p style="padding-right: 80px; width: 400px;">{{ userDetail?.realName }}
<nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-xl"></nz-badge>
<nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xl"></nz-badge>
</p>
@ -215,7 +215,7 @@
<input nz-input type="text" [(ngModel)]="licenseDetail.licenseNo" [readonly]="!isEditDriver"
[nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
</sv>
<sv label="公司所在地" >
<!-- <sv label="公司所在地" >
<ng-container *ngIf="isEditDriver; else cascaderelseTemplate">
<nz-select [(ngModel)]="licenseDetail.regionCode">
<ng-container *ngFor="let item of adressCodeList">
@ -226,8 +226,8 @@
<ng-template #cascaderelseTemplate>
{{licenseDetail?.regionCodeName }}
</ng-template>
</sv>
<sv label="发证日期" col="1">
</sv> -->
<sv label="发证日期" col="2">
<nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
[nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
</nz-date-picker>
@ -301,16 +301,16 @@
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-container col="3" class="mt-md">
<sv-title>服务评级
<ng-container *ngIf="billEvaluateList?.length===0">(暂无评级)</ng-container>
</sv-title>
<sv [label]="item.evaluateType" *ngFor="let item of billEvaluateList">
<sv [label]="item.evaluateTypeLabel" *ngFor="let item of billEvaluateList">
<nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
</sv>
</sv-container>
<sv-container col="3" class="mt16">
<sv-container col="3" class="mt-md">
<sv-title>关联企业</sv-title>
<st #st [columns]="columns" [data]="service.$api_get_driver_projects" size="small"
[req]="{ method: 'POST', allInBody: true, params: {appUserId:route.snapshot.params.id} }" [page]="{ show: false }"

1
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -203,6 +203,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
id: this.detailData.id,
approvalOpinion: this.approvalOpinion,
networkTransporter: this.networkTransporter,
customerServiceId: this.customerServiceId,
roleId: this.roleId || null
})
.subscribe(res => {

2
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
View File

@ -42,7 +42,7 @@
</div>
</div>
<!-- 数据列表 -->
<st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{ process: beforeReq }"
<st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{ process: beforeReq }" [page]="{}"
[scroll]="{ x: '1200px' }" [loading]="service.http.loading" (change)="stChange($event)">
</st>
</nz-card>

7
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -51,6 +51,7 @@ export class FreightConfigComponent implements OnInit {
});
}
}
this.selectedRows = [];
return requestOptions;
};
@ -166,7 +167,7 @@ export class FreightConfigComponent implements OnInit {
}
exportList() {
const params = { listSource: 1, pageSize: -1 };
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
Object.assign(params, {
...this.sf.value
@ -282,7 +283,7 @@ export class FreightConfigComponent implements OnInit {
format: item => `${item.contractSurchargeRatio}%`
},
{
title: '合同单业务量（元）',
title: '合同单业务量（万元）',
index: 'contractQuota',
width: 170,
type: 'widget',
@ -290,7 +291,7 @@ export class FreightConfigComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
},
{
title: '货源单业务量（元）',
title: '货源单业务量（万元）',
index: 'goodsQuota',
width: 170,
type: 'widget',