Merge branch 'lxx' into 'develop'

Lxx

See merge request tms-ui/tms-obc-web!19
This commit is contained in:
刘孝星
2022-04-26 16:08:47 +08:00

View File

@ -33,7 +33,7 @@
</div> </div>
</div> </div>
</nz-card> </nz-card>
<nz-card [nzExtra]="extraTemplate" > <nz-card [nzExtra]="extraTemplate">
<!-- 数据列表 --> <!-- 数据列表 -->
<!-- [data]="service.$api_get_supplier_page" --> <!-- [data]="service.$api_get_supplier_page" -->
@ -58,11 +58,13 @@
{{ item.contacter }}<br>/{{item.mobile}} {{ item.contacter }}<br>/{{item.mobile}}
</ng-template> </ng-template>
<ng-template st-row="partnerName" let-item let-index="index"> <ng-template st-row="partnerName" let-item let-index="index">
{{ item.partnerName }}<br>/{{item.promotersTelephone}} {{ item.partnerName }}<br>/{{item.partnerMobile}}
</ng-template> </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.channelName
|| '添加' }}</a> }}<br>{{ item.channelMobile
|| '添加' }}</a> -->
{{ item.channelName }}<br>{{ item.channelMobile }}
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>
@ -78,7 +80,9 @@
</ng-template> </ng-template>
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人 </button> <button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人
<button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售 </button> </button>
<button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
</button>
</div> </div>
</ng-template> </ng-template>