From 5b95e6416f367e4e0399182c893b75c4bc7cd087 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 25 Mar 2022 16:01:23 +0800 Subject: [PATCH] edit --- proxy.conf.js | 2 +- .../freight-account.component.ts | 2 +- .../services/freight-account.service.ts | 2 + .../index/partner-list.component.html | 5 +- .../index/partner-list.component.less | 0 .../index/partner-list.component.ts | 46 +++++++++++++------ .../partner-audit-modal.component.ts | 10 ++-- .../partner-detail.component.html | 20 ++++---- .../partner-detail.component.ts | 12 ++--- .../personal-partner-detail.component.ts | 5 +- .../services/partner-list.service.ts | 6 ++- .../services/business/shipper-base.service.ts | 4 +- 12 files changed, 72 insertions(+), 42 deletions(-) delete mode 100644 src/app/routes/partner/partner-list/components/index/partner-list.component.less diff --git a/proxy.conf.js b/proxy.conf.js index 67c15ee2..10071e14 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 2309923a..610f1efe 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit { } exportList() { - this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 }); + this.service.asyncExport({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_shipper); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 65b1abe1..99477de7 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -42,6 +42,8 @@ export class FreightAccountService extends ShipperBaseService { // 货主端获取账户余额交易明细 $api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage'; + // 运营端导出货主账户明细信息 + $api_export_shipper = '/api/fcc/accountBalance/reportShipperAccountBalanceByOperator'; // 查询订单支付申请表 $api_get_order_payment_page = '/api/fcc/billPaymentApplicationOBC/list/page'; diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.html b/src/app/routes/partner/partner-list/components/index/partner-list.component.html index 4d21c024..9439bc2a 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.html +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.html @@ -33,7 +33,7 @@
- {{selectItem?.enterpriseName}} + {{selectItem?.enterpriseName || selectItem?.contactName}} @@ -62,7 +62,8 @@ + ]" [req]="{ process: beforeReq,params:{effectiveStatus:2 ,newPartnerId:selectItem.id} }" + [loading]="service.http.loading" [page]="{show:false}"> diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.less b/src/app/routes/partner/partner-list/components/index/partner-list.component.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 5b5c457e..cc275ba8 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -49,7 +49,7 @@ export class PartnerListComponent { return requestOptions; }; - loadSelectOptions(){ + loadSelectOptions() { this.service.getRebateConfig().subscribe(res => { if (res) { this.customers = res; @@ -57,7 +57,7 @@ export class PartnerListComponent { }); this.service.getChannel().subscribe(res => { if (res) { - this.customers = res; + this.cannels = res; } }); } @@ -66,13 +66,14 @@ export class PartnerListComponent { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName } }, + nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName },sourcePage:'合伙人审核列表' }, nzFooter: null }); } editTemplateAction(item: any) { this.selectItem = item; + this.templateId = item.templateId || null; const modal = this.nzModalService.create({ nzTitle: '修改返佣模板', nzContent: this.editTemplate, @@ -87,7 +88,7 @@ export class PartnerListComponent { }); } - confirmEditTemplate() { + private confirmEditTemplate() { const modal = this.nzModalService.confirm({ nzTitle: '确定要修改返佣模板吗？', nzOnOk: () => { @@ -108,16 +109,21 @@ export class PartnerListComponent { } editCannelAction(item: any) { - this.selectItem = item; - const modal = this.nzModalService.create({ - nzTitle: '修改渠道销售', - nzWidth: 650, - nzContent: this.editCannel, - nzOnOk: () => { - this.confirmEditCannel(item); - return false; + // 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改 + this.service.request(this.service.$api_check_partenr_change_channel,{id:item.id}).subscribe(res=>{ + if(res){ + this.selectItem = item; + const modal = this.nzModalService.create({ + nzTitle: '修改渠道销售', + nzWidth: 650, + nzContent: this.editCannel, + nzOnOk: () => { + this.confirmEditCannel(item); + return false; + } + }); } - }); + }) } confirmEditCannel(item: any) { @@ -321,7 +327,12 @@ export class PartnerListComponent { private initST(): STColumn[] { return [ - { title: '合伙人名称', index: 'enterpriseName', width: 180, format: item => `${item.enterpriseName || item.contactName}` }, + { + title: '合伙人名称', + index: 'enterpriseName', + width: 180, + format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '') + }, { title: '付款编码', index: 'payCode', width: 160 }, { title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 }, { title: '企业管理员', index: 'contactName', width: 150 }, @@ -386,6 +397,7 @@ export class PartnerListComponent { { type: 'divider' }, { text: '详情', + iif: item => item.id, click: item => { if (item.partnerType === 1) { this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]); @@ -396,19 +408,23 @@ export class PartnerListComponent { }, { text: '审核
', + iif: item => item.id, click: item => this.auditPartner(item) }, { text: '修改返佣模板', + iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', + iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', - click: item => this.reSendCRM(item) + click: item => item.id && this.reSendCRM(item), + iif: item => item.crmStatus === 10 } ] } diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 8c2586a8..6e271d70 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -14,6 +14,7 @@ export class PartnerAuditModalComponent implements OnInit { @Input() info: any; schema!: SFSchema; + sourcePage = ''; constructor(private nzModalService: NzModalService, public service: PartnerListService) {} ngOnInit(): void { @@ -53,13 +54,11 @@ export class PartnerAuditModalComponent implements OnInit { channelId: { title: '渠道销售', type: 'string', - enum: [ - { value: true, label: '通过' }, - { value: false, label: '驳回' } - ], ui: { widget: 'select', placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getChannel(), hidden: this.info.isPass === false, visibleIf: { status: value => value @@ -115,7 +114,8 @@ export class PartnerAuditModalComponent implements OnInit { .request(this.service.$api_audit_partner, { auditStatusEnum: params.auditStatusEnum, id: params.id, - approvalOpinion: params.approvalOpinion + approvalOpinion: params.approvalOpinion, + sourcePage: this.sourcePage }) .subscribe(res => { if (res) { 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 777d019f..98adf913 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 @@ -125,7 +125,8 @@ [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar"> - - + 修改渠道销售记录 + [req]="{params:{partnerId:route.snapshot.params.id}}" [loading]="service.http.loading" bordered size="small" + [page]="{ show: false }" [scroll]="{ x: '1200px' }"> @@ -316,13 +318,15 @@ -

转移客户数：10

- +

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

+ -

不转移客户数：10

- +

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

+

客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起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/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 [];