Merge branch 'lxx' into 'develop'

bug修复

See merge request tms-ui/tms-obc-web!17

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -369,7 +369,7 @@
   <sv-container col="3" class="mt16">
     <sv-title>合伙人信息</sv-title>
     <sv label="合伙人名称">
-      {{partnerInfo.partnerEnterpriseName}}
+      {{partnerInfo.partnerContactName}}
     </sv>
     <sv label="手机号">
       <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit"

src/app/routes/usercenter/components/freight/list/detail/detail.component.ts

@@ -116,7 +116,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
         className: 'text-center'
       },
       { title: '修改时间', render: 'modifyTime', className: 'text-center' },
-      { title: '生效时间', render: 'effectiveTime', className: 'text-center' },
+      { title: '生效时间', index: 'effectiveTime', className: 'text-center' },
       { title: '操作人', render: 'approvalUser', className: 'text-center' },
 
     ];

src/app/routes/usercenter/components/freight/list/list.component.html

@@ -57,6 +57,9 @@
     <ng-template st-row="contacter" let-item let-index="index">
       {{ item.contacter }}<br>/{{item.mobile}}
     </ng-template>
+    <ng-template st-row="partnerName" let-item let-index="index">
+      {{ item.partnerName }}<br>/{{item.promotersTelephone}}
+    </ng-template>
     <ng-template st-row="promotersTelephone" let-item let-index="index">
       <a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone
         || '添加' }}</a>

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -424,7 +424,7 @@ export class FreightComponentsListComponent implements OnInit {
         enum: { 10: '整车发货', 20: '大宗发货' },
         width: 140
       },
-      { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+      { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 },
       { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
       { title: '客服人员', className: 'text-center', index: 'customerServiceIdLabel', width: 150 },
       { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },