-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ item.freightPrice | currency }}
-
-
-
+
+
+ {{ item.freightPrice | currency }}
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.less b/src/app/routes/datatable/components/compliance/customer/customer.component.less
index 6b4b1cba..d754ef94 100644
--- a/src/app/routes/datatable/components/compliance/customer/customer.component.less
+++ b/src/app/routes/datatable/components/compliance/customer/customer.component.less
@@ -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%;
+ }
}
\ No newline at end of file
diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts
index 5d97ab42..00fefb7d 100644
--- a/src/app/routes/datatable/components/compliance/customer/customer.component.ts
+++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts
@@ -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;
}
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
index c577b27c..447d37b7 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@@ -90,7 +90,7 @@