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

Merge branch 'lxx' into 'develop'

Browse Source 
Lxx

See merge request tms-ui/tms-obc-web!7
This commit is contained in:
刘孝星
2022-04-08 17:47:34 +08:00
parent 54ef73b6db 466d6b4b5e
commit 96cda6be32
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,11 +130,22 @@ export class DatatableDriverComponent implements OnInit {
if(result === null) { if(result === null) {
return return
} }
if (this.mode === 'year') { // 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')
// }
if(this.mode === 'year') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy')] this.queryTime = [this.datePipe.transform(this.date, 'yyyy')]
} else if (this.mode === 'month') { } else if(this.mode === 'month') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM')] this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM')]
} else if(this.mode === 'date') {
this.queryTime = [this.datePipe.transform(this.date, 'yyyy-MM-dd')]
} else{
this.queryTime = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd'), this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd')]
} }
this.st.reload({ ...this.reqParams }); this.st.reload({ ...this.reqParams });
} }
disabledDate = (current: Date): boolean => disabledDate = (current: Date): boolean =>