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-04-18 16:56:20 +08:00
parent 4068a3ece2
commit 582ea2d3fa
7 changed files with 133 additions and 149 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-04-14 14:40:51
* @LastEditTime : 2022-04-18 16:40:52
* @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
},

17
src/app/routes/datatable/components/compliance/salesman/salesman.component.html
View File

@ -4,22 +4,18 @@
* @Author : Shiming
* @Date : 2022-03-30 17:57:46
* @LastEditors : Shiming
* @LastEditTime : 2022-04-18 16:11:00
* @LastEditTime : 2022-04-18 16:37:41
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\salesman\\salesman.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 页头 -->
<page-header-wrapper [title]="'业务员报告'"></page-header-wrapper>
<nz-card >
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'客户'"></nz-tab>
<nz-tab [nzTitle]="'合伙人'"></nz-tab>
</nz-tabset>
<page-header-wrapper [title]="'业务员-合规报告'"></page-header-wrapper>
<nz-card [nzExtra]="extraTemplate">
<ng-template #extraTemplate>
<div class="chooseBox">
<div class="timeBox">
<sf #sf [schema]="searchSchema" button="none"
[ui]="{ '*': { spanLabelFixed: 0, grid: { xxl:5,xl:4, lg: 8, md: 12, sm: 12, xs: 24,gutter:20 } } }"
[ui]="{ '*': { spanLabelFixed: 0, grid: { xxl:4,xl:4, lg: 4, md: 4, sm: 4, xs: 4,gutter:4 } } }"
[compact]="true">
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
<div class="chooseBox">
@ -41,9 +37,8 @@
</ng-template>
</sf>
</div>
</div>
</ng-template>
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listShipperReportPage"
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listPartComplianceReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">

5
src/app/routes/datatable/components/compliance/salesman/salesman.component.less
View File

