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

fix bug

Browse Source
This commit is contained in:
Lingzi
2022-04-02 15:49:24 +08:00
parent 05cb535943
commit 422fe61a53
28 changed files with 275 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
View File

@ -21,7 +21,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listPerformanceReportPage"
[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] }" [loading]="false"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
</nz-card>
<nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>

2
src/app/routes/datatable/components/busitable/mantable/mantable.component.html
View File

@ -22,7 +22,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
[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] }" [loading]="false"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
</nz-card>
<nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>

3
src/app/routes/datatable/components/customtable/customindex/customindex.component.html
View File

@ -39,7 +39,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
[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] }" [loading]="false"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
</nz-card>
<nz-card nzTitle="用户新增报表" [nzExtra]="extraTemplate">
<ng-template #extraTemplate>
@ -55,4 +55,5 @@
</div>
</div>
</ng-template>
<app-operation-curve #curve [chartData]="chartData.lineChart"></app-operation-curve>
</nz-card>

1
src/app/routes/datatable/components/customtable/customindex/customindex.component.ts
View File

@ -23,6 +23,7 @@ export class DatatableCustomindexComponent implements OnInit {
dateNext: any = null;
modeNext = 'year';
timeNext: any = ['2022-01-01 00:00:00']
chartData: any;
columns: STColumn[] = [

5
src/app/routes/datatable/components/customtable/driver/driver.component.html
View File

@ -38,8 +38,9 @@
</div>
</div>
</ng-template>
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listDriverReportPage"
[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] }" [loading]="false"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
</st>
</nz-card>

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

@ -1,7 +1,7 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { DatePipe, _HttpClient } from '@delon/theme';
import { DatePipe, _HttpClient } from '@delon/theme';
import { differenceInCalendarDays } from 'date-fns';
import { DataService } from '../../../services/data.service';
@ -19,42 +19,48 @@ export class DatatableDriverComponent implements OnInit {
mode = 'year';
date: any = null;
defineDate = [];
time: any = ['2022-01-01 00:00:00']
queryTime: any = ''
dateFormat = 'yyyy-MM-dd';
today = new Date();
ui: SFUISchema = {};
schema: SFSchema = {};
columns: STColumn[] = [
{ title: '司机姓名', index: 'networkTransporterName', className: 'text-center' },
{ title: '手机号', index: 'zsl', className: 'text-center' },
{ title: '注册时间', index: 'yingsje', className: 'text-center' },
{ title: '司机状态', index: 'cys', className: 'text-center' },
{ title: '运单数', index: 'yingfyf', className: 'text-center' },
{ title: '待接单运单', index: 'yl', className: 'text-center' },
{ title: '已完成运单', index: 'djd', className: 'text-center' },
{ title: '运费金额', index: 'ysz', className: 'text-center' },
{ title: '已收运费金额', index: 'yswc', className: 'text-center' },
{ title: '待收运费金额', index: 'yisje', className: 'text-center' }
{ title: '司机姓名', index: 'driverName', className: 'text-center' },
{ title: '手机号', index: 'driverPhone', className: 'text-center' },
{ title: '注册时间', index: 'driverRegisterTime', className: 'text-center' },
{
title: '司机状态', index: 'driverStatus', className: 'text-center', type: 'enum', enum: {
0: '未激活',
1: '活跃',
2: '沉默',
3: '流失',
}
},
{ title: '运单数', index: 'wbAllCount', className: 'text-center' },
{ title: '待接单运单', index: 'wbWaitCount', className: 'text-center' },
{ title: '已完成运单', index: 'wbOverCount', className: 'text-center' },
{ title: '运费金额', index: 'wbAllAmount', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.wbAllAmount }) } },
{ title: '已收运费金额', index: 'wbGetAmount', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.wbGetAmount }) } },
{ title: '待收运费金额', index: 'wbWaitAmount', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.wbWaitAmount }) } },
];
/**
* 查询参数
*/
get reqParams() {
if(this.mode === 'year') {
get reqParams() {
if (this.mode === 'year') {
this.type = 1
} else if(this.mode === 'month') {
} else if (this.mode === 'month') {
this.type = 2
} else if(this.mode === 'date') {
} else if (this.mode === 'date') {
this.type = 3
} else {
this.type = 4
}
let params: any = {
time: this.time,
type: this.type,
queryTime: this.queryTime,
...this.sf?.value
};
};
delete params._$expand;
return { ...params };
@ -63,35 +69,42 @@ export class DatatableDriverComponent implements OnInit {
ngOnInit(): void {
this.initSF();
}
/**
* 初始化查询表单
*/
/**
* 初始化查询表单
*/
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: {
driverName: {
type: 'string',
title: '司机姓名',
ui: {
placeholder: '请输入',
}
},
resourceCode: {
driverPhone: {
type: 'string',
title: '手机号',
ui: {
placeholder: '请选择',
}
},
loadingPlace: {
driverStatus: {
type: 'string',
title: '司机状态',
ui: {
widget: 'select',
placeholder: '请选择',
}
},
enum: [
{ label: '未激活', value: 0 },
{ label: '活跃', value: 1 },
{ label: '沉默', value: 2 },
{ label: '流失', value: 3 },
]
},
createTime: {
driverRegisterTime: {
title: '注册时间',
type: 'string',
ui: {
@ -105,24 +118,18 @@ export class DatatableDriverComponent implements OnInit {
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
}
changeData(){
if(this.mode === 'year') {
changeData() {
if (this.mode === 'year') {
this.dateFormat = 'yyyy'
} else if(this.mode === 'month') {
} else if (this.mode === 'month') {
this.dateFormat = 'yyyy-MM'
} else {
this.dateFormat = 'yyyy-MM-dd'
}
}
onChange(result: any) {
if(this.mode === 'year') {
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']
} else if(this.mode === 'date') {
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']
if (this.mode === 'year') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy')]
} else if (this.mode === 'month') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM')]
}
this.st.reload({ ...this.reqParams });
}
@ -130,25 +137,25 @@ export class DatatableDriverComponent implements OnInit {
// Can not select days before today and today
differenceInCalendarDays(current, this.today) > 0;
export() {
// this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {});
}
export() {
// this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {});
}
search() {
this.st?.load(1)
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
/**
* 重置表单
*/
resetSF() {
resetSF() {
this.sf.reset();
this._$expand = false;
}

3
src/app/routes/datatable/components/customtable/owner/owner.component.html
View File

@ -41,5 +41,6 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listShipperReportPage"
[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] }" [loading]="false"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">>
</st>
</nz-card>

34
src/app/routes/datatable/components/customtable/owner/owner.component.ts
View File

@ -26,33 +26,33 @@ export class DatatableOwnerComponent implements OnInit {
schema: SFSchema = {};
columns: STColumn[] = [
{ title: '货主名称', index: 'enterpriseName', className: 'text-center' },
{ title: '注册时间', index: 'registerTime', className: 'text-center' },
{ title: '客户类型', index: 'customerType', className: 'text-center', type: 'enum', enum: {
{ 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' },
{ title: '合伙人', index: 'partnerName', className: 'text-center' },
{ title: '客户状态', index: 'customerStatus', className: 'text-center', type: 'enum', enum: {
{ 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' },
{ title: '订单金额', index: 'ddje', className: 'text-center' },
{ title: '应收订单数', index: 'ysdds', className: 'text-center' },
{ title: '应收金额', index: 'yingsje', className: 'text-center' },
{ title: '待开票订单数', index: 'yifyf', className: 'text-center' },
{ title: '待开票金额', index: 'dkpdds', className: 'text-center' },
{ title: '已收金额', render: 'yisje', className: 'text-center' },
{ title: '应收附加费', index: 'yingsfjf', className: 'text-center' },
{ title: '已收附加费', index: 'yisfjf', className: 'text-center' },
{ title: '附加费率', index: 'fjfl', className: 'text-center' },
{ title: '已开票金额', index: 'ykpje', className: 'text-center' }
{ 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 }) } },
];
/**
* 查询参数

2
src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
View File

@ -37,7 +37,7 @@
<st #st multiSort bordered [data]="service.$api_listOperationalReportPage" [columns]="columns" [ps]="20"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
</st>
</nz-card>

72
src/app/routes/datatable/components/datascreen/datascreen.component.html Normal file
View File

@ -0,0 +1,72 @@
<!-- 页头 -->
<!-- <page-header-wrapper [title]="'运营报表'"></page-header-wrapper> -->
<div nz-row [nzGutter]="16">
<div nz-col class="gutter-row" [nzSpan]="8">
<nz-card nzTitle="2022全年交易情况">
<nz-row [nzGutter]="16">
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'成交额'"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'结算额'"></nz-statistic>
</nz-col>
</nz-row>
<nz-row [nzGutter]="16">
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'订单数'"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
</nz-col>
</nz-row>
</nz-card>
<nz-card nzTitle="本月交易趋势">
</nz-card>
<nz-card nzTitle="实时货源">
<st #st multiSort bordered [columns]="columns" [ps]="20" [data]="service.$api_listShipperReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
</st>
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="8">
<div>
</div>
<nz-card nzTitle="本月发货量排名">
</nz-card>
</div>
<div nz-col class="gutter-row" [nzSpan]="8">
<nz-card nzTitle="今日交易情况">
<nz-row [nzGutter]="16">
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'订单数'"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'有效订单'"></nz-statistic>
</nz-col>
</nz-row>
<nz-row [nzGutter]="16">
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(1949101 | number)!" [nzTitle]="'运输金额(元)'"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="12">
<nz-statistic [nzValue]="(2019.111 | number: '1.0-2')!" [nzTitle]="'货物吞吐(吨)'"></nz-statistic>
</nz-col>
</nz-row>
</nz-card>
<nz-card nzTitle="本月运营质量监测">
</nz-card>
<nz-card nzTitle="实时运单风控">
<st #st multiSort bordered [columns]="orderColumns" [ps]="20" [data]="service.$api_listShipperReportPage"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
</st>
</nz-card>
</div>
</div>

8
src/app/routes/datatable/components/datascreen/datascreen.component.less Normal file
View File

@ -0,0 +1,8 @@
:host{
::ng-deep {
.ant-statistic-content-value{
color: #399ffd;
font-weight: bold;
}
}
}

24
src/app/routes/datatable/components/datascreen/datascreen.component.spec.ts Normal file
View File

@ -0,0 +1,24 @@
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { DatatableDatascreenComponent } from './datascreen.component';
describe('DatatableDatascreenComponent', () => {
let component: DatatableDatascreenComponent;
let fixture: ComponentFixture<DatatableDatascreenComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ DatatableDatascreenComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(DatatableDatascreenComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

57
src/app/routes/datatable/components/datascreen/datascreen.component.ts Normal file
View File

@ -0,0 +1,57 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import { SFSchema } from '@delon/form';
import { ModalHelper, _HttpClient } from '@delon/theme';
import { DataService } from '../../services/data.service';
@Component({
selector: 'app-datatable-datascreen',
templateUrl: './datascreen.component.html',
styleUrls: ['./datascreen.component.less']
})
export class DatatableDatascreenComponent implements OnInit {
@ViewChild('st') private readonly st!: STComponent;
@ViewChild('orderSt') private readonly orderSt!: STComponent;
columns: STColumn[] = [];
orderColumns!: STColumn[];
constructor(public service: DataService) { }
/**
* 查询参数
*/
get reqOrderParams() {
const params = {
}
return { ...params };
}
get reqParams() {
const params = {
}
return { ...params };
}
ngOnInit(): void {
this.initST()
this.initOrderST()
}
/**
* 初始化数据列表
*/
initST() {
this.columns = [
{ title: '序号', index: 'carNo', className: 'text-center' },
{ title: '发货地', index: 'carNoColorLabel', className: 'text-center' },
{ title: '卸货地', index: 'carModelLabel', className: 'text-center' },
{ title: '货物', index: 'carStatus', className: 'text-center'},
{ title: '数量', index: 'approvalStatus', className: 'text-center' },
];
}
initOrderST() {
this.columns = [
{ title: '运单号', index: 'carNo', className: 'text-center' },
{ title: '货主', index: 'carNoColorLabel', className: 'text-center' },
{ title: '时间', index: 'carModelLabel', className: 'text-center' },
{ title: '风险等级', index: 'carStatus', className: 'text-center'}
];
}
}

2
src/app/routes/datatable/components/financetable/financetable.component.html
View File

@ -23,7 +23,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listFinancialReportPage"
[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] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="czcgje" let-item let-index="index">
{{item.czcgje | currency}}
</ng-template>

10
src/app/routes/datatable/components/operationtable/operationtable.component.html
View File

@ -23,7 +23,7 @@
<st #st multiSort [columns]="columns" [ps]="20" [data]="service.$api_listOperationalReportPage"
[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] }" [loading]="false"></st>
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"></st>
</nz-card>
<nz-card nzTitle="运营报表" [nzExtra]="extraTemplate01">
<ng-template #extraTemplate01>
@ -44,17 +44,9 @@
</ng-template>
<div nz-row [nzGutter]="64">
<div nz-col class="gutter-row" [nzSpan]="12">
<!-- <div class="title">
<div class="box" style="background-color: #3ba1ff;"></div> 环比(%)
</div> -->
<!-- <g2-custom delay="100" (render)="render($event)"></g2-custom> -->
<!-- <app-busitable-curve></app-busitable-curve> -->
<app-operation-curve #curve [chartData]="chartData.lineChart"></app-operation-curve>
</div>
<div nz-col class="gutter-row" [nzSpan]="12">
<!-- <div class="title">
<div class="box" style="background-color: #f59a23;"></div> 业绩量(元)
</div> -->
<app-operation-pillar #pillar [chartData]="chartData.histogram"></app-operation-pillar>
</div>
</div>

4
src/app/routes/datatable/components/operationtable/pie/pie.component.html
View File

@ -2,5 +2,7 @@
<nz-select [(ngModel)]="enterpriseInfoIdPie" style="width: 200px" (ngModelChange)="initData()">
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of interManlist"></nz-option>
</nz-select>
<g2-custom delay="100" (render)="render($event)"></g2-custom>
<div class="box">
<g2-custom delay="100" (render)="render($event)"></g2-custom>
</div>
</nz-card>

4
src/app/routes/datatable/datatable-routing.module.ts
View File

@ -17,6 +17,7 @@ import { DatatablePartnertableComponent } from './components/customtable/partner
import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component';
import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component';
import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component';
import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component';
const routes: Routes = [
{ path: 'dataindex', component: DatatableDataindexComponent },
@ -36,7 +37,8 @@ const routes: Routes = [
{ path: 'busitable/busiindex', component: DatatableBusiindexComponent },
{ path: 'busitable/mantable', component: DatatableMantableComponent },
{ path: 'reporting/fund', component: DatatableFundReportingComponent },
{ path: 'fund-info', component: DatatableReportingFundInfoComponent }];
{ path: 'fund-info', component: DatatableReportingFundInfoComponent },
{ path: 'datascreen', component: DatatableDatascreenComponent }];
@NgModule({

5
src/app/routes/datatable/datatable.module.ts
View File

@ -26,6 +26,7 @@ import { BusitableCurveComponent } from './components/busitable/busiindex/curve/
import { OperationPillarComponent } from './components/operationtable/pillar/pillar.component';
import { OperationCurveComponent } from './components/operationtable/curve/curve.component';
import { FinanceTableCurveComponent } from './components/financetable/curve/curve.component';
import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component';
const COMPONENTS: Type<void>[] = [
DatatableDataindexComponent,
@ -54,8 +55,8 @@ const COMPONENTS: Type<void>[] = [
OperationPillarComponent,
OperationCurveComponent,
DatatableReportingFundInfoComponent,
FinanceTableCurveComponent
]
FinanceTableCurveComponent,
DatatableDatascreenComponent]
@NgModule({

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

@ -42,6 +42,8 @@ export class DataService extends BaseService {
// 查询货主报表
$api_listShipperReportPage = `/api/sdc/report/listShipperReportPage`;
// 司机报表
$api_listDriverReportPage = `/api/sdc/report/listDriverReportPage`;
constructor(public injector: Injector) {
super(injector);

2
src/app/routes/download/components/list/list.component.html
View File

@ -8,6 +8,6 @@
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false">
[loading]="service.http.loading">
</st>
</nz-card>

2
src/app/routes/financial-management/components/platform-account/platform-account.component.html
View File

@ -53,7 +53,7 @@
<nz-card class="content-box">
<st #st [data]="service.$api_get_platform_account_page" [columns]="columns" [req]="{ process: beforeReq }"
[page]="{}" [scroll]="{ x: '1200px' }" [loading]="false">
[page]="{}" [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
</st>
<div class="total-footer text-md" *ngIf="st?.list?.length !== 0 ">
合计 <label class="text-red-dark">{{ static?.total }}</label> 项，收入

2
src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
View File

@ -33,7 +33,7 @@
</div>
<st #st [data]="info?.faShowVOList" [columns]="columns" [footer]="footerTpl" bordered
[scroll]="{ x:'1200px',y: '420px' }" [page]="{ show: false }" [loading]="false">
[scroll]="{ x:'1200px',y: '420px' }" [page]="{ show: false }" [loading]="service.http.loading">
<ng-template #footerTpl let-s>
<ng-container *ngIf="st.count > 0">
<div style="display: flex;justify-content: flex-end;">

2
src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html
View File

@ -23,7 +23,7 @@
</div>
<st #st [data]="info?.faShowVOList" [columns]="columns" [footer]="footerTpl" bordered
[scroll]="{ x:'1200px',y: '420px' }" [page]="{ show: false }" [loading]="false">
[scroll]="{ x:'1200px',y: '420px' }" [page]="{ show: false }" [loading]="service.http.loading">
<ng-template #footerTpl let-s>
<ng-container *ngIf="st.count > 0">
<div style="display: flex;justify-content: flex-end;">

2
src/app/routes/tax-management/components/individual-income/individual-income.component.html
View File

@ -36,7 +36,7 @@
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_individual_income_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="orderStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
<span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>

2
src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
View File

@ -38,7 +38,7 @@
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_individual_income_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="orderStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a>
<span *ngIf="item?.billStatus !== '2'">{{item?.billStatusLabel}}</span>

2
src/app/routes/usercenter/components/driver/driver.component.html
View File

@ -40,7 +40,7 @@
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false">
[loading]="service.http.loading">
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">{{ item.promotersTelephone || '添加' }}</a>
</ng-template>

4
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -409,7 +409,7 @@
<st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParamsCar }"
[res]="{ reName: { list: 'data'} }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
[loading]="false">
[loading]="service.http.loading">
<ng-template st-row="remark" let-item let-index="index">
<span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span>
<span *ngIf="item.remark === null">--</span>
@ -420,7 +420,7 @@
<st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="false">
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">
<ng-template st-row="remark" let-item let-index="index">
<span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span>
<span *ngIf="item.remark === null">--</span>

2
src/app/routes/usercenter/components/freight/user/user.component.html
View File

@ -39,7 +39,7 @@
<!-- [data]="service.$api_get_supplier_page" -->
<st #st [columns]="columns" [data]='service.$api_get_user_list' [req]="{ process: beforeReq }"
[scroll]="{ x:'1200px',y: '400px' }" [page]="{ }" [loading]="false">
[scroll]="{ x:'1200px',y: '400px' }" [page]="{ }" [loading]="service.http.loading">
<ng-template st-row="enterpriseName" let-item let-index="index">
<div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
<div