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-25 13:35:42 +08:00
parent be1ffd4cee c1ee31e729
commit 1aa240b296
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
View File

@ -253,7 +253,7 @@ export class TransactionFlowComponent implements OnInit {
bankType: item.bankType, bankType: item.bankType,
rmYll: item.roleId, rmYll: item.roleId,
snglFlgCd: item.channelPaySn, snglFlgCd: item.channelPaySn,
bussType: '07', bussType: item.tradeType === '7' ? '05' : item.tradeType === '8' ? '06' : '07',
ltdId: item.ltdId ltdId: item.ltdId
}) })
} }

2
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -352,7 +352,7 @@ export class CancellationInvoiceComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) }
}, },
{ title: '服务名称', index: 'vatname', width: 100 }, { title: '服务名称', index: 'vatname', width: 100 },
{ title: '销货清单', index: 'isdetail', width: 90 }, { title: '销货清单', index: 'isdetail', width: 90, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' },
{ title: '票面备注', render: 'vatremarks', width: 250 }, { title: '票面备注', render: 'vatremarks', width: 250 },
{ title: '其他要求', index: 'otherremarks', width: 100 }, { title: '其他要求', index: 'otherremarks', width: 100 },
{ {