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-05-11 14:49:10 +08:00
parent 80db958437 87e16c05a2
commit e6cc472ece
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -30,7 +30,7 @@ module.exports = {
// }, // },
'//api': { '//api': {
target: { target: {
host: 'tms-api-dev.eascs.com', host: 'tms-api-test.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

14
src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
View File

@ -105,7 +105,7 @@ export class InputInvoiceDetailComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
asyncData: () => this.service.getCloseAccount(), asyncData: () => this.service.getCloseAccount()
}, },
default: '' default: ''
}, },
@ -137,15 +137,15 @@ export class InputInvoiceDetailComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '序号', render: 'billHCode', width: 80 }, { title: '序号', render: 'billHCode', width: 40, className: 'text-center' },
{ title: '费用号', index: 'feecode', width: 100 }, { title: '费用号', index: 'feecode', width: 140 },
{ title: '费用日期', index: 'feedate', type: 'date', width: 150 }, { title: '费用日期', index: 'feedate', width: 150, className: 'text-center' },
{ title: '订单号', index: 'billHCode', width: 100 }, { title: '订单号', index: 'billHCode', width: 100 },
{ title: '订单日期', index: 'billTime', width: 150 }, { title: '订单日期', index: 'billTime', width: 150, className: 'text-center' },
{ title: '结算客户', index: 'cnoName', width: 90 }, { title: '结算客户', index: 'cnoName', width: 90 },
{ title: '费用科目', index: 'feesubname', width: 100 }, { title: '费用科目', index: 'feesubname', width: 100 },
{ title: '收票金额', render: 'invmoney', width: 140 }, { title: '收票金额', render: 'invmoney', width: 120, className: 'text-right' },
{ title: '收票税额', render: 'invtax', width: 100 } { title: '收票税额', render: 'invtax', width: 100, className: 'text-right' }
]; ];
} }
} }