From e11dd25d68943bad0361abeea5d08ecd6eb5d471 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 1 Apr 2022 16:38:04 +0800 Subject: [PATCH 1/4] fix bug --- .../components/receipts-audit/receipts-audit.component.ts | 8 ++++---- .../modal/audit/voucher-view/voucher-view.component.ts | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts index 265d5c0f..04957c1b 100644 --- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -397,25 +397,25 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { { text: '生成电子单据', click: _record => this.generate(_record, 2), - iif: item => !item?.loadingLadingBillFilePath, + iif: item => !item?.loadingElectronicsLadingBillFilePath, acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] }, }, { text: '通过', click: _record => this.sign(_record), - iif: item => !item?.loadingLadingBillFilePath, + iif: item => !item?.loadingElectronicsLadingBillFilePath, acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] }, }, { text: '修改', click: _record => this.modification(_record), - iif: item => !item?.loadingLadingBillFilePath, + iif: item => !item?.loadingElectronicsLadingBillFilePath, acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] }, }, { text: '查看凭证', click: _record => this.generate(_record, 3), - iif: item => item?.loadingLadingBillFilePath, + iif: item => item?.loadingElectronicsLadingBillFilePath, acl: { ability: ['ORDER-RECEIPTS-view'] }, }, ] diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 23477086..7cf3957c 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -505,14 +505,14 @@ export class orderManagementVoucherViewComponent implements OnInit { openlaod(value: any) { if(value === 1) { const a = document.createElement('a'); - a.href = this.datas?.loadingLadingBillFilePath; + a.href = this.datas?.loadingElectronicsLadingBillFilePath; document.body.appendChild(a); console.log(document.body.contains(a)) a.click(); //点击下载 document.body.removeChild(a); //下载完成移除元素 } else { const a = document.createElement('a'); - a.href = this.datas?.loadingPeopleVehiclesGoodsFilePath; + a.href = this.datas?.unloadingElectronicsLadingBillFilePath; document.body.appendChild(a); console.log(document.body.contains(a)) a.click(); //点击下载 From 68634644679dc85c40e36a9947aeafc9c36e820e Mon Sep 17 00:00:00 2001 From: heqinghang Date: Fri, 1 Apr 2022 16:42:15 +0800 Subject: [PATCH 2/4] 666 --- .../index/curve/curve.component.html | 2 + .../index/curve/curve.component.less | 0 .../compliance/index/curve/curve.component.ts | 91 +++++++++++++++++++ .../compliance/index/index.component.html | 19 ++-- .../compliance/index/index.component.ts | 89 +++++++++++++++--- .../financetable/curve/curve.component.ts | 10 +- .../financetable/financetable.component.html | 6 +- .../financetable/financetable.component.ts | 9 +- src/app/routes/datatable/datatable.module.ts | 4 +- .../routes/datatable/services/data.service.ts | 14 ++- 10 files changed, 212 insertions(+), 32 deletions(-) create mode 100644 src/app/routes/datatable/components/compliance/index/curve/curve.component.html create mode 100644 src/app/routes/datatable/components/compliance/index/curve/curve.component.less create mode 100644 src/app/routes/datatable/components/compliance/index/curve/curve.component.ts diff --git a/src/app/routes/datatable/components/compliance/index/curve/curve.component.html b/src/app/routes/datatable/components/compliance/index/curve/curve.component.html new file mode 100644 index 00000000..7ceba0b7 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/curve/curve.component.html @@ -0,0 +1,2 @@ + + diff --git a/src/app/routes/datatable/components/compliance/index/curve/curve.component.less b/src/app/routes/datatable/components/compliance/index/curve/curve.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts b/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts new file mode 100644 index 00000000..0dbacb97 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/curve/curve.component.ts @@ -0,0 +1,91 @@ +import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; +import { G2MiniAreaClickItem } from '@delon/chart/mini-area'; + +// import DataSet from '@antv/data-set'; +const DataSet = require('@antv/data-set'); +import { Chart } from '@antv/g2'; +import { DataService } from 'src/app/routes/datatable/services/data.service'; +@Component({ + selector: 'app-compliance-curve', + templateUrl: './curve.component.html', + styleUrls: ['./curve.component.less'] +}) +export class ComplianceCurveComponent implements OnInit,OnChanges { + el: any; + @Input() chartData: any; + chart: any; + constructor(private service: DataService, private ngZone: NgZone) { + + } + ngOnChanges(changes: SimpleChanges): void { + if (this.chartData) { + // setTimeout(()=>{ + // this.chart.render(true) + // }, 1000) + + } + } + + ngOnInit(): void { + + } + reRender() { + setTimeout(() => { + this.chart.data(this.chartData); + this.chart.render(); + }, 1000) + } + render(el: ElementRef): void { + this.el = el.nativeElement + setTimeout(() => { + console.log(this.chartData) + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 1000) + } + + private init(el: HTMLElement): void { + this.chart = new Chart({ + container: el, + autoFit: true, + height: 500, + }); + + this.chart.data(this.chartData); + this.chart.scale({ + time: { + range: [0, 1], + }, + number: { + min: 0, + nice: true, + }, + }); + + this.chart.tooltip({ + showCrosshairs: true, + shared: true, + }); + + this.chart.axis('proportion', { + label: { + formatter: (val: any) => { + return val*100+ ' %'; + }, + }, + }); + + this.chart + .line() + .position('situationDate*proportion') + .color('type') + .tooltip('proportion*type', function(name: any, value: any) { + return { + name: name*100+'%', + value: value + }; + }); + + this.chart.render(); + + } +} diff --git a/src/app/routes/datatable/components/compliance/index/index.component.html b/src/app/routes/datatable/components/compliance/index/index.component.html index dbcfc3c0..0d55f76b 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.html +++ b/src/app/routes/datatable/components/compliance/index/index.component.html @@ -24,37 +24,37 @@
- +
- 合格：12423 不合格：12423 + 合格：{{cardData1?.leftQuantity}} 不合格：{{cardData1?.rightQuantity}}
- +
- 货源单：12423 合同单：12423 + 货源单：{{cardData2?.leftQuantity}} 合同单：{{cardData2?.rightQuantity}}
- +
- 司机：12423 车队长：12423 + 司机：{{cardData3?.leftQuantity}} 车队长：{{cardData3?.rightQuantity}}
- +
- 准时：12423 逾期：12423 + 准时：{{cardData4?.leftQuantity}} 逾期：{{cardData4?.rightQuantity}}
@@ -62,5 +62,6 @@
- + + diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts index 4de2d93e..97ab6b2b 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.ts +++ b/src/app/routes/datatable/components/compliance/index/index.component.ts @@ -5,6 +5,9 @@ import { format } from 'date-fns'; import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { G2TimelineData, G2TimelineMap } from '@delon/chart/timeline'; import { Chart } from '@antv/g2'; +import { DataService } from '../../../services/data.service'; +import { ComplianceCurveComponent } from './curve/curve.component'; + @Component({ selector: 'app-datatable-compliance-index', templateUrl: './index.component.html', @@ -12,51 +15,107 @@ import { Chart } from '@antv/g2'; providers: [DatePipe] }) export class DatatableComplianceIndexComponent implements OnInit { + @ViewChild('curve') private readonly curve!: ComplianceCurveComponent; @ViewChild('sf', { static: false }) + sf!: SFComponent; ui!: SFUISchema; schema: SFSchema = {}; mode = 'year'; date: any = null; - dateFormat = 'yyyy-MM-dd'; - time: any = ['2022-01-01 00:00:00'] - constructor(private http: _HttpClient, private modal: ModalHelper, private ngZone: NgZone, private datePipe: DatePipe) {} + dateFormat = 'yyyy'; + time: any = '2022' + chartData: any = {} + + cardData1:any; + cardData2:any; + cardData3:any; + cardData4:any; + + constructor(private http: _HttpClient, private modal: ModalHelper, private ngZone: NgZone,public service: DataService, private datePipe: DatePipe) {} ngOnInit(): void { this.initSF(); + this.initdData(); } + initdData(){ + const params ={ + ...this.sf?.value, + timeType:this.mode ==='month'?'M':'Y', + time:this.time + } + this.service.request(this.service.$api_getBillRateQualified, params).subscribe(res => { + if (res) { + this.cardData1 = res; + this.cardData1.proportion = this.cardData1.proportion*100 +'%' + } + }); + this.service.request(this.service.$api_getBillRateProportion, params).subscribe(res => { + if (res) { + this.cardData2 = res; + this.cardData2.proportion = this.cardData2.proportion*100 +'%' + } + }); + this.service.request(this.service.$api_getBillRateDirectPayment, params).subscribe(res => { + if (res) { + this.cardData3 = res; + this.cardData3.proportion = this.cardData3.proportion*100 +'%' + } + }); + this.service.request(this.service.$api_getBillTimelyPayment, params).subscribe(res => { + if (res) { + this.cardData4 = res; + this.cardData4.proportion = this.cardData4.proportion*100 +'%' + } + }); + + this.service.request(this.service.$api_listMonitorSituation, params).subscribe(res => { + if (res) { + this.chartData = res + this.curve.reRender(); + + } + }) + } + + changeData(){ if(this.mode === 'year') { this.dateFormat = 'yyyy' } 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'] + this.time = this.datePipe.transform(this.date, 'yyyy') } 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') } + this.initdData(); } initSF() { this.schema = { properties: { - name: { + enterpriseInfoId: { type: 'string', title: '', ui: { widget: 'select', - placeholder: '网络货运人' + placeholder: '网络货运人', + asyncData: () => this.service.getNetworkFreightForwarder({}), + change:()=>{ + this.initdData(); + }, + allowClear: true } }, - name2: { + enterpriseProjectId: { type: 'string', title: '', ui: { @@ -64,11 +123,12 @@ export class DatatableComplianceIndexComponent implements OnInit { placeholder: '部门' } }, - name3: { + salesmanId: { type: 'string', title: '', ui: { - placeholder: '业务员' + placeholder: '业务员', + enter: () => this.initdData(), } } } @@ -81,6 +141,9 @@ export class DatatableComplianceIndexComponent implements OnInit { } + + + render(el: ElementRef) { this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); } diff --git a/src/app/routes/datatable/components/financetable/curve/curve.component.ts b/src/app/routes/datatable/components/financetable/curve/curve.component.ts index 9f345eda..66ef76b1 100644 --- a/src/app/routes/datatable/components/financetable/curve/curve.component.ts +++ b/src/app/routes/datatable/components/financetable/curve/curve.component.ts @@ -66,16 +66,22 @@ export class FinanceTableCurveComponent implements OnInit,OnChanges { this.chart.axis('number', { label: { formatter: (val: any) => { - return val; + return val*100+ ' %'; }, }, }); + this.chart .line() .position('time*number') .color('name') - + .tooltip('name*number', (name:any, value:any) => { + return { + name: name, + value: value*100 + '%' + }; + }); this.chart.render(); diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html index 25eded17..b9c25062 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.html +++ b/src/app/routes/datatable/components/financetable/financetable.component.html @@ -50,7 +50,7 @@
- +
@@ -66,10 +66,10 @@
- +
- +
\ No newline at end of file diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts index 9f8cf423..92464349 100644 --- a/src/app/routes/datatable/components/financetable/financetable.component.ts +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -6,6 +6,8 @@ import { DataService } from '../../services/data.service'; import { differenceInCalendarDays } from 'date-fns'; import { OperationCurveComponent } from '../operationtable/curve/curve.component'; import { OperationPillarComponent } from '../operationtable/pillar/pillar.component'; +import { FinanceTableCurveComponent } from './curve/curve.component'; +import { FinancetablePillarComponent } from './pillar/pillar.component'; @Component({ selector: 'app-datatable-financetable', @@ -14,8 +16,8 @@ import { OperationPillarComponent } from '../operationtable/pillar/pillar.compon providers: [DatePipe] }) export class DatatableFinancetableComponent implements OnInit { - @ViewChild('curve') private readonly curve!: OperationCurveComponent; - @ViewChild('pillar') private readonly pillar!: OperationPillarComponent; + @ViewChild('curve') private readonly curve!: FinanceTableCurveComponent; + @ViewChild('pillar') private readonly pillar!: FinancetablePillarComponent; @ViewChild('st') private readonly st!: STComponent; type = 1; mode = 'year'; @@ -85,7 +87,7 @@ export class DatatableFinancetableComponent implements OnInit { enterpriseInfoId: this.enterpriseInfoId }; this.flag = true - this.service.request(this.service.$api_operationalReportHistogram, params).subscribe(res => { + this.service.request(this.service.$api_financialReportHistogram, params).subscribe(res => { if (res) { this.chartData = res if(this.flag) { @@ -148,6 +150,7 @@ export class DatatableFinancetableComponent implements OnInit { } else if(this.mode === 'month') { this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] } + this.initPillarData(); } } diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index 0eaeb61f..a1a054d8 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -27,6 +27,7 @@ import { OperationPillarComponent } from './components/operationtable/pillar/pil import { OperationCurveComponent } from './components/operationtable/curve/curve.component'; import { FinanceTableCurveComponent } from './components/financetable/curve/curve.component'; import { FinancetablePillarComponent } from './components/financetable/pillar/pillar.component'; +import { ComplianceCurveComponent } from './components/compliance/index/curve/curve.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -56,7 +57,8 @@ const COMPONENTS: Type[] = [ OperationCurveComponent, DatatableReportingFundInfoComponent, FinanceTableCurveComponent, - FinancetablePillarComponent + FinancetablePillarComponent, + ComplianceCurveComponent ] diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index ff5b2a14..f8bf590d 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -42,8 +42,20 @@ export class DataService extends BaseService { // 查询货主报表 $api_listShipperReportPage = `/api/sdc/report/listShipperReportPage`; - // 查询货主报表 + // 财务报表柱状图 $api_financialReportHistogram = `/api/sdc/report/financialReportHistogram`; + // 合规监控报表-运费直付占比 + $api_getBillRateDirectPayment = `/api/sdc/reportComplianceMonitor/getBillRateDirectPayment`; + // 合规监控报表-货源单占比 + $api_getBillRateProportion = `/api/sdc/reportComplianceMonitor/getBillRateProportion`; + // 合规监控报表-订单合格率 + $api_getBillRateQualified = `/api/sdc/reportComplianceMonitor/getBillRateQualified`; + // 合规监控报表-付款及时率 + $api_getBillTimelyPayment = `/api/sdc/reportComplianceMonitor/getBillTimelyPayment`; + // 合规监控报表-监控报表(折线图) + $api_listMonitorSituation = `/api/sdc/reportComplianceMonitor/listMonitorSituation`; + + constructor(public injector: Injector) { super(injector); From 4b04a4ca93e456940bb84b021f00083aefccbe2e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Sat, 2 Apr 2022 13:10:59 +0800 Subject: [PATCH 3/4] fix bug --- .../order-management/components/risk/risk.component.html | 2 +- .../order-management/components/risk/risk.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/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index 2bde8ffd..df5ff43f 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -33,7 +33,7 @@
- + diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts index 74fedc47..3c6d0fe2 100644 --- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Router } from '@angular/router'; -import { STColumn, STComponent } from '@delon/abc/st'; +import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; @@ -21,6 +21,14 @@ export class DatatableReportingFundInfoComponent implements OnInit { get reqParams() { return { capitalCode: this?.record?.orderCode }; } + + beforeReq(requestOptions: STRequestOptions) { + delete requestOptions?.body?.pageSize; + delete requestOptions?.body?.pageIndex; + return requestOptions; + + + } constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { } @@ -34,22 +42,22 @@ export class DatatableReportingFundInfoComponent implements OnInit { */ initST() { this.columns = [ - { title: '序号', type: 'no', className: 'text-center', width: '60px', }, - { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '120px', }, - { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '100px', }, - { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '序号', type: 'no', className: 'text-center', width: '10%', }, + { title: '监管平台字段', index: 'thirdPartyFieldName', className: 'text-center', width: '15%', }, + { title: '系统字段', index: 'checkFieldName', className: 'text-center', width: '15%', }, + { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '15%', }, { title: '是否必填', index: 'orderStatus', className: 'text-center', - width: '100px', + width: '10%', type: 'enum', enum: { '0': '非必填', '1': '必填', }, }, - { title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', }, + { title: '上传值', index: 'fieldValue', className: 'text-center', width: '15%', }, { title: '本地校验', index: 'checkStatus', @@ -60,9 +68,9 @@ export class DatatableReportingFundInfoComponent implements OnInit { '1': '通过', '2': '不通过' }, - width: '100px', + width: '10%', }, - { title: '错误内容', index: 'remark', className: 'text-center', width: '150px', }, + { title: '错误内容', index: 'remark', className: 'text-center', width: '20%', }, ] } diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index ed76d2ea..e2894aed 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -34,8 +34,8 @@ {{item?.billStatusLabel}} - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} + 1111{{item?.verifyStatusLabel}} + {{item?.verifyStatusLabel}} {{item?.orderCode}} @@ -43,11 +43,6 @@ {{item?.wayBillCode}} - - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} -
{{item?.tolalAmount | currency }}
 diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index cc0563a2..60b9d23d 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -175,7 +175,9 @@ export class DatatableFundReportingComponent implements OnInit { placeholder: '请选择', widget: 'select', asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - + visibleIf: { + _$expand: (value: boolean) => value, + }, allowClear: true } }, @@ -363,6 +365,7 @@ export class DatatableFundReportingComponent implements OnInit { const modalRef = this.modal.create({ nzTitle: '校验结果', nzWidth: 1200, + nzContent: DatatableReportingFundInfoComponent, nzComponentParams: { record @@ -377,7 +380,7 @@ export class DatatableFundReportingComponent implements OnInit { * 查看监管审核结果 */ viewAuditResult(record: any) { - if (record?.billStatus !== '2') { + if (record?.verifyStatus !== '1') { return; } this.openWainingModal('监管审核结果', record?.result) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index b16b7973..0e4d27dd 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -29,18 +29,40 @@ [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, 50, 100] }" [loading]="service.http.loading"> - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} - + + {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} + + + {{filterStatus(item?.driverCheckStatus)}} + {{filterStatus(item?.driverCheckStatus)}} + + + {{filterStatus(item?.orderCheckStatus)}} + {{filterStatus(item?.orderCheckStatus)}} - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} + + {{filterStatus(item?.checkStatus)}} + {{filterStatus(item?.checkStatus)}} - -
{{item?.amount | currency :' '}}
+ + {{item?.billCode}} + + + {{item?.wayBillCode}} + + + +
{{item?.freightAmount | currency :' '}}
+ + +
+ {{_item?.goodsTypeName}}/{{_item?.goodsName}}/{{_item?.weight}}吨/{{_item?.volume}}m³ +
diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 2491ad82..05361849 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -95,7 +95,7 @@ export class DatatableOrderReportingComponent implements OnInit { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + wayBillCode: { type: 'string', title: '运单号', ui: { @@ -113,7 +113,7 @@ export class DatatableOrderReportingComponent implements OnInit { allowClear: true } }, - externalResourceCode: { + shipperName: { title: '货主', type: 'string', ui: { @@ -143,33 +143,40 @@ export class DatatableOrderReportingComponent implements OnInit { }, } }, - serviceType: { + putStatus: { title: '上传状态', type: 'string', + enum: [ + { label: '待上传', value: 0 }, + { label: '已上传', value: 1 }, + { label: '异常', value: 2 } + ], + ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, } }, - serviceType1: { + checkStatus: { title: '本地校验', type: 'string', + enum: [ + { label: '校验中', value: 0 }, + { label: '通过', value: 1 }, + { label: '不通过', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, } }, - createTime: { + putTime: { title: '上传时间', type: 'string', ui: { @@ -181,7 +188,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime1: { + orderReceivingTime: { title: '运单生成时间', type: 'string', ui: { @@ -193,7 +200,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime2: { + dispatchedDate: { title: '发货时间', type: 'string', ui: { @@ -205,7 +212,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime3: { + receivingDate: { title: '收货时间', type: 'string', ui: { @@ -218,7 +225,7 @@ export class DatatableOrderReportingComponent implements OnInit { } as SFDateWidgetSchema, }, - loadingPlace: { + trajectoryDataAppStatus: { title: '车辆轨迹', type: 'string', enum: [ @@ -234,7 +241,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } }, - loadingPlace1: { + trajectoryDataStatus: { title: '司机轨迹', type: 'string', enum: [ @@ -264,48 +271,65 @@ export class DatatableOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', }, + { title: '订单状态', render: 'orderCheckStatus', className: 'text-center', width: '120px', }, + { title: '司机状态', render: 'driverCheckStatus', className: 'text-center', width: '120px', }, + { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + + { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, { title: '订单号', - render: 'billComplianceVOS', + render: 'billCode', className: 'text-center', width: '150px', }, - { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', }, { title: '网络货运人', - render: 'serviceType', + index: 'enterpriseInfoName', className: 'text-center', width: '180px', }, - { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' }, - { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' }, - { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, - { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' }, + + { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '运单生成时间', index: 'wayBillCreateTime', className: 'text-center', width: '180px' }, + { title: '发货时间', index: 'dispatchedDate', className: 'text-center', width: '180px' }, + { title: '收货时间', index: 'receivingDate', className: 'text-center', width: '180px' }, + { title: '托运人名称', index: 'shipperName', className: 'text-center', width: '250px' }, + { title: '托运人统一社会信用代码', index: 'shipperCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '装货地址', index: 'loadingAddress', render: 'dischargePlace', className: 'text-center', width: '200px' }, + { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' }, + { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' }, + { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' }, + { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' }, + { + title: '车牌颜色', + index: 'carNoColor', + className: 'text-center', + width: '250px', + type: 'enum', + enum: { + "4": "绿色", + "3": "黄绿色", + "2": "黄色", + "1": "蓝色" + } + + }, + { title: '司机姓名', index: 'driverName', className: 'text-center', width: '150px' }, + { title: '司机手机号码', index: 'driverPhone', className: 'text-center', width: '200px' }, + { title: '司机身份证号', index: 'driverIdentityNo', className: 'text-center', width: '150px' }, + { title: '货物信息', render: 'goodsInfoList', className: 'text-center', width: '180px' }, + { title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' }, + { title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' }, + { title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' }, { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '上传次数', index: 'putNumber', className: 'text-center', width: '150px' }, + { title: '上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }, ]; } @@ -455,5 +479,18 @@ export class DatatableOrderReportingComponent implements OnInit { }) } + filterStatus(status: string) { + switch (status) { + case '0': + return '校验中'; + case '1': + return '通过'; + case '2': + return '不通过'; + default: + return ''; + + } + } } diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index 8d3df409..f66d4313 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -5,7 +5,7 @@
- diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index ff73672a..4f0ebcd3 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,7 +6,7 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/regulation/list/page`; // 订单上报列表 $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 @@ -16,6 +16,8 @@ export class ReportingService extends BaseService { $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传 $api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回 $api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表 + + constructor(public injector: Injector) { super(injector); }