Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-05-05 13:37:00 +08:00
parent bede7b0f34 7221365583
commit 6228106a10
3 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,8 +365,8 @@
<nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
</sv>
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<!-- <nz-divider></nz-divider> -->
<!-- <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>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
</sv-container> -->
<!-- <nz-divider></nz-divider> -->
<!-- <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>

6
src/app/routes/usercenter/components/freight/list/list.component.html
View File

@ -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>
@ -98,4 +98,4 @@
<button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
</button>
</div>
</ng-template> -->
</ng-template> -->

16
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -467,14 +467,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
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)
// }
]
}
];