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-04-11 14:57:39 +08:00
parent b026363af3 c29aadf0c6
commit 5daed2e6cf
3 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -115,15 +115,17 @@ export class ETCInvoicedListComponent implements OnInit {
shipperId: {
type: 'string',
title: '托运人',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
}
},
enterpriseInfoId: {
type: 'string',
@ -147,8 +149,14 @@ export class ETCInvoicedListComponent implements OnInit {
return [
{ title: '运单号', index: 'wayBillCode' },
{ title: '订单号', index: 'billCode' },
{ title: '开票状态', index: 'invoicingStatus', type: 'enum', enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' } ,width: 120,},
{ title: '订单类型', index: 'billTypeLabel', width: 120,},
{
title: '开票状态',
index: 'invoicingStatus',
type: 'enum',
enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' },
width: 120
},
{ title: '订单类型', index: 'billTypeLabel', width: 120 },
{ title: '装货地', index: 'loadingPlace' },
{ title: '卸货地', index: 'dischargePlace' },
{ title: '司机信息', render: 'call1No' },
@ -184,8 +192,8 @@ export class ETCInvoicedListComponent implements OnInit {
}
];
}
// 导出
exprot() {
this.service.exportStart({...this.sf?.value, pageSize: -1}, this.service.$api_get_asyncExportEtcApplyRecordList);
}
// 导出
exprot() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportEtcApplyRecordList);
}
}

2
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
View File

@ -14,7 +14,7 @@
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"

41
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
View File

@ -182,14 +182,17 @@ export class ETCInvoicedRequestedComponent implements OnInit {
shipperId: {
type: 'string',
title: '托运人',
enum: [{ label: '全部', value: '全部' }],
ui: {
widget: 'select',
placeholder: '请选择',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
visibleIf: {
expand: (value: boolean) => value
}
}
},
},
ltdId: {
type: 'string',
@ -213,22 +216,22 @@ export class ETCInvoicedRequestedComponent implements OnInit {
return [
{ 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' }
{ 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: 'loadingTime', type: 'date', width: '150px' },
{ title: '卸货时间', index: 'unloadingTime', type: 'date', width: '150px' },
{ title: '签收时间', index: 'submissionTime', type: 'date', width: '150px' }
];
}
// 导出
exprot() {
this.service.exportStart({...this.sf?.value, pageSize: -1}, this.service.$api_get_asyncExportEtcApplyList);
}
// 导出
exprot() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportEtcApplyList);
}
}