From 422fe61a5398a5525fa849ef1f1f8bc0cbdc1d26 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Sat, 2 Apr 2022 15:49:24 +0800 Subject: [PATCH] fix bug --- .../busiindex/busiindex.component.html | 2 +- .../mantable/mantable.component.html | 2 +- .../customindex/customindex.component.html | 3 +- .../customindex/customindex.component.ts | 1 + .../customtable/driver/driver.component.html | 5 +- .../customtable/driver/driver.component.ts | 119 +++++++++--------- .../customtable/owner/owner.component.html | 3 +- .../customtable/owner/owner.component.ts | 34 ++--- .../partnertable/partnertable.component.html | 2 +- .../datascreen/datascreen.component.html | 72 +++++++++++ .../datascreen/datascreen.component.less | 8 ++ .../datascreen/datascreen.component.spec.ts | 24 ++++ .../datascreen/datascreen.component.ts | 57 +++++++++ .../financetable/financetable.component.html | 2 +- .../operationtable.component.html | 10 +- .../operationtable/pie/pie.component.html | 4 +- .../datatable/datatable-routing.module.ts | 4 +- src/app/routes/datatable/datatable.module.ts | 5 +- .../routes/datatable/services/data.service.ts | 2 + .../components/list/list.component.html | 2 +- .../platform-account.component.html | 2 +- .../voucher-detail.component.html | 2 +- .../summary-detail.component.html | 2 +- .../individual-income.component.html | 2 +- .../order-reporting.component.html | 2 +- .../components/driver/driver.component.html | 2 +- .../freight/list/detail/detail.component.html | 4 +- .../freight/user/user.component.html | 2 +- 28 files changed, 275 insertions(+), 104 deletions(-) create mode 100644 src/app/routes/datatable/components/datascreen/datascreen.component.html create mode 100644 src/app/routes/datatable/components/datascreen/datascreen.component.less create mode 100644 src/app/routes/datatable/components/datascreen/datascreen.component.spec.ts create mode 100644 src/app/routes/datatable/components/datascreen/datascreen.component.ts diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html index 234c748e..226a063f 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html @@ -21,7 +21,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.html b/src/app/routes/datatable/components/busitable/mantable/mantable.component.html index 88d2016b..f27c532e 100644 --- a/src/app/routes/datatable/components/busitable/mantable/mantable.component.html +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.html @@ -22,7 +22,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index 1b5b0a1f..336b018c 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -39,7 +39,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> @@ -55,4 +55,5 @@ + \ No newline at end of file diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts index d8b85955..a57fc908 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -23,6 +23,7 @@ export class DatatableCustomindexComponent implements OnInit { dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] + chartData: any; columns: STColumn[] = [ diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.html b/src/app/routes/datatable/components/customtable/driver/driver.component.html index bd6e93bb..2a904a7b 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.html +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.html @@ -38,8 +38,9 @@ - + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> + \ No newline at end of file diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.ts b/src/app/routes/datatable/components/customtable/driver/driver.component.ts index 6932fd0b..1e4fa345 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -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; } diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.html b/src/app/routes/datatable/components/customtable/owner/owner.component.html index 35c64a0e..64c1f376 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.html +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.html @@ -41,5 +41,6 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading">> + \ No newline at end of file diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index a7d178f8..d8873755 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -26,33 +26,33 @@ export class DatatableOwnerComponent implements OnInit { schema: SFSchema = {}; columns: STColumn[] = [ - { title: '货主名称', index: 'enterpriseName', className: 'text-center' }, - { title: '注册时间', index: 'registerTime', className: 'text-center' }, - { title: '客户类型', index: 'customerType', className: 'text-center', type: 'enum', enum: { + { title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' }, + { title: '注册时间', index: 'registerTime', className: 'text-center', width: '200px' }, + { title: '客户类型', index: 'customerType', className: 'text-center', width: '100px', type: 'enum', enum: { 1: '平台客户', 2: '直客', 3: '渠道客户' } }, - { title: '业务员', index: 'salesmanName', className: 'text-center' }, - { title: '合伙人', index: 'partnerName', className: 'text-center' }, - { title: '客户状态', index: 'customerStatus', className: 'text-center', type: 'enum', enum: { + { title: '业务员', index: 'salesmanName', className: 'text-center', width: '100px' }, + { title: '合伙人', index: 'partnerName', className: 'text-center', width: '100px' }, + { title: '客户状态', index: 'customerStatus', className: 'text-center', width: '100px', type: 'enum', enum: { 1: '未激活', 2: '沉默', 3: '流失', 4: '活跃' } }, - { title: '订单数', index: 'zsl', className: 'text-center' }, - { title: '订单金额', index: 'ddje', className: 'text-center' }, - { title: '应收订单数', index: 'ysdds', className: 'text-center' }, - { title: '应收金额', index: 'yingsje', className: 'text-center' }, - { title: '待开票订单数', index: 'yifyf', className: 'text-center' }, - { title: '待开票金额', index: 'dkpdds', className: 'text-center' }, - { title: '已收金额', render: 'yisje', className: 'text-center' }, - { title: '应收附加费', index: 'yingsfjf', className: 'text-center' }, - { title: '已收附加费', index: 'yisfjf', className: 'text-center' }, - { title: '附加费率', index: 'fjfl', className: 'text-center' }, - { title: '已开票金额', index: 'ykpje', className: 'text-center' } + { title: '订单数', index: 'zsl', className: 'text-center', width: '100px' }, + { title: '订单金额', index: 'ddje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ddje }) } }, + { title: '应收订单数', index: 'ysdds', className: 'text-center', width: '120px' }, + { title: '应收金额', index: 'yingsje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yingsje }) } }, + { title: '待开票订单数', index: 'yifyf', className: 'text-center', width: '130px' }, + { title: '待开票金额', index: 'dkpdds', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dkpdds }) } }, + { title: '已收金额', index: 'yisje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisje }) } }, + { title: '应收附加费', index: 'yingsfjf', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yingsfjf }) } }, + { title: '已收附加费', index: 'yisfjf', className: 'text-right', width: '120px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } }, + { title: '附加费率', index: 'fjfl', className: 'text-center', width: '100px' }, + { title: '已开票金额', index: 'ykpje', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } }, ]; /** * 查询参数 diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html index e5937465..06f5211d 100644 --- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html @@ -37,7 +37,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html new file mode 100644 index 00000000..feaea5b6 --- /dev/null +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -0,0 +1,72 @@ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ +
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
\ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.less b/src/app/routes/datatable/components/datascreen/datascreen.component.less new file mode 100644 index 00000000..9bca0f81 --- /dev/null +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.less @@ -0,0 +1,8 @@ +:host{ + ::ng-deep { + .ant-statistic-content-value{ + color: #399ffd; + font-weight: bold; + } + } +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.spec.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.spec.ts new file mode 100644 index 00000000..78be800e --- /dev/null +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableDatascreenComponent } from './datascreen.component'; + +describe('DatatableDatascreenComponent', () => { + let component: DatatableDatascreenComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableDatascreenComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableDatascreenComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts new file mode 100644 index 00000000..3b403985 --- /dev/null +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -0,0 +1,57 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { DataService } from '../../services/data.service'; + +@Component({ + selector: 'app-datatable-datascreen', + templateUrl: './datascreen.component.html', + styleUrls: ['./datascreen.component.less'] +}) +export class DatatableDatascreenComponent implements OnInit { + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('orderSt') private readonly orderSt!: STComponent; + columns: STColumn[] = []; + orderColumns!: STColumn[]; + constructor(public service: DataService) { } + + /** + * 查询参数 + */ + get reqOrderParams() { + const params = { + + } + return { ...params }; + } + get reqParams() { + const params = { + } + return { ...params }; + } + ngOnInit(): void { + this.initST() + this.initOrderST() + } + /** +* 初始化数据列表 +*/ + initST() { + this.columns = [ + { title: '序号', index: 'carNo', className: 'text-center' }, + { title: '发货地', index: 'carNoColorLabel', className: 'text-center' }, + { title: '卸货地', index: 'carModelLabel', className: 'text-center' }, + { title: '货物', index: 'carStatus', className: 'text-center'}, + { title: '数量', index: 'approvalStatus', className: 'text-center' }, + ]; + } + initOrderST() { + this.columns = [ + { title: '运单号', index: 'carNo', className: 'text-center' }, + { title: '货主', index: 'carNoColorLabel', className: 'text-center' }, + { title: '时间', index: 'carModelLabel', className: 'text-center' }, + { title: '风险等级', index: 'carStatus', className: 'text-center'} + ]; + } +} diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html index a25ffb3f..0b45f7f2 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.html +++ b/src/app/routes/datatable/components/financetable/financetable.component.html @@ -23,7 +23,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> {{item.czcgje | currency}} diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.html b/src/app/routes/datatable/components/operationtable/operationtable.component.html index eb11b8ba..532ed1b3 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.html +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.html @@ -23,7 +23,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> @@ -44,17 +44,9 @@
- - -
-
diff --git a/src/app/routes/datatable/components/operationtable/pie/pie.component.html b/src/app/routes/datatable/components/operationtable/pie/pie.component.html index c7a478c5..373a4b03 100644 --- a/src/app/routes/datatable/components/operationtable/pie/pie.component.html +++ b/src/app/routes/datatable/components/operationtable/pie/pie.component.html @@ -2,5 +2,7 @@ - +
+ +
\ No newline at end of file diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index b309be67..8298fdf5 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -17,6 +17,7 @@ import { DatatablePartnertableComponent } from './components/customtable/partner import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component'; import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component'; import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component'; +import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component'; const routes: Routes = [ { path: 'dataindex', component: DatatableDataindexComponent }, @@ -36,7 +37,8 @@ const routes: Routes = [ { path: 'busitable/busiindex', component: DatatableBusiindexComponent }, { path: 'busitable/mantable', component: DatatableMantableComponent }, { path: 'reporting/fund', component: DatatableFundReportingComponent }, - { path: 'fund-info', component: DatatableReportingFundInfoComponent }]; + { path: 'fund-info', component: DatatableReportingFundInfoComponent }, + { path: 'datascreen', component: DatatableDatascreenComponent }]; @NgModule({ diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index 2929d78c..11e7780f 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -26,6 +26,7 @@ import { BusitableCurveComponent } from './components/busitable/busiindex/curve/ import { OperationPillarComponent } from './components/operationtable/pillar/pillar.component'; import { OperationCurveComponent } from './components/operationtable/curve/curve.component'; import { FinanceTableCurveComponent } from './components/financetable/curve/curve.component'; +import { DatatableDatascreenComponent } from './components/datascreen/datascreen.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -54,8 +55,8 @@ const COMPONENTS: Type[] = [ OperationPillarComponent, OperationCurveComponent, DatatableReportingFundInfoComponent, - FinanceTableCurveComponent -] + FinanceTableCurveComponent, + DatatableDatascreenComponent] @NgModule({ diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index 5dd77204..1a6782eb 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -42,6 +42,8 @@ export class DataService extends BaseService { // 查询货主报表 $api_listShipperReportPage = `/api/sdc/report/listShipperReportPage`; + // 司机报表 + $api_listDriverReportPage = `/api/sdc/report/listDriverReportPage`; constructor(public injector: Injector) { super(injector); diff --git a/src/app/routes/download/components/list/list.component.html b/src/app/routes/download/components/list/list.component.html index f9d4d323..40d662a6 100644 --- a/src/app/routes/download/components/list/list.component.html +++ b/src/app/routes/download/components/list/list.component.html @@ -8,6 +8,6 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [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"> + [loading]="service.http.loading"> \ No newline at end of file diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index ed8e8450..f33f30e0 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -53,7 +53,7 @@ + [page]="{}" [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
合计 项，收入 diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html index 1afcd0cf..38cef830 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html +++ b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html @@ -33,7 +33,7 @@
+ [scroll]="{ x:'1200px',y: '420px' }" [page]="{ show: false }" [loading]="service.http.loading">
diff --git a/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html b/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html index 27e8dee7..ee5511f8 100644 --- a/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/summary-detail/summary-detail.component.html @@ -23,7 +23,7 @@
+ [scroll]="{ x:'1200px',y: '420px' }" [page]="{ show: false }" [loading]="service.http.loading">
diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 8f9d0783..26c4be5d 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -36,7 +36,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [loading]="service.http.loading"> {{ item?.billStatusLabel }} {{ item?.billStatusLabel }} 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 5ce02b5a..c1caa91c 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 @@ -38,7 +38,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"> {{item?.billStatusLabel}} {{item?.billStatusLabel}} diff --git a/src/app/routes/usercenter/components/driver/driver.component.html b/src/app/routes/usercenter/components/driver/driver.component.html index af9aa4bf..b46d63a2 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.html +++ b/src/app/routes/usercenter/components/driver/driver.component.html @@ -40,7 +40,7 @@ [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [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"> + [loading]="service.http.loading"> {{ item.promotersTelephone || '添加' }} diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index de3a37d1..c60a0b06 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -409,7 +409,7 @@ + [loading]="service.http.loading"> {{ item.remark }} -- @@ -420,7 +420,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="service.http.loading"> {{ item.remark }} -- diff --git a/src/app/routes/usercenter/components/freight/user/user.component.html b/src/app/routes/usercenter/components/freight/user/user.component.html index 75cc2ab2..a44d1ef4 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.html +++ b/src/app/routes/usercenter/components/freight/user/user.component.html @@ -39,7 +39,7 @@ + [scroll]="{ x:'1200px',y: '400px' }" [page]="{ }" [loading]="service.http.loading">