Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
wangshiming
2022-03-25 10:53:45 +08:00
3 changed files with 18 additions and 8 deletions

View File

@ -355,19 +355,27 @@
</sv>
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt-md">
<sv-title>服务评级
<ng-container *ngIf="billEvaluateList?.length===0">(暂无评级)</ng-container>
</sv-title>
<sv [label]="item.evaluateTypeLabel" *ngFor="let item of billEvaluateList">
<nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
</sv>
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-title>合伙人信息</sv-title>
<sv label="合伙人名称">
<input nz-input type="text" [(ngModel)]="partnerInfo.partnerEnterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
{{partnerInfo.partnerEnterpriseName}}
</sv>
<sv label="手机号">
<input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
<sv label="管理员">
<input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
<!-- <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
</sv>
<sv label="绑定时间">
<input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"

View File

@ -34,7 +34,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
ltdId: any = [];
roles: any = [];
customerServices: any = [];
billEvaluateList: any = [];
approvalOpinion = '';
networkTransporter = null;
roleId = null;
@ -90,6 +90,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
this.scrollTop = document.documentElement.scrollTop;
});
}
/**
* 初始化数据列表
*/
@ -202,6 +203,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => {
if (billEvaluate) {
this.billEvaluate = billEvaluate.totalScore;
this.billEvaluateList = res;
}
});
}

View File

@ -715,15 +715,15 @@ export class FreightComponentsListNewComponent implements OnInit {
}
},
promotersTelephone: {
title: '推广业务员手机号',
title: '邀请码',
type: 'string',
minLength: 1,
format: 'mobile',
maxLength: 11,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
placeholder: '请输入推广业务员手机号',
errors: { required: '请输入推广业务员手机号', format: '手机号格式错误' }
placeholder: '请输入邀请码',
errors: { required: '请输入邀请码', format: '手机号格式错误' }
}
},
networkTransporter: {