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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-05 13:30:03 +08:00
parent 9659ca91b2
commit 0aa73e4170
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,12 +38,12 @@
<li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']"> <li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">
新增企业 新增企业
</li> </li>
<li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']"> <!-- <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
修改合伙人 修改合伙人
</li> </li>
<li nz-menu-item (click)="editSale()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-sale']"> <li nz-menu-item (click)="editSale()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-sale']">
修改渠道销售 修改渠道销售
</li> </li> -->
</ul> </ul>
</nz-dropdown-menu> </nz-dropdown-menu>
</div> </div>
@ -91,21 +91,11 @@
</div> </div>
</div> </div>
</ng-template> </ng-template>
<<<<<<< HEAD
<ng-template #extraTemplate>
<!-- <div>
=======
<!-- <ng-template #extraTemplate> <!-- <ng-template #extraTemplate>
<div> <div>
>>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e
<button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人 <button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人
</button> </button>
<button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售 <button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
</button> </button>
<<<<<<< HEAD
</div> -->
</ng-template>
=======
</div> </div>
</ng-template> --> </ng-template> -->
>>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e