From 571de29199713f6dba2f3046e75ad10a410c4181 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 23 Mar 2022 17:19:13 +0800 Subject: [PATCH] edit --- proxy.conf.js | 2 +- .../recharge-record.component.ts | 4 ++-- .../voucher-management.component.ts | 2 +- .../index/partner-list.component.html | 22 +++++-------------- .../index/partner-list.component.ts | 22 ++++++++++++++----- .../services/partner-list.service.ts | 2 ++ .../services/business/shipper-base.service.ts | 21 ++++++++++++++++++ 7 files changed, 49 insertions(+), 26 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 4bbb04a9..2e5e2a0e 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index 68d41919..c73b8833 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -92,7 +92,7 @@ export class RechargeRecordComponent implements OnInit { format: 'yyyy-MM-dd' } as SFDateWidgetSchema }, - rechargeName: { + roleName: { type: 'string', title: '账户名称', ui: { @@ -162,7 +162,7 @@ export class RechargeRecordComponent implements OnInit { { title: '网络货运人', index: 'ltdName', width: 160 }, { title: '银行类型', index: 'bankTypeLabel', width: 100 }, { title: '账户类型', index: 'accountTypeLabel', width: 100 }, - { title: '账户名称', index: 'rechargeName', width: 160 }, + { title: '账户名称', index: 'roleName', width: 160 }, { title: '虚拟账户', index: 'virtualAccount', width: 100 }, { title: '充值金额', diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index c1b17c1b..4509f291 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -311,7 +311,7 @@ export class VoucherManagementComponent implements OnInit { { title: '帐套', index: 'ltdId', width: 200, format: item => `${item.vcltdcode}-${item.vcltdname}` }, { title: '凭证时间', index: 'vctime', type: 'date', width: 200 }, { title: '凭证类型', index: 'vctype', width: 200 }, - { title: '序号', index: 'invmoney', width: 200, format: _ => '1' }, + // { title: '序号', index: 'invmoney', width: 200, format: _ => '1' }, { title: '摘要', index: 'remarks', width: 300 }, { title: '币种', index: 'currency', width: 100 }, { 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 f2f058ee..4d21c024 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 @@ -51,8 +51,7 @@ 张三/13999999999 - - + @@ -60,20 +59,11 @@

已选（0）

- - - - - 客户名称 - - - - - - {{ data.name }} - - - + + 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 eaa21889..5b5c457e 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 @@ -30,15 +30,12 @@ export class PartnerListComponent { @ViewChild('editCannel', { static: true }) editCannel: any; customers: any[] = []; + cannels: any[] = []; selectItem: any = {}; constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) { - this.service.getRebateConfig().subscribe(res => { - if (res) { - this.customers = res; - } - }); + this.loadSelectOptions(); } beforeReq = (requestOptions: STRequestOptions) => { @@ -52,6 +49,19 @@ export class PartnerListComponent { return requestOptions; }; + loadSelectOptions(){ + this.service.getRebateConfig().subscribe(res => { + if (res) { + this.customers = res; + } + }); + this.service.getChannel().subscribe(res => { + if (res) { + this.customers = res; + } + }); + } + auditPartner(item: any) { const modal = this.nzModalService.create({ nzTitle: '审核', @@ -371,7 +381,7 @@ export class PartnerListComponent { { title: '操作', fixed: 'right', - width: '140px', + width: '150px', buttons: [ { type: 'divider' }, { 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 b8d83d54..77ba94b4 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 @@ -27,6 +27,8 @@ export class PartnerListService extends ShipperBaseService { $api_resend_crm = '/api/mdc/partner/reSendCrm'; // 查询合伙人修改渠道渠道销售记录 $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page'; + // 查询客户关系列表-不分页 + $api_get_enterprice_rel_list = '/api/mdc/enterpriceRelLog/list'; // 冻结/启用企业业 $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 fe96b8a0..9d60db0e 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -21,6 +21,8 @@ export class ShipperBaseService extends BaseService { $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`; // 获取全部返佣配置 $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`; + // 获取渠道销售管理集合 + $api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`; constructor(public injector: Injector) { super(injector); } @@ -254,4 +256,23 @@ export class ShipperBaseService extends BaseService { }) ); } + + /** + * 获取渠道销售管理集合 + * @returns + */ + getChannel() { + const params = {}; + return this.request(this.$api_get_channel, params, 'POST').pipe( + map(res => { + if (res) { + return res.map((m: any) => { + return { label: m.name, value: m.id }; + }); + } else { + return []; + } + }) + ); + } }