fix bug
This commit is contained in:
@ -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,79 +19,92 @@ 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 };
|
||||
}
|
||||
constructor(public service: DataService, private datePipe: DatePipe) { }
|
||||
ngOnInit(): void {
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user