Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-02-28 11:56:06 +08:00
parent a8a160c1cd 484a67fbd7
commit 56ca4e7305
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -285,12 +285,12 @@ export class CostManagementComponent implements OnInit {
{ title: '结算客户', render: 'artocode', width: 200, className: 'text-left' }, { title: '结算客户', render: 'artocode', width: 200, className: 'text-left' },
{ title: '应收对象', index: 'artoname', width: 200, className: 'text-left' }, { title: '应收对象', index: 'artoname', width: 200, className: 'text-left' },
{ title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' }, { title: '应付对象', index: 'hrtoname', width: 200, className: 'text-left' },
{ title: '应收金额', render: 'armoeny', width: 100, className: 'text-right' }, { title: '应收金额', render: 'armoeny', width: 150, className: 'text-right' },
{ title: '应付金额', render: 'hrmoney', width: 100, className: 'text-right' }, { title: '应付金额', render: 'hrmoney', width: 150, className: 'text-right' },
{ title: '收/付款金额', render: 'hrpaymoney', width: 120, className: 'text-right' }, { title: '收/付款金额', render: 'hrpaymoney', width: 150, className: 'text-right' },
{ title: '开/收票金额', render: 'hrvatmoney', width: 120, className: 'text-right' }, { title: '开/收票金额', render: 'hrvatmoney', width: 150, className: 'text-right' },
{ title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' }, { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-center' },
{ title: '状态', index: 'stsLabel', width: 90, className: 'text-center' }, { title: '状态', index: 'stsLabel', width: 120, className: 'text-center' },
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',

12
src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
View File

@ -182,7 +182,7 @@ export class InvoicedListComponent implements OnInit {
{ {
title: '申请编号', title: '申请编号',
index: 'vatinvcode', index: 'vatinvcode',
width: 170, width: 190,
type: 'link', type: 'link',
click: item => click: item =>
this.router.navigate(['/ticket/invoice-list/detail/' + item.id], { this.router.navigate(['/ticket/invoice-list/detail/' + item.id], {
@ -191,13 +191,13 @@ export class InvoicedListComponent implements OnInit {
}, },
{ title: '申请时间', index: 'createTime', type: 'date', width: 150 }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
{ title: '发票类型', index: 'invoicetypeLabel', className: 'text-center', width: 140 }, { title: '发票类型', index: 'invoicetypeLabel', className: 'text-center', width: 140 },
{ title: '网络货运人', index: 'ltdName', width: 120 }, { title: '网络货运人', index: 'ltdName', width: 170 },
{ title: '购买人', index: 'artoname', width: 90 }, { title: '购买人', index: 'artoname', width: 170 },
{ title: '订单数', index: 'ordlines', className: 'text-right', width: 90 }, { title: '订单数', index: 'ordlines', className: 'text-right', width: 90 },
{ {
title: '价税合计', title: '价税合计',
index: 'vatmoney', index: 'vatmoney',
width: 100, width: 130,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
@ -205,7 +205,7 @@ export class InvoicedListComponent implements OnInit {
{ {
title: '金额', title: '金额',
index: 'vatnotax', index: 'vatnotax',
width: 90, width: 120,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) }
@ -220,7 +220,7 @@ export class InvoicedListComponent implements OnInit {
{ {
title: '税额', title: '税额',
index: 'vattax', index: 'vattax',
width: 90, width: 120,
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }