diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 989fd892..f6ca7182 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -211,20 +211,20 @@ export class ETCInvoicedRequestedComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '', index: 'key', type: 'checkbox' }, - { title: '运单号', index: 'wayBillCode' }, - { title: '订单号', index: 'billCode' }, - { title: '订单类型', index: 'billType' }, - { title: '装货地', index: 'loadingPlace' }, - { title: '卸货地', index: 'dischargePlace' }, - { title: '司机信息', render: 'call1No' }, - { title: '车辆信息', render: 'call1N2o' }, - { title: '托运人', index: 'shipperAppUserName' }, - { title: '网络货运人', index: 'enterpriseInfoName' }, - { title: '接单时间', index: 'orderReceivingTime', type: 'date' }, - { title: '装货时间', index: 'shipperAppUserName', type: 'date' }, - { title: '卸货时间', index: 'unloadingTime', type: 'date' }, - { title: '签收时间', index: 'submissionTime', type: 'date' } + { title: '', index: 'key', type: 'checkbox', width: '60px' }, + { title: '运单号', index: 'wayBillCode', width: '170px' }, + { title: '订单号', index: 'billCode' , width: '170px' }, + { title: '订单类型', index: 'billTypeLabel' , width: '140px' }, + { title: '装货地', index: 'loadingPlace' , width: '220px' }, + { title: '卸货地', index: 'dischargePlace', width: '220px' }, + { title: '司机信息', render: 'call1No', width: '140px' }, + { title: '车辆信息', render: 'call1N2o' , width: '200px' }, + { title: '托运人', index: 'shipperAppUserName' , width: '140px' }, + { title: '网络货运人', index: 'enterpriseInfoName', width: '220px' }, + { title: '接单时间', index: 'orderReceivingTime', type: 'date', width: '150px' }, + { title: '装货时间', index: 'shipperAppUserName', type: 'date', width: '150px' }, + { title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px' }, + { title: '签收时间', index: 'submissionTime', type: 'date', width: '150px' } ]; } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 3453d2cb..401e2a10 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -189,6 +189,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { */ resetSF() { this.sf.reset(); + this._$expand = false; } /** @@ -267,7 +268,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { } } }, - orderS22n2: { + drivercarinfo: { type: 'string', title: '车牌号', ui: {