diff --git a/proxy.conf.js b/proxy.conf.js index e90106bb..b1279fb3 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 10:12:55 + * @LastEditTime : 2022-05-11 13:29:32 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,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/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 index a9d9fe7e..c98cb372 100644 --- 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 @@ -1,13 +1,40 @@ -
- 客户转移:客户跟着上级合伙人转移一并到新渠道销售下,会同步发起CRM《客户转移》流程;不转移的,客户会与上级合伙人解绑,修改成功后,修改时间也是合伙人与客户的结算结束时间,成为原来渠道销售的直客。 -
\ No newline at end of file + 客户转移:客户跟着上级合伙人转移一并到新渠道销售下,会同步发起CRM《客户转移》流程;不转移的,客户会与上级合伙人解绑,修改成功后,修改时间也是合伙人与客户的结算结束时间,成为原来渠道销售的直客。 + 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 index 3f838c47..c081235d 100644 --- 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 @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-05-09 10:49:35 + * @LastEditors : Shiming + * @LastEditTime : 2022-05-11 13:40:11 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit } from '@angular/core'; import { STColumn } from '@delon/abc/st'; import { PartnerListService } from '../../services/partner-list.service'; @@ -16,17 +26,17 @@ export class ChannelLogModalComponent implements OnInit { 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: '客户名称', index: 'enterpriceName', width: 180 }, + { title: '合伙人', index: 'enterpriseName', width: 160 }, + { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 }, { title: 'CRM审核状态', index: 'payDate', width: 150 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + { title: '生效时间', index: 'effectiveTime', 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 } + { title: '客户名称', index: 'enterpriceName', width: 180 }, + { title: '合伙人', index: 'enterpriseName', width: 160 }, + { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 }, + { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 } ] }; }