diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html
index 8af9b874..c82496bd 100644
--- a/src/app/routes/datatable/components/financetable/financetable.component.html
+++ b/src/app/routes/datatable/components/financetable/financetable.component.html
@@ -1,3 +1,13 @@
+
@@ -45,6 +55,15 @@
{{item.dkpje | currency}}
+
+ {{item.yingsfjf | currency}}
+
+
+ {{item.yisfjf | currency}}
+
+
+ {{item.fjfl + '%'}}
+
diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts
index 6a109564..ef318c6b 100644
--- a/src/app/routes/datatable/components/financetable/financetable.component.ts
+++ b/src/app/routes/datatable/components/financetable/financetable.component.ts
@@ -34,17 +34,17 @@ export class DatatableFinancetableComponent implements OnInit {
chartData: any = {}
flag = false;
columns: STColumn[] = [
- { title: '运营主体', index: 'networkTransporterName', className: 'text-center' },
- { title: '客户预存款', index: 'czcgje',render: 'czcgje', className: 'text-center' },
- { title: '应收金额', index: 'yingsje',render: 'yingsje', className: 'text-center' },
- { title: '已收金额', index: 'yisje',render: 'yisje', className: 'text-center' },
- { title: '应付运费', index: 'yingfyf', render: 'yingfyf',className: 'text-center' },
- { title: '已付运费', index: 'yifyf',render: 'yifyf', className: 'text-center' },
- { title: '已开票金额', index: 'ykpje',render: 'ykpje', className: 'text-center' },
- { title: '待开票金额', index: 'dkpje',render: 'dkpje', className: 'text-center' },
- { title: '应收附加费', index: 'yingsfjf', className: 'text-center' },
- { title: '已收附加费', index: 'yisfjf', className: 'text-center' },
- { title: '平均附加费率', index: 'fjfl', className: 'text-center' }
+ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' ,width: 200},
+ { title: '客户预存款', index: 'czcgje',render: 'czcgje', className: 'text-center',width: 200 },
+ { title: '应收金额', index: 'yingsje',render: 'yingsje', className: 'text-center' ,width: 200},
+ { title: '已收金额', index: 'yisje',render: 'yisje', className: 'text-center',width: 200 },
+ { title: '应付运费', index: 'yingfyf', render: 'yingfyf',className: 'text-center' ,width: 200},
+ { title: '已付运费', index: 'yifyf',render: 'yifyf', className: 'text-center' ,width: 200},
+ { title: '已开票金额', index: 'ykpje',render: 'ykpje', className: 'text-center' ,width: 200},
+ { title: '待开票金额', index: 'dkpje',render: 'dkpje', className: 'text-center' ,width: 200},
+ { title: '应收附加费', index: 'yingsfjf',render: 'yingsfjf', className: 'text-center' ,width: 200},
+ { title: '已收附加费', index: 'yisfjf',render: 'yisfjf', className: 'text-center' ,width: 200},
+ { title: '平均附加费率', index: 'fjfl', render: 'fjfl',className: 'text-center',width: 200 }
];
/**
* 查询参数
diff --git a/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts b/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts
index 9959782e..32f36a91 100644
--- a/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts
+++ b/src/app/routes/datatable/components/financetable/pillar/pillar.component.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description :
+ * @Version : 1.0
+ * @Author : Shiming
+ * @Date : 2022-04-01 13:16:39
+ * @LastEditors : Shiming
+ * @LastEditTime : 2022-04-11 16:00:12
+ * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\financetable\\pillar\\pillar.component.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
import { Chart } from '@antv/g2';
import { DataService } from 'src/app/routes/datatable/services/data.service';
@@ -50,12 +60,19 @@ export class FinancetablePillarComponent implements OnInit, OnChanges {
this.chart.scale('number', {
nice: true,
+ // ticks:
});
this.chart.tooltip({
showMarkers: false,
shared: true,
});
-
+ this.chart.axis('number', {
+ label: {
+ formatter: (val: any) => {
+ return '¥' + this.toThousands(val) ;
+ },
+ },
+ });
this.chart
.interval()
.position('time*number')
@@ -71,5 +88,8 @@ export class FinancetablePillarComponent implements OnInit, OnChanges {
this.chart.render();
}
-
+ toThousands(num: string) {
+ const str = num.toString()
+ return str.replace(/(\d)(?=(?:\d{3})+$)/g, '$1,')
+ }
}
\ No newline at end of file
diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
index 9767948c..0e0794fd 100644
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@@ -251,7 +251,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
{ title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', },
{
title: '网络货运人',
- render: 'shipperName',
+ index: 'networkTransporterName',
className: 'text-center',
width: '180px',
},
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts
index fda84ae5..a095e26e 100644
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-29 13:12:35
- * @LastEditTime : 2022-04-11 14:11:21
+ * @LastEditTime : 2022-04-11 16:41:43
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\services\\ticket.service.ts
@@ -137,9 +137,9 @@ export class TicketService extends ShipperBaseService {
// ETC开票记录导出
$api_get_asyncExportEtcApplyRecordList = '/api/sdc/invoiceEtcOperate/asyncExportEtcApplyRecordList';
// ETC白名单(货主)导出接口
- $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoShipperWhiteList/asyncExport';
+ $api_get_aficoShipperWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportWhiteList';
// ETC白名单(车辆)导出接口
- $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoCarWhiteList/asyncExport';
+ $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportCarWhiteList';
constructor(public injector: Injector) {
super(injector);