Merge branch 'develop'

This commit is contained in:
wangshiming
2022-05-07 15:04:23 +08:00
2 changed files with 10 additions and 10 deletions

View File

@ -46,12 +46,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>

View File

@ -473,14 +473,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
text: '分配客服<br>', text: '分配客服<br>',
click: item => this.showService(item) click: item => this.showService(item)
}, },
{ // {
text: '修改合伙人', // text: '修改合伙人',
click: item => this.editPartner(item) // click: item => this.editPartner(item)
}, // },
{ // {
text: '修改渠道销售', // text: '修改渠道销售',
click: item => this.editSale(item) // click: item => this.editSale(item)
} // }
] ]
} }
]; ];