From 456c24e79da0bd98ab5dc845a447caff1319b30c Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 9 May 2022 13:47:02 +0800
Subject: [PATCH 1/2] fix bug

---
 .../components/billing-order/billing-order.component.ts       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
index aceeaac5..beaf5437 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@@ -213,11 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent {
         className: 'text-center',
         index: 'paymentMethodRate',
         width: 130,
-<<<<<<< HEAD
         format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
-=======
-        format: record => `${record.paymentMethodRate * 100}%`
->>>>>>> b6b51c9a662efd271b713242c077a04c199ed167
       },
       { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
       { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },

From cd9ec05afba0b9ac0172e33bf056cb21e91dd1e0 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 9 May 2022 13:50:27 +0800
Subject: [PATCH 2/2] fix bug

---
 .../components/freight/list/list.component.html  |  4 ++--
 .../components/freight/list/list.component.ts    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index afdba959..d8652768 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -46,12 +46,12 @@
           <li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">
             新增企业
           </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 nz-menu-item (click)="editSale()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-sale']">
             修改渠道销售
-          </li>
+          </li> -->
         </ul>
       </nz-dropdown-menu>
     </div>
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 020eb8c4..8ec7d565 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -469,14 +469,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
             text: '分配客服<br>',
             click: item => this.showService(item)
           },
-          {
-            text: '修改合伙人',
-            click: item => this.editPartner(item)
-          },
-          {
-            text: '修改渠道销售',
-            click: item => this.editSale(item)
-          }
+          // {
+          //   text: '修改合伙人',
+          //   click: item => this.editPartner(item)
+          // },
+          // {
+          //   text: '修改渠道销售',
+          //   click: item => this.editSale(item)
+          // }
         ]
       }
     ];