From 82169c54e1b4139a70a1b2166c575fdea6666614 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 18 Apr 2022 09:53:08 +0800 Subject: [PATCH 1/2] edit --- .../customer/customer.component.html | 64 +++++++------- .../customer/customer.component.less | 13 +-- .../compliance/customer/customer.component.ts | 86 +++++++++++-------- 3 files changed, 90 insertions(+), 73 deletions(-) diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html index 91c993cd..72e8b283 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.html +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -11,35 +11,39 @@ - -
-
- - - - - - -
- - -
- +
+
+ + +
+
+ + + + + + +
+ + +
+
+
+ +
- - - {{ 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..6946d442 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,14 @@ -.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; } \ 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 72bd8ee4..48adcd1a 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'; @@ -21,19 +21,18 @@ import { differenceInCalendarDays } from 'date-fns'; 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: { @@ -49,13 +48,22 @@ export class DatatableComplianceCustomerComponent implements OnInit { type: 'string', title: '合伙人名称' }, + no4: { + type: 'string', + title: '', + ui: { + class: 'text-right', + widget: 'custom', + grid: { xxl: 9, xl: 24, lg: 24, md: 24, sm: 24, xs: 24 } + } + } } }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = [ - { title: '公司名称', index: 'enterpriseName' ,}, - { title: '注册时间', index: 'registerTime' }, - { title: '客户类型', width: '100px', index: 'customerType' }, + { title: '公司名称', index: 'enterpriseName' }, + { title: '注册时间', index: 'registerTime' }, + { title: '客户类型', width: '100px', index: 'customerType' }, { title: '业务员', index: 'salesmanName' }, { title: '合伙人', index: 'partnerName' }, { title: '订单数', index: 'billCounts' }, @@ -68,53 +76,55 @@ export class DatatableComplianceCustomerComponent implements OnInit { { title: '运费代收单数', index: 'freightRepPayCounts' }, { title: '手机直付', index: 'updatedAt' }, { title: '汇款单数', index: 'updatedAt' }, - { title: '及时付款', index: 'timelyPayPer' }, - + { title: '及时付款', index: 'timelyPayPer' } ]; - 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; } From f6084ea1e6d3707b753b0eccda6f7025d79c0f81 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 18 Apr 2022 10:09:04 +0800 Subject: [PATCH 2/2] edit --- .../components/order-reporting/order-reporting.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@
-
{{item?.orderAmount | currency :' '}}
+
{{item?.orderAmount | currency }}