diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html new file mode 100644 index 00000000..a9d9fe7e --- /dev/null +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html @@ -0,0 +1,13 @@ +

转移客户数：{{changeST?.total}}

+ + +

不转移客户数：{{noChangeST?.total}}

+ + +

+ 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 +

\ No newline at end of file diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts new file mode 100644 index 00000000..6fc1e963 --- /dev/null +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts @@ -0,0 +1,34 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STColumn } from '@delon/abc/st'; +import { PartnerListService } from '../../services/partner-list.service'; + +@Component({ + selector: 'app-channel-log-modal', + templateUrl: './channel-log-modal.component.html' +}) +export class ChannelLogModalComponent implements OnInit { + columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST(); + id = ''; + constructor(public service: PartnerListService, public route: ActivatedRoute) {} + + ngOnInit(): void {} + + private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } { + return { + changeColumn: [ + { title: '客户名称', index: 'payCode', width: 180 }, + { title: '合伙人', index: 'ltdName', width: 160 }, + { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, + { title: 'CRM审核状态', index: 'payDate', width: 150 }, + { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + ], + beChangeColumn: [ + { title: '客户名称', index: 'payCode', width: 180 }, + { title: '合伙人', index: 'ltdName', width: 160 }, + { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, + { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + ] + }; + } +} diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index dc271a74..041b2c1c 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -269,7 +269,6 @@ - 渠道销售信息 {{ detailData?.channelName }} @@ -282,7 +281,7 @@ 修改渠道销售记录 - @@ -317,19 +316,3 @@ - - -

转移客户数：{{changeST?.total}}

- - -

不转移客户数：{{noChangeST?.total}}

- - -

- 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 -

- \ No newline at end of file diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index b65e7695..80a9aa45 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -9,6 +9,7 @@ import { NzTreeSelectComponent } from 'ng-zorro-antd/tree-select'; import { Subscription, fromEvent } from 'rxjs'; import { PartnerListService } from '../../services/partner-list.service'; +import { ChannelLogModalComponent } from '../channel-log-modal/channel-log-modal.component'; import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component'; @Component({ @@ -18,12 +19,10 @@ import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit providers: [DatePipe] }) export class PartnerDetailComponent implements OnInit, OnDestroy { - @ViewChild('logModal') - logModal: any; @ViewChild('areaTreeSelect') areaTreeSelect!: NzTreeSelectComponent; - columns: { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST(); + columns: STColumn[] = this.initST(); detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } }; tempalateData = { ...this.detailData }; @@ -145,16 +144,6 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { }); } - showChangeDetail() { - const modal = this.nzModalService.create({ - nzTitle: '详情', - nzContent: this.logModal, - nzNoAnimation: true, - nzWidth: 700, - nzFooter: null - }); - } - ratify() { this.isEdit = true; // 搜索展开省份并选中节点 @@ -365,41 +354,26 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { }); } - private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } { - return { - logsColumn: [ - { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, - { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, - { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, - { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, - { title: '备注', index: 'remark', className: 'text-center', width: 150 }, - { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, - { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, - { - title: '操作', - fixed: 'right', - width: '140px', - buttons: [ - { - text: '详情', - click: () => this.showChangeDetail() - } - ] - } - ], - changeColumn: [ - { title: '客户名称', index: 'payCode', width: 180 }, - { title: '合伙人', index: 'ltdName', width: 160 }, - { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, - { title: 'CRM审核状态', index: 'payDate', width: 150 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } - ], - beChangeColumn: [ - { title: '客户名称', index: 'payCode', width: 180 }, - { title: '合伙人', index: 'ltdName', width: 160 }, - { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } - ] - }; + private initST(): STColumn[] { + return [ + { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, + { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, + { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, + { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, + { title: '备注', index: 'remark', className: 'text-center', width: 150 }, + { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, + { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, + { + title: '操作', + fixed: 'right', + width: '140px', + buttons: [ + { + text: '详情', + click: (item) => this.service.showChangeDetail(item.id) + } + ] + } + ]; } } diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html index b34aef70..68c93560 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html @@ -151,6 +151,25 @@ + + + 渠道销售信息 + {{ detailData?.channelName }} + {{ detailData?.channelMobile }} + {{ detailData?.bindChannelTime }} + + + + + + 修改渠道销售记录 + + + + + diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index ce1cec65..9cf0a9fe 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -21,6 +21,8 @@ export class PersonalPartnerDetailComponent implements OnInit { @ViewChild('areaTreeSelect') areaTreeSelect!: NzTreeSelectComponent; + columns: STColumn[] = this.initST(); + detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentity: { name: '' } }; tempalateData = { ...this.detailData }; @@ -35,7 +37,7 @@ export class PersonalPartnerDetailComponent implements OnInit { constructor( public service: PartnerListService, - private route: ActivatedRoute, + public route: ActivatedRoute, private nzModalService: NzModalService, private datePipe: DatePipe ) {} @@ -266,4 +268,27 @@ export class PersonalPartnerDetailComponent implements OnInit { } }); } + + private initST(): STColumn[] { + return [ + { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 }, + { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 }, + { title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 }, + { title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } }, + { title: '备注', index: 'remark', className: 'text-center', width: 150 }, + { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, + { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, + { + title: '操作', + fixed: 'right', + width: '140px', + buttons: [ + { + text: '详情', + click: (item) => this.service.showChangeDetail(item.id) + } + ] + } + ]; + } } diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts index b714c47c..22151e83 100644 --- a/src/app/routes/partner/partner-list/services/partner-list.service.ts +++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts @@ -2,6 +2,7 @@ import { Injectable, Injector } from '@angular/core'; import { BaseService, EACacheService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { ImageViewComponent } from 'src/app/shared/components/imagelist'; +import { ChannelLogModalComponent } from '../components/channel-log-modal/channel-log-modal.component'; @Injectable() export class PartnerListService extends ShipperBaseService { @@ -34,7 +35,7 @@ export class PartnerListService extends ShipperBaseService { // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck'; // 根据手机号查询实名信息 - $api_get_identityInfo_by_mobile= '/api/mdc/cuc/identityInfo/getByMobile'; + $api_get_identityInfo_by_mobile = '/api/mdc/cuc/identityInfo/getByMobile'; // 渠道销售修改详情 $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 @@ -60,4 +61,15 @@ export class PartnerListService extends ShipperBaseService { }; this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } }); } + + showChangeDetail(id: string) { + const modal = this.nzModalService.create({ + nzTitle: '详情', + nzContent: ChannelLogModalComponent, + nzComponentParams: { id }, + nzNoAnimation: true, + nzWidth: 800, + nzFooter: null + }); + } } diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index b27261c9..3255e0c1 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -62,6 +62,7 @@ import { PersonalPartnerDetailComponent } from './partner-list/components/person import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component'; import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component'; import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component'; +import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component'; const COMPONENTS: any[] = [ PartnerBusinessStatisticsIndexComponent, @@ -113,7 +114,8 @@ const COMPONENTS: any[] = [ PersonalPartnerDetailComponent, ParterAdviceFeedbackListComponent, ParterAdviceFeedbackDetailComponent, - ParterRebateManageMentAddPartnerListComponent + ParterRebateManageMentAddPartnerListComponent, + ChannelLogModalComponent ]; @NgModule({