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-13 10:42:52 +08:00
parent 8b7edc68f0 42568efef5
commit 08cecb1ac7
2 changed files with 3 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.component.ts
View File

@ -212,7 +212,7 @@ export class InvoiceRequestedComponent {
label: '手工处理', label: '手工处理',
onClick: () => { onClick: () => {
const params = { const params = {
ficoVatappBillVOList: this.selectedRows.map(item => { ficoVatappHVOList: this.selectedRows.map(item => {
const i = Object.assign({}, { ...item }); const i = Object.assign({}, { ...item });
delete i._values; delete i._values;
delete i._rowClassName; delete i._rowClassName;
@ -236,7 +236,7 @@ export class InvoiceRequestedComponent {
label: '自动开票', label: '自动开票',
onClick: () => { onClick: () => {
const params = { const params = {
ficoVatappBillVOList: this.selectedRows.map(item => { ficoVatappHVOList: this.selectedRows.map(item => {
const i = Object.assign({}, { ...item }); const i = Object.assign({}, { ...item });
delete i._values; delete i._values;
delete i._rowClassName; delete i._rowClassName;

1
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -186,6 +186,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
} }
}, },
{ title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' }, { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' },
{ title: '审核通过时间', width: '180px', className: 'text-center', index: 'approvalPassTime' },
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',