Merge branch 'develop'

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-09 15:14:15
+ * @LastEditTime : 2022-05-09 16:37:26
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

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: '修改合伙人',
+          //   text: '修改合伙人',
-            click: item => this.editPartner(item)
+          //   click: item => this.editPartner(item)
-          },
+          // },
-          {
+          // {
-            text: '修改渠道销售',
+          //   text: '修改渠道销售',
-            click: item => this.editSale(item)
+          //   click: item => this.editSale(item)
-          }
+          // }
         ]
       }
     ];