This commit is contained in:
Taric Xin
2022-02-10 16:04:12 +08:00
parent 22228e623a
commit db3013c809
5 changed files with 59 additions and 42 deletions

View File

@ -3,6 +3,7 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { DateHelperByDatePipe } from 'ng-zorro-antd/i18n';
import { NzModalService } from 'ng-zorro-antd/modal';
import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
import { FreightAccountService } from '../../services/freight-account.service';
@ -23,7 +24,12 @@ export class VoucherSummaryComponent implements OnInit {
_$expand = false;
selectedRows: any[] = [];
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
constructor(
public service: FreightAccountService,
private nzModalService: NzModalService,
private router: Router,
private dateHelperByDatePipe: DateHelperByDatePipe
) {}
ngOnInit(): void {}
@ -283,8 +289,18 @@ export class VoucherSummaryComponent implements OnInit {
{ title: '汇总凭证号', index: 'vc2code', type: 'link', width: 140 },
{ title: '帐套', index: 'vcltdcode', width: 120 },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
{ title: '统计时间', index: 'invdate', type: 'date', width: 150 },
{ title: '凭证类型', index: 'vctypeLabel', width: 120 },
{
title: '统计区间',
index: 'invdate',
type: 'date',
width: 200,
format: item =>
`${this.dateHelperByDatePipe.format(item.vctime2start, 'yyyy-MM-dd')} | ${this.dateHelperByDatePipe.format(
item.vctime2end,
'yyyy-MM-dd'
)}`
},
{ title: '凭证类型', index: 'vctype', width: 120 },
{ title: '序号', index: 'invmoney', width: 100, format: _ => '1' },
{ title: '摘要', index: 'remarks', width: 120 },
{ title: '币种', index: 'currency', width: 100 },
@ -306,8 +322,8 @@ export class VoucherSummaryComponent implements OnInit {
},
{ title: 'NC凭证', index: 'importncnotes', width: 120 },
{ title: '凭证状态', index: 'stsLabel', width: 120 },
{ title: '创建时间', index: 'createTime', width: 150 },
{ title: '创建人', index: 'createUserId', width: 120 },
{ title: '创建时间', index: 'createTime', width: 180 },
{ title: '创建人', index: 'createUserName', width: 120 },
{
title: '操作',
width: '130px',