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

Merge branch 'develop'

Browse Source
This commit is contained in:
wangshiming
2022-05-09 13:50:36 +08:00
parent 8208c792f5 cd9ec05afb
commit 19b844db04
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
View File

@ -213,11 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent {
className: 'text-center', className: 'text-center',
index: 'paymentMethodRate', index: 'paymentMethodRate',
width: 130, width: 130,
<<<<<<< HEAD
format: record => `${(record.paymentMethodRate*100).toFixed(2)}%` format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
=======
format: record => `${record.paymentMethodRate * 100}%`
>>>>>>> b6b51c9a662efd271b713242c077a04c199ed167
}, },
{ title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' }, { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
{ title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' }, { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },

4
src/app/routes/usercenter/components/freight/list/list.component.html
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>

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

@ -469,14 +469,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)
} // }
] ]
} }
]; ];