Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-11 13:40:55 +08:00
parent 1f203d1360
commit 7553aa7cbf
3 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -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
},

43
src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html
View File

@ -1,12 +1,39 @@
<h2>转移客户数：{{changeST?.total}}</h2>
<st #changeST [data]="service.$api_get_partner_change_list" [columns]="columns.changeColumn"
[req]="{params:{id:id ,type:1}}" [loading]="service.http.loading" bordered size="small"
[page]="{ show: false }" [scroll]="{ x: '750px' }">
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-28 20:27:08
* @LastEditors : Shiming
* @LastEditTime : 2022-05-11 13:40:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<h2>转移客户数：{{ changeST?.total }}</h2>
<st
#changeST
[data]="service.$api_get_partner_change_list"
[columns]="columns.changeColumn"
[req]="{ params: { id: id, type: 1 } }"
[loading]="service.http.loading"
bordered
size="small"
[page]="{ show: false }"
[scroll]="{ x: '750px' }"
>
</st>
<h2>不转移客户数：{{noChangeST?.total}}</h2>
<st #noChangeST [data]="service.$api_get_partner_change_list" [columns]="columns.beChangeColumn"
[req]="{params:{id:id ,type:2}}" [res]="{reName: { list: 'data' }}"
[loading]="service.http.loading" bordered size="small" [page]="{ show: false }" [scroll]="{ x: '750px' }">
<h2>不转移客户数：{{ noChangeST?.total }}</h2>
<st
#noChangeST
[data]="service.$api_get_partner_change_list"
[columns]="columns.beChangeColumn"
[req]="{ params: { id: id, type: 2 } }"
[res]="{ reName: { list: 'data' } }"
[loading]="service.http.loading"
bordered
size="small"
[page]="{ show: false }"
[scroll]="{ x: '750px' }"
>
</st>
<p>
客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。

26
src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts
View File

@ -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 }
]
};
}