diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
index f93c4c37..d630043c 100644
--- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
+++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts
@@ -45,13 +45,13 @@ export class ReceivableOrderDetailComponent implements OnInit {
Object.assign(requestOptions.body, { ahxHId: this.id });
if (this.sf) {
Object.assign(requestOptions.body, {
- ...this.sf.value,
+ ...this.sf.value
});
if (this.sf.value.feedate?.[0]) {
Object.assign(requestOptions.body, {
feedate: {
- start: this.sf.value.feedate?.[0] || '',
- end: this.sf.value.feedate?.[1] || ''
+ start: this.sf.value.feedate?.[0] || '',
+ end: this.sf.value.feedate?.[1] || ''
}
});
}
@@ -108,7 +108,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.service.getCloseAccount(),
+ asyncData: () => this.service.getCloseAccount()
},
default: ''
},
@@ -122,7 +122,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
- },
+ }
// billTime: {
// title: '订单日期',
// type: 'string',
@@ -146,7 +146,7 @@ export class ReceivableOrderDetailComponent implements OnInit {
{ title: '订单号', index: 'billHCode', width: 100 },
// { title: '订单日期', index: 'billTime', width: 150 },
// { title: '费用类型', index: 'cnoName', width: 90 },
- // { title: '订单费用科目', index: 'feeSubId', width: 100 },
+ { title: '订单费用科目', index: 'billLTypeLabel', width: 100 },
{ title: '费用科目', index: 'feeSubName', width: 140 },
{ title: '结算客户', index: 'cnoName', width: 100 },
{
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
index feb71a74..bdf26c72 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-detail/voucher-detail.component.html
@@ -22,7 +22,7 @@
- {{info?.ltdId}}
+ {{info?.vcltdcode}} - {{info?.vcltdname}}
{{info?.vctype}}
diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
index 9923c87f..f6a790ad 100644
--- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
+++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
@@ -13,9 +13,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 { ShipperBaseService } from '@shared';
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';
@Component({
@@ -294,7 +292,7 @@ export class VoucherManagementComponent implements OnInit {
return [
{ title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
{ title: '凭证号', index: 'vccode', type: 'link', width: 200 },
- { title: '帐套', index: 'ltdId', width: 200 },
+ { title: '帐套', index: 'ltdId', width: 200,format:item=>`${item.vcltdcode}-${item.vcltdname}` },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 200 },
{ title: '凭证类型', index: 'vctype', width: 200 },
{ title: '序号', index: 'invmoney', width: 200, format: _ => '1' },