From e59ecb9335c86314b8f5f8c2e4d622f6d5e241fa Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 5 May 2022 13:28:49 +0800
Subject: [PATCH 1/2] fix bug

---
 .../freight/list/detail/detail.component.html    | 15 +++++++--------
 .../components/freight/list/list.component.html  |  4 ++--
 .../components/freight/list/list.component.ts    | 16 ++++++++--------
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 9da6addd..74f169b5 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -366,7 +366,7 @@
     </sv>
   </sv-container>
   <nz-divider></nz-divider>
-  <sv-container col="3" class="mt16">
+  <!-- <sv-container col="3" class="mt16">
     <sv-title>合伙人信息</sv-title>
     <sv label="合伙人名称">
       {{partnerInfo.partnerContactName}}
@@ -376,8 +376,7 @@
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="管理员">
-      <!-- <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
-        [placeholder]="isEdit?'':'-'"> -->
+    
     </sv>
     <sv label="绑定时间">
       <input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit"
@@ -387,9 +386,9 @@
       <input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'">
     </sv>
-  </sv-container>
+  </sv-container> -->
   <nz-divider></nz-divider>
-  <sv-container col="3" class="mt16">
+  <!-- <sv-container col="3" class="mt16">
     <sv-title>渠道销售信息</sv-title>
     <sv label="姓名">
       <input nz-input type="text" [(ngModel)]="partnerInfo.channelName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@@ -403,9 +402,9 @@
       <input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
-  </sv-container>
+  </sv-container> -->
 </nz-card>
-<nz-card>
+<!-- <nz-card>
   <nz-tabset>
     <nz-tab nzTitle="修改合伙人记录">
       <st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
@@ -432,7 +431,7 @@
       </st>
     </nz-tab>
   </nz-tabset>
-</nz-card>
+</nz-card> -->
 <ng-template #PopconfirmTempalte let-title="title" let-content="content">
   <div class="ant-popover-message">
     <i nz-icon nzType="info-circle" nzTheme="fill"></i>
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 f62797c1..e65d6c7a 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -79,10 +79,10 @@
   </div>
 </ng-template>
 <ng-template #extraTemplate>
-  <div>
+  <!-- <div>
     <button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人
     </button>
     <button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
     </button>
-  </div>
+  </div> -->
 </ng-template>
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 d7d5860c..249824d0 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -503,14 +503,14 @@ export class FreightComponentsListComponent implements OnInit {
             text: '分配客服人员',
             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)
+          // }
         ]
       }
     ];

From 0aa73e41708b72e11affd81465197721b7229555 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 5 May 2022 13:30:03 +0800
Subject: [PATCH 2/2] fix bug

---
 .../components/freight/list/list.component.html    | 14 ++------------
 1 file changed, 2 insertions(+), 12 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 1d72cb95..a26b9fd2 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -38,12 +38,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>
@@ -91,21 +91,11 @@
     </div>
   </div>
 </ng-template>
-<<<<<<< HEAD
-<ng-template #extraTemplate>
-  <!-- <div>
-=======
 <!-- <ng-template #extraTemplate>
   <div>
->>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e
     <button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人
     </button>
     <button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
     </button>
-<<<<<<< HEAD
-  </div> -->
-</ng-template>
-=======
   </div>
 </ng-template> -->
->>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e