Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
潘晓云
@ -11,37 +11,38 @@
|
||||
<!-- 页头 -->
|
||||
<page-header-wrapper [title]="'数据报表'"></page-header-wrapper>
|
||||
<nz-card>
|
||||
<div style="display: flex;">
|
||||
<sf #sf mode="search" [schema]="searchSchema" button="none"></sf>
|
||||
<div class="chooseBox">
|
||||
<div class="timeBox">
|
||||
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
|
||||
<label nz-radio-button nzValue="year">年</label>
|
||||
<label nz-radio-button nzValue="month">月</label>
|
||||
<label nz-radio-button nzValue="date">日</label>
|
||||
<label nz-radio-button nzValue="define">自定义</label>
|
||||
</nz-radio-group>
|
||||
<div class="dateBox">
|
||||
<nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
|
||||
<nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'" [nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
|
||||
</div>
|
||||
|
||||
<div nz-row nzGutter="8">
|
||||
<div nz-col [nzXl]="24" [nzLg]="24" [nzSm]="24" [nzXs]="24">
|
||||
<sf #sf [schema]="searchSchema" button="none"
|
||||
[ui]="{ '*': { spanLabelFixed: 0, grid: { xxl:5,xl:4, lg: 8, md: 12, sm: 12, xs: 24,gutter:20 } } }"
|
||||
[compact]="true">
|
||||
<ng-template sf-template="no4" let-me let-ui="ui" let-schema="schema">
|
||||
<div class="chooseBox">
|
||||
<div class="timeBox">
|
||||
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()">
|
||||
<label nz-radio-button nzValue="year">年</label>
|
||||
<label nz-radio-button nzValue="month">月</label>
|
||||
<label nz-radio-button nzValue="date">日</label>
|
||||
<label nz-radio-button nzValue="define">自定义</label>
|
||||
</nz-radio-group>
|
||||
<div class="dateBox">
|
||||
<nz-date-picker [(ngModel)]="date" [nzMode]="mode" [nzFormat]="dateFormat" *ngIf="mode !== 'define'"
|
||||
[nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-date-picker>
|
||||
<nz-range-picker [(ngModel)]="defineDate" [nzFormat]="dateFormat" *ngIf="mode === 'define'"
|
||||
[nzDisabledDate]="disabledDate" (ngModelChange)="onChange($event)"></nz-range-picker>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</sf>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<st
|
||||
#st
|
||||
multiSort
|
||||
[scroll]="{ x: '2000px' }"
|
||||
[data]="service.$api_listCusComplianceReportPage"
|
||||
[columns]="columns"
|
||||
[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: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loading]="false"
|
||||
>
|
||||
<ng-template st-row="freightPrice" let-item let-index="index">
|
||||
{{ item.freightPrice | currency }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
<st #st multiSort [scroll]="{ x: '2000px' }" [data]="service.$api_listCusComplianceReportPage" [columns]="columns"
|
||||
[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: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
|
||||
<ng-template st-row="freightPrice" let-item let-index="index">
|
||||
{{ item.freightPrice | currency }}
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
@ -1,11 +1,20 @@
|
||||
.chooseBox{
|
||||
.chooseBox {
|
||||
display: flex;
|
||||
float : right;
|
||||
}
|
||||
.timeBox{
|
||||
|
||||
.timeBox {
|
||||
display: flex;
|
||||
margin: 0 0 0 10px;
|
||||
margin : 0 0 0 10px;
|
||||
}
|
||||
.dateBox{
|
||||
|
||||
.dateBox {
|
||||
display: inline-block;
|
||||
margin: 0 0 0 10px;
|
||||
margin : 0 0 0 10px;
|
||||
}
|
||||
|
||||
:host::ng-deep {
|
||||
.ant-form-item-control {
|
||||
max-width: 100%;
|
||||
}
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
import { SFComponent } from '@delon/form';
|
||||
/*
|
||||
* @Description :
|
||||
* @Description :
|
||||
* @Version : 1.0
|
||||
* @Author : Shiming
|
||||
* @Date : 2022-03-30 13:55:41
|
||||
@ -12,7 +12,7 @@ import { SFComponent } from '@delon/form';
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
|
||||
import { SFSchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient ,DatePipe} from '@delon/theme';
|
||||
import { ModalHelper, _HttpClient, DatePipe } from '@delon/theme';
|
||||
import { DataService } from '../../../services/data.service';
|
||||
import { differenceInCalendarDays } from 'date-fns';
|
||||
import { Placeholder } from '@angular/compiler/src/i18n/i18n_ast';
|
||||
@ -22,19 +22,18 @@ import { Placeholder } from '@angular/compiler/src/i18n/i18n_ast';
|
||||
templateUrl: './customer.component.html',
|
||||
styleUrls: ['./customer.component.less'],
|
||||
providers: [DatePipe]
|
||||
|
||||
})
|
||||
export class DatatableComplianceCustomerComponent implements OnInit {
|
||||
@ViewChild('sf', {static: false}) sf!: SFComponent
|
||||
@ViewChild('sf', { static: false }) sf!: SFComponent;
|
||||
mode = 'year';
|
||||
type = 1;
|
||||
date: any = null;
|
||||
defineDate = [];
|
||||
time: any = ['2022']
|
||||
time: any = ['2022'];
|
||||
dateFormat = 'yyyy';
|
||||
dateNext: any = null;
|
||||
modeNext = 'year';
|
||||
timeNext: any = ['2022-01-01 00:00:00']
|
||||
timeNext: any = ['2022-01-01 00:00:00'];
|
||||
today = new Date();
|
||||
searchSchema: SFSchema = {
|
||||
properties: {
|
||||
@ -71,6 +70,15 @@ export class DatatableComplianceCustomerComponent implements OnInit {
|
||||
}
|
||||
}
|
||||
},
|
||||
no4: {
|
||||
type: 'string',
|
||||
title: '',
|
||||
ui: {
|
||||
class: 'custom',
|
||||
widget: 'custom',
|
||||
grid: { xxl: 9, xl: 12, lg: 24, md: 24, sm: 24, xs: 24 }
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@ViewChild('st') private readonly st!: STComponent;
|
||||
@ -94,49 +102,52 @@ export class DatatableComplianceCustomerComponent implements OnInit {
|
||||
|
||||
];
|
||||
|
||||
constructor(private http: _HttpClient, private modal: ModalHelper,public service: DataService,private datePipe: DatePipe) { }
|
||||
/**
|
||||
constructor(private http: _HttpClient, private modal: ModalHelper, public service: DataService, private datePipe: DatePipe) {}
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
if (this.mode === 'year') {
|
||||
this.type = 1
|
||||
} else if (this.mode === 'month') {
|
||||
this.type = 2
|
||||
} else if (this.mode === 'date') {
|
||||
this.type = 3
|
||||
} else {
|
||||
this.type = 4
|
||||
}
|
||||
const params: any = Object.assign({}, this.sf?.value || {});
|
||||
params.type = this.type
|
||||
params.queryTime = this.time
|
||||
delete params._$expand;
|
||||
return { ...params };
|
||||
get reqParams() {
|
||||
if (this.mode === 'year') {
|
||||
this.type = 1;
|
||||
} else if (this.mode === 'month') {
|
||||
this.type = 2;
|
||||
} else if (this.mode === 'date') {
|
||||
this.type = 3;
|
||||
} else {
|
||||
this.type = 4;
|
||||
}
|
||||
ngOnInit(): void { }
|
||||
const params: any = Object.assign({}, this.sf?.value || {});
|
||||
params.type = this.type;
|
||||
params.queryTime = this.time;
|
||||
delete params._$expand;
|
||||
return { ...params };
|
||||
}
|
||||
ngOnInit(): void {}
|
||||
onChange(result: any) {
|
||||
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 });
|
||||
}
|
||||
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';
|
||||
}
|
||||
}
|
||||
disabledDate = (current: Date): boolean =>
|
||||
// Can not select days before today and today
|
||||
differenceInCalendarDays(current, this.today) > 0;
|
||||
// Can not select days before today and today
|
||||
differenceInCalendarDays(current, this.today) > 0;
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="orderAmount" let-item let-index="index">
|
||||
<div class="text-right">{{item?.orderAmount | currency :' '}}</div>
|
||||
<div class="text-right">{{item?.orderAmount | currency }}</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
</nz-card>
|
||||
|
||||
Reference in New Issue
Block a user