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

Merge branch 'lxx' into 'develop'

Browse Source 
bug修复

See merge request tms-ui/tms-obc-web!17
This commit is contained in:
刘孝星
2022-04-25 09:15:14 +08:00
parent b8415bbac5 7b7a145e1f
commit 8bf7b29a6a
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,7 +369,7 @@
<sv-container col="3" class="mt16"> <sv-container col="3" class="mt16">
<sv-title>合伙人信息</sv-title> <sv-title>合伙人信息</sv-title>
<sv label="合伙人名称"> <sv label="合伙人名称">
{{partnerInfo.partnerEnterpriseName}} {{partnerInfo.partnerContactName}}
</sv> </sv>
<sv label="手机号"> <sv label="手机号">
<input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit" <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit"

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

@ -116,7 +116,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
className: 'text-center' className: 'text-center'
}, },
{ title: '修改时间', render: 'modifyTime', className: 'text-center' }, { title: '修改时间', render: 'modifyTime', className: 'text-center' },
{ title: '生效时间', render: 'effectiveTime', className: 'text-center' }, { title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', render: 'approvalUser', className: 'text-center' }, { title: '操作人', render: 'approvalUser', className: 'text-center' },
]; ];

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

@ -57,6 +57,9 @@
<ng-template st-row="contacter" let-item let-index="index"> <ng-template st-row="contacter" let-item let-index="index">
{{ item.contacter }}<br>/{{item.mobile}} {{ item.contacter }}<br>/{{item.mobile}}
</ng-template> </ng-template>
<ng-template st-row="partnerName" let-item let-index="index">
{{ item.partnerName }}<br>/{{item.promotersTelephone}}
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index"> <ng-template st-row="promotersTelephone" let-item let-index="index">
<a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone <a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone
|| '添加' }}</a> || '添加' }}</a>

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

@ -424,7 +424,7 @@ export class FreightComponentsListComponent implements OnInit {
enum: { 10: '整车发货', 20: '大宗发货' }, enum: { 10: '整车发货', 20: '大宗发货' },
width: 140 width: 140
}, },
{ title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 }, { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
{ title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
{ title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 }, { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },