From 48ce6a1d1025c8ab91930e313b1895051f86337e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 19 Jan 2022 16:30:12 +0800 Subject: [PATCH] edit --- proxy.conf.js | 2 +- .../cost-management-detail.component.ts | 84 ++++--- .../cost-management.component.ts | 20 +- .../payment-order-detail.component.html | 24 +- .../payment-order-detail.component.ts | 28 ++- .../payment-order/payment-order.component.ts | 35 +-- .../payment-record.component.ts | 25 +- .../receipt-order-detail.component.html | 96 ++++++++ .../receipt-order-detail.component.less | 24 ++ .../receipt-order-detail.component.ts | 79 ++++++ .../receipt-order.component.less | 0 .../receipt-order.component.spec.ts | 25 -- .../receipt-order/receipt-order.component.ts | 33 ++- .../voucher-list/voucher-list.component.html | 31 +++ .../voucher-list/voucher-list.component.ts | 225 ++++++++++++++++++ .../voucher-summary.component.ts | 2 +- .../financial-managemen-routing.module.ts | 7 + .../financial-management.module.ts | 4 +- .../services/freight-account.service.ts | 8 + .../invoice-detail.component.ts | 6 +- .../invoice-requested-detail.component.ts | 3 +- .../invoiced-list/invoiced-list.component.ts | 6 +- 22 files changed, 623 insertions(+), 144 deletions(-) create mode 100644 src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html create mode 100644 src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.less create mode 100644 src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts delete mode 100644 src/app/routes/financial-management/components/receipt-order/receipt-order.component.less delete mode 100644 src/app/routes/financial-management/components/receipt-order/receipt-order.component.spec.ts create mode 100644 src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html create mode 100644 src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts diff --git a/proxy.conf.js b/proxy.conf.js index 87118004..01c511b5 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts index 7ce74f24..92c8c1b3 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts @@ -13,7 +13,7 @@ export class CostManagementDetailComponent implements OnInit { st!: STComponent; columns: { [key: string]: STColumn[] } = this.initST(); data = []; - textStatus: boolean = false + textStatus: boolean = false; costInfo: any = {}; constructor(public service: FreightAccountService, private route: ActivatedRoute) { const id = route.snapshot.params.id; @@ -21,10 +21,10 @@ export class CostManagementDetailComponent implements OnInit { } ngOnInit(): void { - if(this.route.snapshot?.queryParams?.status === '应收') { - this.textStatus = false + if (this.route.snapshot?.queryParams?.status === '应收') { + this.textStatus = false; } else { - this.textStatus = true + this.textStatus = true; } } @@ -36,6 +36,14 @@ export class CostManagementDetailComponent implements OnInit { }); } + loadAHXL(id: any) { + this.service.request(this.service.$api_get_cost_ahxl_detail, { id }).subscribe(res => { + if (res) { + this.costInfo = res; + } + }); + } + goBack() { history.go(-1); } @@ -43,39 +51,39 @@ export class CostManagementDetailComponent implements OnInit { private initST(): { [key: string]: STColumn[] } { return { cost: [ - { title: '序号', render: 'no', width: 70,className: 'text-left', }, - { title: '费用明细号', index: 'feeHId',className: 'text-left', width: 200,}, - { title: '订单号', index: 'billHId' ,className: 'text-left', width: 200,}, - { title: '订单日期', index: 'callNo' ,className: 'text-left',width: 200,}, - { title: '运单号', index: 'waybillHId',className: 'text-left', width: 200,}, - { title: '运单日期', index: 'waybillDate' ,className: 'text-left',width: 200,}, - { title: '结算客户', index: 'callNo' ,className: 'text-left',width: 200,}, - { title: '订单费用类型', index: 'billLType' ,className: 'text-left',width: 200,}, - { title: '费用科目', index: 'feeSubId' ,className: 'text-left',width: 200,}, - { title: '税率', index: 'hrvatrate',className: 'text-right', width: 200,}, - { title: '费用金额', render: 'hrvatmoney',className: 'text-right', width: 200,}, - { title: '收/付款金额', render: 'armoney',className: 'text-right', width: 200,}, - { title: '开/收票金额', render: 'arkpmoney' ,className: 'text-right',width: 200,} + { title: '序号', render: 'no', width: 70, className: 'text-left' }, + { title: '费用明细号', index: 'feeHId', className: 'text-left', width: 200 }, + { title: '订单号', index: 'billHId', className: 'text-left', width: 200 }, + { title: '订单日期', index: 'callNo', className: 'text-left', width: 200 }, + { title: '运单号', index: 'waybillHId', className: 'text-left', width: 200 }, + { title: '运单日期', index: 'waybillDate', className: 'text-left', width: 200 }, + { title: '结算客户', index: 'callNo', className: 'text-left', width: 200 }, + { title: '订单费用类型', index: 'billLType', className: 'text-left', width: 200 }, + { title: '费用科目', index: 'feeSubId', className: 'text-left', width: 200 }, + { title: '税率', index: 'hrvatrate', className: 'text-right', width: 200 }, + { title: '费用金额', render: 'hrvatmoney', className: 'text-right', width: 200 }, + { title: '收/付款金额', render: 'armoney', className: 'text-right', width: 200 }, + { title: '开/收票金额', render: 'arkpmoney', className: 'text-right', width: 200 } ], requested: [ - { title: '序号', render: 'no', width: 70 ,className: 'text-left',}, - { title: '费用明细号', index: 'feeHId',className: 'text-left',width: 200, }, - { title: '发票申请', index: 'vatappcode',className: 'text-left', width: 200,}, - { title: '发票类型', index: 'vatapptype',className: 'text-left',width: 200, }, - { title: '发票号', index: 'vatappcode',className: 'text-left',width: 200, }, - { title: '发票日期', index: 'vatappdate',className: 'text-left', width: 200,}, - { title: '发票状态', index: 'sts' ,className: 'text-left',width: 200,}, - { title: '应收金额', render: 'vatnotax',className: 'text-left',width: 200, }, - { title: '开票金额', render: 'vatmoney' ,className: 'text-left',width: 200,} + { title: '序号', render: 'no', width: 70, className: 'text-left' }, + { title: '费用明细号', index: 'feeHId', className: 'text-left', width: 200 }, + { title: '发票申请', index: 'vatappcode', className: 'text-left', width: 200 }, + { title: '发票类型', index: 'vatapptype', className: 'text-left', width: 200 }, + { title: '发票号', index: 'vatappcode', className: 'text-left', width: 200 }, + { title: '发票日期', index: 'vatappdate', className: 'text-left', width: 200 }, + { title: '发票状态', index: 'sts', className: 'text-left', width: 200 }, + { title: '应收金额', render: 'vatnotax', className: 'text-left', width: 200 }, + { title: '开票金额', render: 'vatmoney', className: 'text-left', width: 200 } ], collection: [ - { title: '序号', render: 'no', width: 70, }, - { title: '费用明细号', index: 'feeLId' ,className: 'text-left', width: 200,}, - { title: '收款单号', index: 'ahxHId' ,className: 'text-left', width: 200,}, - { title: '收款日期', index: 'feedate' ,className: 'text-left', width: 200,}, - { title: '收款状态', render: 'status' ,className: 'text-left', width: 150,}, - { title: '应收金额', render: 'ahxmoney' ,className: 'text-left', width: 120,}, - { title: '收款金额', render: 'ahxmoney',className: 'text-left', width: 120, } + { title: '序号', render: 'no', width: 70 }, + { title: '费用明细号', index: 'feeLId', className: 'text-left', width: 200 }, + { title: '收款单号', index: 'ahxHId', className: 'text-left', width: 200 }, + { title: '收款日期', index: 'feedate', className: 'text-left', width: 200 }, + { title: '收款状态', render: 'status', className: 'text-left', width: 150 }, + { title: '应收金额', render: 'ahxmoney', className: 'text-left', width: 120 }, + { title: '收款金额', render: 'ahxmoney', className: 'text-left', width: 120 } ], ticket: [ { title: '序号', render: 'no', width: 70 }, @@ -90,13 +98,13 @@ export class CostManagementDetailComponent implements OnInit { ], payment: [ { title: '序号', render: 'no', width: 70 }, - { title: '费用明细号', index: 'callNo' }, - { title: '付款单号', index: 'callNo' }, - { title: '要求日期', index: 'callNo' }, - { title: '确认日期', index: 'callNo' }, + { title: '费用明细号', index: 'feeHCode' }, + { title: '付款单号', index: 'phxHId' }, + { title: '要求日期', index: 'billTime' }, + { title: '确认日期', index: 'feedate' }, { title: '付款状态', index: 'callNo' }, { title: '应付金额', index: 'callNo' }, - { title: '付款金额', index: 'callNo' } + { title: '付款金额', index: 'phxmoney' } ] }; } diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 24309484..bcaedcfd 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -253,34 +253,34 @@ export class CostManagementComponent implements OnInit { { title: '订单号', index: 'billHId', width: 200,className: 'text-left', }, { title: '运单号', index: 'waybillHId', width: 200 ,className: 'text-left',}, { title: '费用日期', index: 'feedate', width: 200 ,className: 'text-left',}, - { title: '费用类型', index: 'feetypeLabel', width: 150,className: 'text-left', }, + { title: '费用类型', index: 'feetypeLabel', width: 150,className: 'text-center', }, { title: '应付核销', index: 'ishrhx', width: 200, type: 'enum', enum: { 0: '否', 1: '是' } ,className: 'text-left',}, { title: '结算客户', index: 'cno', width: 200 ,className: 'text-left',}, { title: '应收对象', index: 'artoname', width: 200 ,className: 'text-left',}, { title: '应付对象', index: 'hrtoname', width: 200 ,className: 'text-left',}, - { title: '应收金额', render: 'armoeny', width: 100 ,className: 'text-left',}, - { title: '应付金额', render: 'hrmoney', width: 100 ,className: 'text-left',}, - { title: '收/付款金额', render: 'hrpaymoney', width: 120 ,className: 'text-left',}, - { title: '开/收票金额', render: 'hrvatmoney', width: 120 ,className: 'text-left',}, - { title: '创建时间', index: 'auditTime', type: 'date', width: 200 ,className: 'text-left',}, - { title: '状态', index: 'stsLabel', width: 90 ,className: 'text-left',}, + { title: '应收金额', render: 'armoeny', width: 100 ,className: 'text-right',}, + { title: '应付金额', render: 'hrmoney', width: 100 ,className: 'text-right',}, + { title: '收/付款金额', render: 'hrpaymoney', width: 120 ,className: 'text-right',}, + { title: '开/收票金额', render: 'hrvatmoney', width: 120 ,className: 'text-right',}, + { title: '创建时间', index: 'auditTime', type: 'date', width: 200 ,className: 'text-center',}, + { title: '状态', index: 'stsLabel', width: 90 ,className: 'text-center',}, { title: '操作', fixed: 'right', className: 'text-center', - width: '90px', + width: '110px', buttons: [ { text: '浏览', click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id , {status : item?.feetypeLabel}) }, { - text: '审核　', + text: '审核', click: item => this.auditAction(item), iif: item => item.sts === 2 }, { - text: '修改　', + text: '修改', click: item => this.router.navigate(['/financial-management/cost-management/expenses-receivable/1'], { queryParams: { id: 1 } }) } ] diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html index c8661053..29d5cb7c 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html @@ -1,4 +1,4 @@ - + + + + + +
+
+ + 基本信息 + + {{ costInfo?.ltdid }} + + + {{ costInfo?.feetype }} + + + {{ costInfo?.arremarks }} + + + {{ costInfo?.artoname }} + + + {{ costInfo?.arvattype }} + + + {{ costInfo?.armoeny }} + + + {{ costInfo?.arkpmoney }} + + + {{ costInfo?.arbrmmoney }} + + + {{ costInfo?.ltdid }} + + + {{ costInfo?.feetype }} + + + {{ costInfo?.hrremarks }} + + + {{ costInfo?.hrtoname }} + + + {{ costInfo?.hrvattype }} + + + {{ costInfo?.hrmoney }} + + +
+
+ + + + + + + + {{ item.hrvatmoney | currency}} + + + {{ item.armoney | currency}} + + + {{ item.arkpmoney | currency}} + + + + + + + + + {{ item.vatnotax | currency}} + + + {{ item.vatmoney | currency}} + + + {{ index + 1 }} + + + + + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.less b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.less new file mode 100644 index 00000000..aa2721f6 --- /dev/null +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.less @@ -0,0 +1,24 @@ +:host::ng-deep { + .search-box { + .ant-card-body { + padding-bottom: 18px; + } + } + + .content-box { + .ant-card-body { + padding-top: 14px; + } + } + + + .text-truncate { + white-space: normal; + } + + .ant-form-item { + margin-bottom: 0; + } + + +} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts new file mode 100644 index 00000000..6e64c71c --- /dev/null +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts @@ -0,0 +1,79 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st'; +import { FreightAccountService } from '../../../services/freight-account.service'; + +@Component({ + selector: 'app-receipt-order-detail', + templateUrl: './receipt-order-detail.component.html', + styleUrls: ['./receipt-order-detail.component.less'] +}) +export class ReceiptOrderDetailComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + columns: { [key: string]: STColumn[] } = this.initST(); + costInfo: any = {}; + id: any = null; + constructor(public service: FreightAccountService, private route: ActivatedRoute) { + this.id = route.snapshot.params.id; + this.loadDetail(this.id); + } + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { + id: this.id + }); + return requestOptions; + }; + + loadDetail(id: any) { + this.service.request(this.service.$api_get_receipt_header, { id }).subscribe(res => { + if (res) { + this.costInfo = res; + } + }); + } + + goBack() { + history.go(-1); + } + + private initST(): { [key: string]: STColumn[] } { + return { + cost: [ + { title: '序号', render: 'no', width: 70, className: 'text-left' }, + { title: '费用号', index: 'feeHId', className: 'text-left', width: 200 }, + { title: '费用日期', index: 'billHId', className: 'text-center', width: 150 }, + { title: '订单号', index: 'callNo', className: 'text-left', width: 200 }, + { title: '订单日期', index: 'waybillHId', className: 'text-center', width: 150 }, + { title: '订单费用类型', index: 'waybillDate', className: 'text-center', width: 160 }, + { title: '费用类型', index: 'callNo', className: 'text-center', width: 160 }, + { title: '费用科目', index: 'billLType', className: 'text-left', width: 160 }, + { title: '结算客户', index: 'feeSubId', className: 'text-left', width: 150 }, + { + title: '已收金额', + index: 'hrvatrate', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + width: 140 + } + ], + requested: [ + { title: '序号', render: 'no', width: 70, className: 'text-left' }, + { title: '结算客户', index: 'cno', className: 'text-left', width: 200 }, + { + title: '预收金额', + index: 'yskmoney', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, + width: 200 + }, + { title: '预收备注', index: 'vatapptype', className: 'text-left', width: 200 } + ] + }; + } +} diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.less b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.less deleted file mode 100644 index e69de29b..00000000 diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.spec.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.spec.ts deleted file mode 100644 index 67886d32..00000000 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ReceiptOrderComponent } from './receipt-order.component'; - -describe('ReceiptOrderComponent', () => { - let component: ReceiptOrderComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ReceiptOrderComponent ] - }) - .compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(ReceiptOrderComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 68fb6231..7c3a1882 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -222,10 +222,10 @@ export class ReceiptOrderComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' }, - { title: '收款单号', index: 'brmcode', type: 'link', width: 180 , className: 'text-left'}, - { title: '网络货运人', index: 'ltdId', width: 200 , className: 'text-left'}, - { title: '到账日期', index: 'brmdate', type: 'date', width: 200 , className: 'text-left'}, - { title: '收款账户', index: 'ltdaccountId', width: 200 , className: 'text-left'}, + { title: '收款单号', index: 'brmcode', type: 'link', width: 180, className: 'text-left' }, + { title: '网络货运人', index: 'ltdId', width: 200, className: 'text-left' }, + { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' }, + { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' }, { title: '到账金额', index: 'brmmoney', @@ -250,28 +250,27 @@ export class ReceiptOrderComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) } }, - { title: '银行类型', index: 'paybanktype', width: 200 , className: 'text-left'}, - { title: '收款类型', index: 'brmtype', width: 150 , className: 'text-left'}, - { title: '收款方式', index: 'brmmode', width: 150 , className: 'text-left'}, - { title: '付款人', index: 'artoname', width: 200 , className: 'text-left'}, - { title: '银行水单', index: 'bankreceipt', width: 200 , className: 'text-left'}, - { title: '创建时间', index: 'createTime', type: 'date', width: 200 , className: 'text-left'}, - { title: '创建人', index: 'createUserId', width: 150 , className: 'text-left'}, - { title: '收款状态', index: 'sts', width: 200 , className: 'text-left'}, - { title: '收款备注', index: 'remarks', width: 200 , className: 'text-left'}, + { title: '银行类型', index: 'paybanktype', width: 200, className: 'text-left' }, + { title: '收款类型', index: 'brmtype', width: 150, className: 'text-left' }, + { title: '收款方式', index: 'brmmode', width: 150, className: 'text-left' }, + { title: '付款人', index: 'artoname', width: 200, className: 'text-left' }, + { title: '银行水单', index: 'bankreceipt', width: 200, className: 'text-left' }, + { title: '创建时间', index: 'createTime', type: 'date', width: 200, className: 'text-left' }, + { title: '创建人', index: 'createUserId', width: 150, className: 'text-left' }, + { title: '收款状态', index: 'sts', width: 200, className: 'text-left' }, + { title: '收款备注', index: 'remarks', width: 200, className: 'text-left' }, { title: '操作', - width: '80px', + width: '110px', fixed: 'right', className: 'text-center', buttons: [ { text: '浏览', - click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id]) + click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id]) }, { - text: '修改　', - click: item => this.router.navigate(['/ticket/input-invoice/edit/1']) + text: '核销' } ] } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html new file mode 100644 index 00000000..00a18f45 --- /dev/null +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html @@ -0,0 +1,31 @@ + + + + +
+
+ +
+
+ + + + + +
+
+ + + + + + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts new file mode 100644 index 00000000..fc9137f1 --- /dev/null +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts @@ -0,0 +1,225 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { FreightAccountService } from '../../../services/freight-account.service'; + +@Component({ + selector: 'app-voucher-list', + templateUrl: './voucher-list.component.html', + styleUrls: ['../../../../commom/less/box.less'] +}) +export class VoucherListComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('auditModal', { static: false }) + auditModal!: any; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); + + _$expand = false; + + selectedRows: any[] = []; + vc2code = null; + constructor(public service: FreightAccountService, private route: ActivatedRoute, private router: Router) { + this.vc2code = route.snapshot.params.id; + } + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { vc2code: this.vc2code }); + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value + }); + if (this.sf.value.createTime) { + Object.assign(requestOptions.body, { + createTime: { + start: this.sf.value.createTime?.[0] || null, + end: this.sf.value.createTime?.[1] || null + } + }); + } + if (this.sf.value.vctime) { + Object.assign(requestOptions.body, { + vctime: { + start: this.sf.value.vctime?.[0] || null, + end: this.sf.value.vctime?.[1] || null + } + }); + } + } + return requestOptions; + }; + + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + } + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/expand', this._$expand); + } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + vccode: { + type: 'string', + title: '凭证号', + ui: { + autocomplete: 'off', + placeholder: '请输入' + } + }, + vctime: { + title: '凭证时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + }, + createTime: { + title: '创建时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + }, + sourceCode: { + type: 'string', + title: '原始单号', + ui: { + autocomplete: 'off', + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + sourceType: { + type: 'string', + title: '原始单类型', + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + drmoney: { + type: 'string', + title: '借方金额', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + inpinvcosde: { + type: 'string', + title: '凭证摘要', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + subid: { + type: 'string', + title: '科目', + ui: { + widget: 'dict-select', + params: { dictKey: 'refund:apply:status' }, + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + crmoney: { + type: 'string', + title: '贷方金额', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '凭证号', index: 'id', type: 'link', width: 150 }, + { title: '帐套', index: 'vcltdid', width: 150 }, + { title: '凭证时间', index: 'vctime', type: 'date', width: 150 }, + { title: '凭证类型', index: 'vctypeLabel', width: 150 }, + { title: '序号', index: 'invmoney', width: 150, format: _ => '1' }, + { title: '摘要', index: 'remarks', width: 300 }, + { title: '币种', index: 'currency', width: 100 }, + { + title: '借方金额', + index: 'drmoney', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.drmoney }) } + }, + { + title: '贷方金额', + index: 'crmoney', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.crmoney }) } + }, + { title: '凭证状态', index: 'stsLabel', width: 120 }, + { title: '创建时间', index: 'createTime', width: 140 }, + { title: '创建人', index: 'createUserId', width: 150 }, + { + title: '操作', + width: '130px', + fixed: 'right', + buttons: [ + { + text: '浏览', + click: (item: any) => this.router.navigate(['/voucher-summary/list/detail/' + item.id]) + } + ] + } + ]; + } +} diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts index 51dadb8e..8c9eb887 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts @@ -320,7 +320,7 @@ export class VoucherSummaryComponent implements OnInit { }, { text: '列表', - click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/detail/' + item.id]) + click: (item: any) => this.router.navigate(['/financial-management/voucher-summary/list/' + item.vc2code]) } ] } diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index a8e96b1f..aa3c0756 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -24,6 +24,9 @@ import { ReceivableOrderDetailComponent } from './components/receivable-order/re import { PayableOrderDetailComponent } from './components/payable-order/payable-order-detail/payable-order-detail.component'; import { VoucherDetailComponent } from './components/voucher-management/voucher-detail/voucher-detail.component'; import { SummaryDetailComponent } from './components/voucher-summary/summary-detail/summary-detail.component'; +import { VoucherListComponent } from './components/voucher-summary/voucher-list/voucher-list.component'; +import { ReceiptOrderDetailComponent } from './components/receipt-order/receipt-order-detail/receipt-order-detail.component'; +import { PaymentOrderDetailComponent } from './components/payment-order/payment-order-detail/payment-order-detail.component'; const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent }, @@ -37,6 +40,8 @@ const routes: Routes = [ { path: 'voucher-management/detail/:id', component: VoucherDetailComponent }, { path: 'voucher-summary', component: VoucherSummaryComponent }, { path: 'voucher-summary/detail/:id', component: SummaryDetailComponent }, + { path: 'voucher-summary/list/:id', component: VoucherListComponent }, + { path: 'voucher-summary/list/detail/:id', component: VoucherDetailComponent }, { path: 'cost-management', component: CostManagementComponent }, { path: 'cost-management/detail/:id', component: CostManagementDetailComponent }, { path: 'cost-management/expenses-receivable/:id', component: ExpensesReceivableComponent }, @@ -45,7 +50,9 @@ const routes: Routes = [ { path: 'payment-record', component: PaymentRecordComponent }, { path: 'transaction-flow', component: TransactionFlowComponent }, { path: 'payment-order', component: PaymentOrderComponent }, + { path: 'payment-order/detail/:id', component: PaymentOrderDetailComponent }, { path: 'receipt-order', component: ReceiptOrderComponent }, + { path: 'receipt-order/detail/:id', component: ReceiptOrderDetailComponent }, { path: 'receivable-order', component: ReceivableOrderComponent }, { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, { path: 'payable-order', component: PayableOrderComponent }, diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index cbe3417d..d1f513ce 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -29,6 +29,8 @@ import { PayableOrderDetailComponent } from './components/payable-order/payable- import { VoucherDetailComponent } from './components/voucher-management/voucher-detail/voucher-detail.component'; import { SummaryDetailComponent } from './components/voucher-summary/summary-detail/summary-detail.component'; import { PaymentOrderDetailComponent } from './components/payment-order/payment-order-detail/payment-order-detail.component'; +import { VoucherListComponent } from './components/voucher-summary/voucher-list/voucher-list.component'; +import { ReceiptOrderDetailComponent } from './components/receipt-order/receipt-order-detail/receipt-order-detail.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -58,7 +60,7 @@ const ROUTESCOMPONENTS = [ const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent]; @NgModule({ - declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS, PaymentOrderDetailComponent], + declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS, PaymentOrderDetailComponent, VoucherListComponent, ReceiptOrderDetailComponent], imports: [CommonModule, FinancialManagementRoutingModule, SharedModule] }) export class FinancialManagementModule {} diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 5e398b64..1eb557a5 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -57,6 +57,8 @@ export class FreightAccountService extends ShipperBaseService { $api_get_cost_page = '/api/fcc/ficoFeeH/list/page'; // 根据费用头ID查询费用单及开票明细 $api_get_cost_detail = '/api/fcc/ficoFeeL/detail'; + // 费用关联的应收核销明细 + $api_get_cost_ahxl_detail = '/api/fcc/ficoAhxL/getListByFeeLId'; // 查询应收核销抬头 $api_get_fico_page = '/api/fcc/ficoAhxH/list/page'; @@ -81,9 +83,15 @@ export class FreightAccountService extends ShipperBaseService { $api_get_payment_page = '/api/fcc/ficoPayH/listFicoPayHPage'; // 查询付款单明细 $api_get_payment_detail = '/api/fcc/ficoPayL/list/page'; + // 付款单抬头信息 + $api_get_payment_header = '/api/fcc/ficoPayH/getFicoPayHById'; // 查询收款单抬头 $api_get_receipt_page = '/api/fcc/ficoBrmH/list/page'; + // 获取收款单抬头 + $api_get_receipt_header = '/api/fcc/ficoBrmH/get'; + // 获取收款单抬头 + $api_get_receipt_detail = '/api/fcc/ficoBrmYsk/getListByBrmHid'; // 收款单浏览抬头 $api_get_ficoInpinvL_page = '/api/fcc/ficoBrmH/get'; diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 0df1b758..5cc94f2a 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -37,11 +37,12 @@ export class InvoiceDetailComponent implements OnInit { mailNo: '', routes: [] }; + id: any = null; constructor(public service: TicketService, private route: ActivatedRoute) { this.isCanEdit = !!route.snapshot.queryParams.type; const expressno = route.snapshot.queryParams.expressno; - const id = route.snapshot.params.id; - this.loadInvoiceHeader(id); + this.id = route.snapshot.params.id; + this.loadInvoiceHeader(this.id); if (expressno) { this.loadRoutes(expressno); } @@ -50,6 +51,7 @@ export class InvoiceDetailComponent implements OnInit { ngOnInit(): void {} beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { vatinvHId: this.id }); if (this.orderSf) { Object.assign(requestOptions.body, { ...this.orderSf.value }); } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 29647e89..1be0fd06 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -49,6 +49,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { } beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { vatappHId: this.id }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); } @@ -273,7 +274,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { { title: '', index: 'key', type: 'checkbox' }, { title: '订单号', render: 'billHCode', width: 170 }, { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 }, - { title: '开票状态', index: 'vatappSts', width: 100 }, + { title: '开票状态', index: 'vatappStsLabel', width: 100 }, { title: '所属项目', index: 'projectId', width: 140 }, { title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } }, { title: '装货地', index: 'loadingfrom', width: 220 }, diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 94bdb9ac..1e3256bb 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -190,8 +190,8 @@ export class InvoicedListComponent implements OnInit { }) }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, - { title: '发票类型', index: 'invoicetype', width: 100 }, - { title: '网络货运人', index: 'ltdId', width: 120 }, + { title: '发票类型', index: 'invoicetypeLabel', className: 'text-center', width: 140 }, + { title: '网络货运人', index: 'ltdName', width: 120 }, { title: '购买人', index: 'artoname', width: 90 }, { title: '订单数', index: 'ordlines', className: 'text-right', width: 90 }, { @@ -225,7 +225,7 @@ export class InvoicedListComponent implements OnInit { render: 'expresscompany', width: 180 }, - { title: '状态', index: 'sts', width: 90 }, + { title: '状态', index: 'stsLabel', width: 90 }, { title: '操作', fixed: 'right',