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-03-02 15:02:00 +08:00
parent d04868e8b7 1541b399ba
commit 4b601bda42
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
View File

@ -189,7 +189,10 @@ export class FreightAccountDetailComponent implements OnInit {
{ title: '交易时间', index: 'createTime', type: 'date' }, { title: '交易时间', index: 'createTime', type: 'date' },
{ title: '流水号', index: 'transactionNumber' }, { title: '流水号', index: 'transactionNumber' },
{ title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' },
{ title: '关联单号', index: 'businessNumber' }, { title: '交易单号', index: 'businessNumber' },
{ title: '订单号', index: 'business2Number' },
{ title: '运单号', index: 'busine1ssNumber' },
{ title: '货主', index: 'busine11ssNumber' },
{ title: '所属项目', index: 'projectId' }, { title: '所属项目', index: 'projectId' },
{ title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' },
{ {
@ -207,7 +210,10 @@ export class FreightAccountDetailComponent implements OnInit {
type: 'widget', type: 'widget',
className: 'text-right', className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) }
} },
{ title: '付款方', index: 'busine111ssNumber' },
{ title: '收款方', index: 'payeeName' },
{ title: '备注', index: 'projectId1' },
]; ];
} }
} }

4
src/app/routes/financial-management/components/freight-account/freight-account.component.ts
View File

@ -167,10 +167,10 @@ export class FreightAccountComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '企业名称', width: 140, index: 'tenantName' }, { title: '企业名称', width: 170, index: 'tenantName' },
{ title: '联系人', width: 120, index: 'name' }, { title: '联系人', width: 120, index: 'name' },
{ title: '联系人电话', width: 140, index: 'phone' }, { title: '联系人电话', width: 140, index: 'phone' },
{ title: '网络货运人', width: 140, index: 'ltdName' }, { title: '网络货运人', width: 170, index: 'ltdName' },
{ title: '银行类型', width: 120, index: 'bankTypeLabel' }, { title: '银行类型', width: 120, index: 'bankTypeLabel' },
{ title: '虚拟账户', width: 140, index: 'virtualAccount' }, { title: '虚拟账户', width: 140, index: 'virtualAccount' },
{ {

2
src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
View File

@ -147,7 +147,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
// { title: '订单日期', index: 'billTime', width: 150 }, // { title: '订单日期', index: 'billTime', width: 150 },
// { title: '费用类型', index: 'cnoName', width: 90 }, // { title: '费用类型', index: 'cnoName', width: 90 },
// { title: '订单费用科目', index: 'feeSubId', width: 100 }, // { title: '订单费用科目', index: 'feeSubId', width: 100 },
{ title: '费用科目', index: 'feeSubId', width: 140 }, { title: '费用科目', index: 'feeSubName', width: 140 },
{ title: '结算客户', index: 'cnoName', width: 100 }, { title: '结算客户', index: 'cnoName', width: 100 },
{ {
title: '已收金额', title: '已收金额',