@ -1,7 +1,4 @@
.chooseBox {
display: flex;
float : right;
}
.timeBox {
display: flex;

66
src/app/routes/datatable/components/compliance/salesman/salesman.component.ts
View File

@ -29,11 +29,11 @@ export class DatatableComplianceSalesmanComponent implements OnInit {
isLoading: boolean = false;
searchSchema: SFSchema = {
properties: {
customerName: {
department: {
type: 'string',
title: '',
ui: {
placeholder: '请输入客户名称',
placeholder: '请选择部门',
change: (value: any) => {
console.log(value);
this.st.reload({ ...this.reqParams });
@ -41,11 +41,22 @@ export class DatatableComplianceSalesmanComponent implements OnInit {
},
},
salesmanName: {
customerName: {
type: 'string',
title: '',
ui: {
placeholder: '请输入业务员',
change: (value: any) => {
console.log(value);
this.st.reload({ ...this.reqParams });
}
},
},
salesmanName: {
type: 'string',
title: '',
ui: {
placeholder: '请输入客户名称',
change: (value: any) => {
this.st.reload({ ...this.reqParams });
}
@ -57,39 +68,21 @@ export class DatatableComplianceSalesmanComponent implements OnInit {
ui: {
class: 'custom',
widget: 'custom',
grid: { xxl: 12, xl: 12, lg: 24, md: 24, sm: 24, xs: 24 }
grid: { xxl: 12, xl: 12, lg: 12, md: 12, sm: 12, xs: 12 }
}
}
}
};
columns: STColumn[] = [
{ title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' },
{ title: '注册时间', index: 'registerTime', className: 'text-center', width: '200px' },
{ title: '客户类型', index: 'customerType', className: 'text-center', width: '100px', type: 'enum', enum: {
1: '平台客户',
2: '直客',
3: '渠道客户'
}
},
{ title: '业务员', index: 'salesmanName', className: 'text-center', width: '100px' },
{ title: '合伙人', index: 'partnerName', className: 'text-center', width: '100px' },
{ title: '客户状态', index: 'customerStatus', className: 'text-center', width: '100px', type: 'enum', enum: {
1: '未激活',
2: '沉默',
3: '流失',
4: '活跃'
} },
{ title: '订单数', index: 'zsl', className: 'text-center', width: '100px' },
{ title: '订单金额', index: 'ddje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ddje }) } },
{ title: '应收订单数', index: 'ysdds', className: 'text-center', width: '120px' },
{ title: '应收金额', index: 'yingsje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yingsje }) } },
{ title: '待开票订单数', index: 'yifyf', className: 'text-center', width: '130px' },
{ title: '待开票金额', index: 'dkpdds', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dkpdds }) } },
{ title: '已收金额', index: 'yisje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisje }) } },
{ title: '应收附加费', index: 'yingsfjf', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yingsfjf }) } },
{ title: '已收附加费', index: 'yisfjf', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } },
{ title: '附加费率', index: 'fjfl', className: 'text-center', width: '100px' },
{ title: '已开票金额', index: 'ykpje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } },
};
columns: STColumn[] = [
{ title: '部门', index: 'department', className: 'text-center', width: '200px' },
{ title: '业务员', index: 'salesmen', className: 'text-center', width: '100px' },
{ title: '客户数', index: 'cusCount', className: 'text-right', width: '100px', },
{ title: '订单数', index: 'billCount', className: 'text-center', width: '120px' },
{ title: '订单合格率', index: 'billComPer', className: 'text-right', width: '100px',format: (item: any) => {return ((item?.billComPer)*100).toFixed(2) + '%' }},
{ title: '付款及时率', index: 'payTimePer', className: 'text-center', width: '130px',format: (item: any) => {return ((item?.payTimePer)*100).toFixed(2) + '%'  } },
{ title: '货源单占比', index: 'goodResPer', className: 'text-right', width: '120px',format: (item: any) => {return ((item?.goodResPer)*100).toFixed(2) + '%'  } },
{ title: '运费直付占比', index: 'feightPayPer', className: 'text-right', width: '100px', format: (item: any) => {return ((item?.feightPayPer)*100).toFixed(2) + '%'  } },
];
/**
* 查询参数
@ -223,11 +216,4 @@ export class DatatableComplianceSalesmanComponent implements OnInit {
this._$expand = false;
this.isLoading = true
}
selectChange(e: number) {
// this.resourceStatus = e;
// this.initST();
setTimeout(() => {
this.st.load();
}, 500);
}
}

4
src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-30 17:57:46
* @LastEditors : Shiming
* @LastEditTime : 2022-04-18 16:12:19
* @LastEditTime : 2022-04-18 16:45:14
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\mancustomtable\\mancustomtable.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -43,7 +43,7 @@
</div>
</div>
</ng-template>
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listShipperReportPage"
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listPartBusinessReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }">

109
src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts
View File

@ -5,7 +5,6 @@ import { DatePipe, _HttpClient } from '@delon/theme';
import { differenceInCalendarDays } from 'date-fns';
import { DataService } from '../../../services/data.service';
@Component({
selector: 'app-datatable-mancustomtable',
templateUrl: './mancustomtable.component.html',
@ -21,7 +20,7 @@ export class DatatableMancustomtableComponent implements OnInit {
mode = 'year';
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
time: any = ['2022-01-01 00:00:00'];
dateFormat = 'yyyy';
today = new Date();
ui: SFUISchema = {};
@ -38,8 +37,7 @@ export class DatatableMancustomtableComponent implements OnInit {
console.log(value);
this.st.reload({ ...this.reqParams });
}
},
}
},
salesmanName: {
type: 'string',
@ -63,46 +61,44 @@ export class DatatableMancustomtableComponent implements OnInit {
}
};
columns: STColumn[] = [
{ title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' },
{ title: '注册时间', index: 'registerTime', className: 'text-center', width: '200px' },
{ title: '客户类型', index: 'customerType', className: 'text-center', width: '100px', type: 'enum', enum: {
1: '平台客户',
2: '直客',
3: '渠道客户'
}
{ title: '部门', index: 'enterpriseName', className: 'text-center', width: '200px' },
{ title: '业务员', index: 'registerTime', className: 'text-center', width: '200px' },
{ title: '已认证货主数', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '新增合伙人', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '合伙人活跃率', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '主动合伙人', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '纪念合伙人', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '流失合伙人', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '未搭档合伙人', index: 'customerType', className: 'text-center', width: '100px' },
{ title: '新增货主数', index: 'salesmanName', className: 'text-center', width: '100px' },
{ title: '货主活跃率', index: 'partnerName', className: 'text-center', width: '100px' },
{
title: '活跃货主数',
index: 'customerStatus',
className: 'text-center',
width: '100px'
},
{ title: '业务员', index: 'salesmanName', className: 'text-center', width: '100px' },
{ title: '合伙人', index: 'partnerName', className: 'text-center', width: '100px' },
{ title: '客户状态', index: 'customerStatus', className: 'text-center', width: '100px', type: 'enum', enum: {
1: '未激活',
2: '沉默',
3: '流失',
4: '活跃'
} },
{ title: '订单数', index: 'zsl', className: 'text-center', width: '100px' },
{ title: '订单金额', index: 'ddje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ddje }) } },
{ title: '应收订单数', index: 'ysdds', className: 'text-center', width: '120px' },
{ title: '应收金额', index: 'yingsje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yingsje }) } },
{ title: '待开票订单数', index: 'yifyf', className: 'text-center', width: '130px' },
{ title: '待开票金额', index: 'dkpdds', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dkpdds }) } },
{ title: '已收金额', index: 'yisje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisje }) } },
{ title: '应收附加费', index: 'yingsfjf', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yingsfjf }) } },
{ title: '已收附加费', index: 'yisfjf', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } },
{ title: '附加费率', index: 'fjfl', className: 'text-center', width: '100px' },
{ title: '已开票金额', index: 'ykpje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } },
{ title: '纪念货主数', index: 'zsl', className: 'text-center', width: '100px' },
{
title: '货货主数',
index: 'ddje',
className: 'text-right',
width: '100px',
},
{ title: '未激活货主数', index: 'ysdds', className: 'text-center', width: '120px' }
];
/**
* 查询参数
*/
get reqParams() {
if (this.mode === 'year') {
this.type = 1
this.type = 1;
} else if (this.mode === 'month') {
this.type = 2
this.type = 2;
} else if (this.mode === 'date') {
this.type = 3
this.type = 3;
} else {
this.type = 4
this.type = 4;
}
let params: any = {
time: this.time,
@ -128,7 +124,7 @@ export class DatatableMancustomtableComponent implements OnInit {
type: 'string',
title: '货主名称',
ui: {
placeholder: '请输入',
placeholder: '请输入'
}
},
customerType: {
@ -136,12 +132,12 @@ export class DatatableMancustomtableComponent implements OnInit {
title: '客户类型',
ui: {
widget: 'select',
placeholder: '请选择',
placeholder: '请选择'
},
enum: [
{ label: '直客', value: 2 },
{ label: '渠道客户', value: 3 },
{label: '平台客户', value: 1},
{ label: '平台客户', value: 1 }
]
},
customerStatus: {
@ -149,23 +145,26 @@ export class DatatableMancustomtableComponent implements OnInit {
title: '客户状态',
ui: {
widget: 'select',
placeholder: '请选择',
placeholder: '请选择'
},
enum: [
{ label: '未激活', value: 1 },
{ label: '沉默', value: 2 },
{ label: '流失', value: 3 },
{label: '活跃', value: 4},
{ label: '活跃', value: 4 }
]
},
registerTime: {
title: '注册时间',
type: 'string',
ui: {
widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
widget: 'sl-from-to',
type: 'date',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
},
type: 'object'
@ -174,25 +173,28 @@ export class DatatableMancustomtableComponent implements OnInit {
}
changeData() {
if (this.mode === 'year') {
this.dateFormat = 'yyyy'
this.dateFormat = 'yyyy';
} else if (this.mode === 'month') {
this.dateFormat = 'yyyy-MM'
this.dateFormat = 'yyyy-MM';
} else {
this.dateFormat = 'yyyy-MM-dd'
this.dateFormat = 'yyyy-MM-dd';
}
}
onChange(result: any) {
if (result === null) {
return
return;
}
if (this.mode === 'year') {
this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00']
this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'];
} else if (this.mode === 'month') {
this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00']
this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'];
} else if (this.mode === 'date') {
this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00']
this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'];
} else {
this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00']
this.time = [
this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00',
this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'
];
}
this.st.reload({ ...this.reqParams });
}
@ -204,8 +206,7 @@ export class DatatableMancustomtableComponent implements OnInit {
// this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {});
}
search() {
this.st?.load(1)
this.st?.load(1);
}
/**
* 伸缩查询条件
@ -221,7 +222,7 @@ export class DatatableMancustomtableComponent implements OnInit {
resetSF() {
this.sf.reset();
this._$expand = false;
this.isLoading = true
this.isLoading = true;
}
selectChange(e: number) {
// this.resourceStatus = e;

7
src/app/routes/datatable/services/data.service.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-27 10:30:56
* @LastEditors : Shiming
* @LastEditTime : 2022-04-15 16:03:46
* @LastEditTime : 2022-04-18 16:37:20
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\services\\data.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -88,6 +88,11 @@ export class DataService extends BaseService {
// 客户-合规报表
$api_listCusComplianceReportPage = `/api/sdc/report/listCusComplianceReportPage`;
// 查询业务员报表-客户、合伙人
$api_listPartBusinessReportPage = `/api/sdc/report/listPartBusinessReportPage`;
// 业务员-合规报表
$api_listPartComplianceReportPage = `/api/sdc/report/listPartComplianceReportPage`;
constructor(public injector: Injector) {