From 14fe3b0fd02daa9b9e4dd6e97e5af3a18e8d180d Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 6 Apr 2022 10:14:23 +0800 Subject: [PATCH 01/13] fix bug --- src/app/routes/datatable/datatable.module.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index 8a679d45..a2215935 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -22,13 +22,13 @@ import { DatatableBusiindexComponent } from './components/busitable/busiindex/bu import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component'; import { BusitablePillarComponent } from './components/busitable/pillar/pillar.component'; import { DatatableReportingFundInfoComponent } from './reporting/components/fund-info/fund-info.component'; -import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; 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'; import { FinancetablePillarComponent } from './components/financetable/pillar/pillar.component'; import { ComplianceCurveComponent } from './components/compliance/index/curve/curve.component'; +import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -53,14 +53,14 @@ const COMPONENTS: Type[] = [ BusitablePillarComponent, DatatableFundReportingComponent, DatatableReportingFundInfoComponent, - BusitableCurveComponent, OperationPillarComponent, OperationCurveComponent, DatatableReportingFundInfoComponent, FinanceTableCurveComponent, DatatableDatascreenComponent, FinancetablePillarComponent, - ComplianceCurveComponent + ComplianceCurveComponent, + BusitableCurveComponent ] From 3f4bd0da1b175e8a64e843b580ee0ea33fb1455b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 6 Apr 2022 10:23:33 +0800 Subject: [PATCH 02/13] edit --- .../logs/components/system-logs/system-logs.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/logs/components/system-logs/system-logs.component.ts b/src/app/routes/logs/components/system-logs/system-logs.component.ts index 8fef4e7a..90caac95 100644 --- a/src/app/routes/logs/components/system-logs/system-logs.component.ts +++ b/src/app/routes/logs/components/system-logs/system-logs.component.ts @@ -52,7 +52,7 @@ export class SystemLogsComponent implements OnInit { } }, time: { - title: '登录时间', + title: '操作时间', type: 'string', ui: { widget: 'sl-from-to-search', @@ -67,7 +67,7 @@ export class SystemLogsComponent implements OnInit { }; columns: STColumn[] = [ - { title: '操作时间', index: 'operatorTimestamp', type: 'date' }, + { title: '操作时间', index: 'operatorTimestamp' }, { title: '操作人', index: 'operator' }, { title: '操作人手机号码', index: 'telephone' }, { title: '操作页面', index: 'operatePage' }, From 5a2a668168d7718b1f6093d5757286700f7bc0bf Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 6 Apr 2022 10:57:58 +0800 Subject: [PATCH 03/13] fix bug --- .../busitable/busiindex/busiindex.component.ts | 12 ++++-------- .../busitable/busiindex/curve/curve.component.ts | 4 +--- .../busitable/mantable/mantable.component.ts | 2 +- .../customtable/customindex/customindex.component.ts | 2 +- .../customtable/driver/driver.component.ts | 2 +- .../components/customtable/owner/owner.component.ts | 2 +- .../financetable/financetable.component.ts | 2 +- .../operationtable/operationtable.component.ts | 7 +++---- 8 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index b413661d..1dbf859b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -25,10 +25,9 @@ export class DatatableBusiindexComponent implements OnInit { dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); chartData: any = {} - flag = false; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, @@ -67,7 +66,7 @@ export class DatatableBusiindexComponent implements OnInit { ngOnInit(): void { this.initData() } - initData(){ + initData(flag?: boolean){ let type = 1 if(this.mode === 'year') { type = 1 @@ -81,7 +80,7 @@ export class DatatableBusiindexComponent implements OnInit { this.service.request(this.service.$api_performanceReportHistogram, params).subscribe(res => { if (res) { this.chartData = res - if(this.flag) { + if(flag) { this.pillar.reRender() this.curve.reRender() } @@ -126,10 +125,7 @@ export class DatatableBusiindexComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } - - - this.flag = true - this.initData() + this.initData(true) } disabledDate = (current: Date): boolean => // Can not select days before today and today diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts index 62220b3d..70fd0aad 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts @@ -33,9 +33,7 @@ export class BusitableCurveComponent implements OnInit, OnChanges { } render(el: ElementRef): void { this.el = el.nativeElement - if(!this.service.http.loading){ - this.ngZone.runOutsideAngular(() => this.init(this.el)); - } + this.ngZone.runOutsideAngular(() => this.init(this.el)); } private init(el: HTMLElement): void { diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts index 6e847a3d..c1f60ff0 100644 --- a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts @@ -20,7 +20,7 @@ export class DatatableMantableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); dateNext: any = null; modeNext = 'year'; 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 8c2cccab..e290bb54 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -20,7 +20,7 @@ export class DatatableCustomindexComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); dateNext: any = null; modeNext = 'year'; 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 330ac567..3050a847 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -20,7 +20,7 @@ export class DatatableDriverComponent implements OnInit { date: any = null; defineDate = []; queryTime: any = '' - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {}; schema: SFSchema = {}; 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 73833dff..f3a81454 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -20,7 +20,7 @@ export class DatatableOwnerComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; today = new Date(); ui: SFUISchema = {}; schema: SFSchema = {}; diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index a5eb59de..6a109564 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -24,7 +24,7 @@ export class DatatableFinancetableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index bce8f525..891ee8e1 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -22,7 +22,7 @@ export class DatatableOperationtableComponent implements OnInit { date: any = null; defineDate = []; time: any = ['2022-01-01 00:00:00'] - dateFormat = 'yyyy-MM-dd'; + dateFormat = 'yyyy'; dateNext: any = null; modeNext = 'year'; timeNext: any = ['2022-01-01 00:00:00'] @@ -31,7 +31,6 @@ export class DatatableOperationtableComponent implements OnInit { interManlist: any = [] chartData: any = {} - flag: boolean = false; columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, { title: '订单数', index: 'zsl', className: 'text-center' }, @@ -84,11 +83,10 @@ export class DatatableOperationtableComponent implements OnInit { type, enterpriseInfoId: this.enterpriseInfoId }; - this.flag = flag ? flag : false this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { if (res) { this.chartData = res - if(this.flag) { + if(flag) { // 除第一次加载外 this.pillar.reRender() this.curve.reRender() } @@ -152,5 +150,6 @@ export class DatatableOperationtableComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } + this.initPillarData(true) } } From 170501f16d728a1ee345e7bb0518e5c619048d36 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 6 Apr 2022 11:04:29 +0800 Subject: [PATCH 04/13] fix bug --- .../compliance-audit/compliance-audit.component.html | 2 +- .../compliance-audit/compliance-audit.component.ts | 8 ++++++++ .../order-management/services/order-management.service.ts | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index d21373dc..0803df06 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -41,7 +41,7 @@ [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']" >查询 - diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index c6b4e3a1..c6d77830 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -694,4 +694,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit { } } } + // 导出 + exprot() { + this.service.request(this.service.$api_get_asyncExportSpotCheckList, this.reqParams).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('导出成功，请去下载中心下载！'); + } + }); + } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 16922472..eafc7dc3 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-02 13:10:13 + * @LastEditTime : 2022-04-06 11:03:58 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -193,6 +193,8 @@ export class OrderManagementService extends ShipperBaseService { $api_get_asyncExportWholeList = `/api/sdc/billOperate/asyncExportWholeList`; // 异步导出风险单导出 $api_get_asyncExportRiskBillList = `/api/sdc/billRiskOperate/asyncExportRiskBillList`; + // 异步导出合规抽查导出 + $api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`; /** * 根据企业ID，获取企业历史网络货运人 * @returns From f80a62c29e87d34b02431d8daa1f1be2ff4c5f83 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 6 Apr 2022 11:06:09 +0800 Subject: [PATCH 05/13] fix bug --- .../receipts-audit/receipts-audit.component.html | 4 ++-- .../components/receipts-audit/receipts-audit.component.ts | 8 ++++++++ .../order-management/services/order-management.service.ts | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html index 00aa235e..cb49f728 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 11:00:38 + * @LastEditTime : 2022-04-06 11:06:05 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -35,7 +35,7 @@ - +