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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-27 11:21:00 +08:00
parent 20c1c2e4f4
commit d2dfed0d24
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -247,7 +247,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
enum: [ enum: [
{ label: '全部', value: '' }, { label: '全部', value: '' },
{ label: '整车', value: '1' }, { label: '整车', value: '1' },
{ label: '大宗', value: '2' } { label: '大宗', value: '2' },
], ],
ui: { ui: {
widget: 'select', widget: 'select',
@ -305,7 +305,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
{ title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 }, { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
{ title: '开票状态', index: 'vatappStsLabel', width: 100 }, { title: '开票状态', index: 'vatappStsLabel', width: 100 },
{ title: '所属项目', index: 'projectIdName', width: 140 }, { title: '所属项目', index: 'projectIdName', width: 140 },
{ title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } }, { title: '订单类型', index: 'billTypeLabel', width: 100,},
{ title: '装货地', index: 'loadingfrom', width: 220 }, { title: '装货地', index: 'loadingfrom', width: 220 },
{ title: '卸货地', index: 'loadingto', width: 220 }, { title: '卸货地', index: 'loadingto', width: 220 },
{ title: '货物信息', index: 'goodsinfo', width: 150 }, { title: '货物信息', index: 'goodsinfo', width: 150 },