From 7fec4cdd26a5221f56572870a2d3fd64cdee63c9 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 11 Apr 2022 16:36:54 +0800 Subject: [PATCH 1/7] edit --- .../individual-income/individual-income.component.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index 315d5f47..c55b07de 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -246,7 +246,14 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { width: '250px', format: item => `${item.yssdl ? ((item.yssdl as number) * 100).toFixed(2) : 0}%` }, - { title: '计税依据', index: 'jsyj', className: 'text-right', width: '150px' }, + { + title: '计税依据', + index: 'jsyj', + width: '150px', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jsyj }) } + }, { title: '税率', index: 'sl', From 7cd6591a6be840ae8eae7184182aac8b81f33059 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:42:20 +0800 Subject: [PATCH 2/7] fix bug --- .../financetable/financetable.component.html | 19 +++++++++++++++ .../financetable/financetable.component.ts | 22 ++++++++--------- .../financetable/pillar/pillar.component.ts | 24 +++++++++++++++++-- .../order-reporting.component.ts | 2 +- .../services/ticket.service.ts | 6 ++--- 5 files changed, 56 insertions(+), 17 deletions(-) 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); From bcbf1652689d1292dd20b86f172f4c9d241ab1bb Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 11 Apr 2022 16:42:52 +0800 Subject: [PATCH 3/7] edit --- .../payable-order-detail.component.html | 2 +- .../payable-order/payable-order.component.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html index 05929852..b0b74755 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html +++ b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.html @@ -20,7 +20,7 @@
- {{headerInfo?.ltdId}} + {{headerInfo?.ltdName}} {{headerInfo?.cnoName}} diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 703c57de..64c951c6 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -227,30 +227,30 @@ export class PayableOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'phxcode', type: 'link', width: 140 }, - { title: '网络货运人', index: 'ltdName', width: 160 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, { title: '核销日期', index: 'phxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 170 }, - { title: '收款账户', index: 'ltdaccountId', width: 170 }, + { title: '收款账户', index: 'ltdaccountId', width: 190 }, { title: '核销金额', index: 'phxmoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}` }, { title: '应付金额', index: 'prmoney', - width: 120, + width: 140, className: 'text-right', format: item => `${this.currencyPipe.transform(item.prmoney || 0)}` }, { title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 }, { title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 }, { title: '收款人', index: 'driver2IdName', width: 120 }, - { title: '结算客户', index: 'cno', width: 120 }, - { title: '银行水单', index: 'bankreceipt', width: 120 }, - { title: '创建时间', index: 'createTime', width: 160 }, + { title: '结算客户', index: 'cnoName', width: 180 }, + { title: '银行水单', index: 'bankreceipt', width: 190 }, + { title: '创建时间', index: 'createTime', width: 180 }, // { title: '创建人', index: 'createUserIdLabel', width: 120 }, { title: '核销状态', index: 'sts', type: 'enum', enum: { 0: '待核销', 1: '已核销' }, width: 120 }, { title: '核销备注', index: 'remarks', width: 120 }, From 472849e5321189ca6e0a0c4d001892885425d0e5 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:43:17 +0800 Subject: [PATCH 4/7] fix bug --- .../components/order-reporting/order-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0e0794fd..e11afb2a 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 @@ -329,7 +329,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { } let params: any[] = []; this.selectedRows.forEach(item => { - params.push(item.id); + params.push(item.billId); }); this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { if (res) { From 57d87a6bcaf003a42b2e50d3039b766dc376f06a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:46:27 +0800 Subject: [PATCH 5/7] fix bug --- .../individual-collect/individual-collect.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 491fd41c..ed4066bb 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -129,9 +129,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value - } } as SFDateWidgetSchema }, sbrq: { From 0690582b2cdf4692a739276a6284ca677ffe1db9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 11 Apr 2022 16:49:00 +0800 Subject: [PATCH 6/7] fix bug --- .../withdrawals-record/withdrawals-record.component.html | 2 +- .../withdrawals-record/withdrawals-record.component.ts | 6 +++++- .../services/freight-account.service.ts | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html index 98ac1a5e..a4db6171 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html @@ -32,7 +32,7 @@
- +