客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 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 94b4c869..61559772 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 @@ -47,7 +47,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { subscribeScoll!: Subscription; constructor( public service: PartnerListService, - private route: ActivatedRoute, + public route: ActivatedRoute, private nzModalService: NzModalService, private datePipe: DatePipe ) {} @@ -138,7 +138,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...this.detailData, isPass } }, + nzComponentParams: { info: { ...this.detailData, isPass },sourcePage:'合伙人审核详情' }, nzFooter: null }); } @@ -366,13 +366,13 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } { return { logsColumn: [ - { title: '修改后渠道销售', index: 'newChannelName', width: 180 }, - { title: '修改前渠道销售', index: 'originalChannelName', width: 160 }, + { 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: 130, type: 'date' }, - { title: '操作人', index: 'modifyUserId', width: 130 }, + { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' }, + { title: '操作人', index: 'modifyUserIdLabel', width: 180 }, { title: '操作', fixed: 'right', 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 c6da1adc..6ee8f6d5 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 @@ -113,7 +113,10 @@ export class PersonalPartnerDetailComponent implements OnInit { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...this.detailData, isPass, enterpriseName: this.detailData.adminUserInfo?.name } }, + nzComponentParams: { + info: { ...this.detailData, isPass, enterpriseName: this.detailData.adminUserInfo?.name }, + sourcePage: '合伙人审核详情' + }, nzFooter: null }); } 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 77ba94b4..582668d7 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 @@ -28,7 +28,11 @@ export class PartnerListService extends ShipperBaseService { // 查询合伙人修改渠道渠道销售记录 $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page'; // 查询客户关系列表-不分页 - $api_get_enterprice_rel_list = '/api/mdc/enterpriceRelLog/list'; + $api_get_enterprice_rel_list = '/api/mdc/EnterpriseRelLog/list'; + // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 + $api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck'; + // 渠道销售修改详情 + $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock'; diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index f1c5e073..45af1277 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -90,7 +90,7 @@ export class InvoiceRequestedComponent { return false; } let ids = item.map(row => row.id); - this.service.request(this.service.$api_reject_invoice, ids).subscribe(res => { + this.service.request(this.service.$api_reject_invoice, { id: ids, rejectContent: this.rejectReason }).subscribe(res => { if (res) { this.service.msgSrv.success('驳回成功'); modal.destroy(true); @@ -133,7 +133,7 @@ export class InvoiceRequestedComponent { this.service .request(this.service.$api_update_invoice_address, { ...component.sf.value, - + id: item.map(i => i.id) }) .subscribe(res => { if (res) { diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 9d60db0e..381791a4 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -29,7 +29,7 @@ export class ShipperBaseService extends BaseService { /** * 获取无车承运人 - * @returns + * @returns */ getCarlessCarrier() { const params = {}; @@ -267,7 +267,7 @@ export class ShipperBaseService extends BaseService { map(res => { if (res) { return res.map((m: any) => { - return { label: m.name, value: m.id }; + return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }; }); } else { return [];