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-18 15:28:32 +08:00
parent 771c2e51dc 3c07963da5
commit bebb3b0533
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,8 @@ export class ETCInvoicedListComponent implements OnInit {
const modal = this.nzModalService.create({
nzTitle: '运单交易明细',
nzContent: TransactionDetailsComponent,
nzWidth: 900,
nzNoAnimation: true,
nzWidth: 950,
nzComponentParams: { data: item },
nzOnOk: com => {
console.log(com.selectedData);
@ -147,8 +148,8 @@ export class ETCInvoicedListComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '运单号', index: 'wayBillCode',width: 200 },
{ title: '订单号', index: 'billCode',width: 200 },
{ title: '运单号', index: 'wayBillCode', width: 200 },
{ title: '订单号', index: 'billCode', width: 200 },
{
title: '开票状态',
index: 'invoicingStatus',
@ -157,12 +158,12 @@ export class ETCInvoicedListComponent implements OnInit {
width: 120
},
{ title: '订单类型', index: 'billTypeLabel', width: 120 },
{ title: '装货地', index: 'loadingPlace',width: 200 },
{ title: '卸货地', index: 'dischargePlace' ,width: 200},
{ title: '司机信息', render: 'call1No' ,width: 200},
{ title: '车辆信息', render: 'call12No',width: 200 },
{ title: '托运人', index: 'shipperAppUserName',width: 200 },
{ title: '网络货运人', index: 'enterpriseInfoName' ,width: 200},
{ title: '装货地', index: 'loadingPlace', width: 200 },
{ title: '卸货地', index: 'dischargePlace', width: 200 },
{ title: '司机信息', render: 'call1No', width: 200 },
{ title: '车辆信息', render: 'call12No', width: 200 },
{ title: '托运人', index: 'shipperAppUserName', width: 200 },
{ title: '网络货运人', index: 'enterpriseInfoName', width: 200 },
{
title: '开票金额',
index: 'invoicingAmount',
@ -175,11 +176,9 @@ export class ETCInvoicedListComponent implements OnInit {
title: '开票张数',
index: 'invoicingNumber',
width: 100,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicingNumber }) }
className: 'text-right'
},
{ title: '申请时间', index: 'orderReceivingTime', type: 'date',width: 200 },
{ title: '申请时间', index: 'orderReceivingTime', type: 'date', width: 200 },
{
title: '操作',
className: 'text-center',

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

@ -27,6 +27,6 @@
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
[scroll]="{ x: '860px', y: '400px' }"
[scroll]="{ x: '890px', y: '400px' }"
></st>
</div>

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

@ -20,7 +20,7 @@ import { TicketService } from '../../../services/ticket.service';
templateUrl: './transaction-details.component.html'
})
export class TransactionDetailsComponent implements OnInit {
data :any= [];
data: any = [];
selectedData = [];
url = `/api/fcc/ficoEtcInvoiceH/list/page`;
@ViewChild('st', { static: true })
@ -28,9 +28,15 @@ export class TransactionDetailsComponent implements OnInit {
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = [
{ title: '交易id', index: 'id' },
{ title: '交易id', index: 'tradeId' },
{ title: '交易流水号', index: 'tradeFlowNo' },
{ title: '交易金额', index: 'fee' },
{
title: '交易金额',
index: 'fee',
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fee }) }
},
{ title: '开票状态', index: 'stateLabel' },
{ title: '交易时间', index: 'exTime', type: 'date' }
];
@ -63,17 +69,15 @@ export class TransactionDetailsComponent implements OnInit {
}
};
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {
console.log(this.data);
}
get reqParams() {
const a: any = {};
if (this.data?.id) {
a.wayBillId = this.data?.wayBillId;
a.waybillId = this.data?.wayBillId;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;