Merge branch 'develop'

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' },

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>

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)
+          // }
         ]
       }
     ];