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-01-19 16:54:07 +08:00
parent dbb0aa089f 94c8c45126
commit 716b7f3aef
21 changed files with 622 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts
View File

@ -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' }
]
};
}

20
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -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 } })
}
]

24
src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
View File

@ -1,4 +1,4 @@
<page-header-wrapper [title]="'收票信息'" [logo]="logo">
<page-header-wrapper [title]="'付款单'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
@ -10,13 +10,13 @@
<div nz-row nzGutter="8">
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
<se label="网络货运人" required>
{{headerInfo?.ltdid}}
{{headerInfo?.ltdName}}
</se>
<se label="收款人" required>
{{headerInfo?.invdate}}
{{headerInfo?.hrToName}}
</se>
<se label="付款账户" required>
{{headerInfo?.invdate}}
{{headerInfo?.ltdAccountId}}
</se>
<se label="应付已核销" required>
{{headerInfo?.invdate}}
@ -24,27 +24,27 @@
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="要求付款日期" required>
{{headerInfo?.hrtoName}}
{{headerInfo?.payDate}}
</se>
<se label="收款账户" required>
{{headerInfo?.invoiceno}}
{{headerInfo?.hrBankNo}}
</se>
<se label="确认日期" required>
{{headerInfo?.invoiceno}}
{{headerInfo?.payDate2}}
</se>
<se label="付款备注" >
{{headerInfo?.invoiceno}}
<se label="付款备注">
{{headerInfo?.payRemarks}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="付款方式" required>
{{headerInfo?.invtype}}
{{headerInfo?.payModeLabel}}
</se>
<se label="付款类型" required>
{{headerInfo?.remarks}}
{{headerInfo?.payTypeLabel}}
</se>
<se label="付款金额" required>
{{headerInfo?.remarks}}
{{headerInfo?.payMoney |currency}}
</se>
</div>
</div>

28
src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts
View File

@ -29,11 +29,11 @@ export class PaymentOrderDetailComponent implements OnInit {
ngOnInit(): void {}
loadHeadInfo() {
// this.service.request(this.service.$api_get_input_invoice_header, { id: this.id }).subscribe(res => {
// if (res) {
// this.headerInfo = res;
// }
// });
this.service.request(this.service.$api_get_payment_header, { id: this.id }).subscribe(res => {
if (res) {
this.headerInfo = res;
}
});
}
beforeReq = (requestOptions: STRequestOptions) => {
@ -150,8 +150,22 @@ export class PaymentOrderDetailComponent implements OnInit {
{ title: '订单日期', index: 'billTime', width: 150 },
{ title: '结算客户', index: 'cnoName', width: 90 },
{ title: '费用科目', index: 'feeSubId', width: 100 },
{ title: '收票金额', index: 'paymoney', width: 140 },
{ title: '收票税额', index: 'invtax', width: 100 }
{
title: '收票金额',
index: 'paymoney',
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
},
{
title: '收票税额',
index: 'invtax',
width: 140,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invtax }) }
}
];
}
}

35
src/app/routes/financial-management/components/payment-order/payment-order.component.ts
View File

@ -225,38 +225,39 @@ export class PaymentOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '付款单号', index: 'paycode', type: 'link' },
{ title: '网络货运人', index: 'ltdId' },
{ title: '要求付款日期', index: 'paydate', type: 'date', width: 140 },
{ title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
{ title: '付款单号', index: 'payCode', type: 'link', width: 180 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
{
title: '付款金额',
index: 'paymoney',
index: 'payMoney',
width: 120,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
},
{ title: '付款类型', index: 'paytype' },
{ title: '付款方式', index: 'paymode' },
{ title: '结算客户', index: 'call1N2o' },
{ title: '收款人', index: 'hrto' },
{ title: '应付已核销', index: 'callNo' },
{ title: '确认日期', index: 'paydate2', type: 'date' },
{ title: '创建时间', index: 'createTime', type: 'date' },
{ title: '创建人', index: 'createUserId' },
{ title: '付款备注', index: 'payremarks' },
{ title: '付款类型', index: 'payTypeLabel', width: 130 },
{ title: '付款方式', index: 'payModeLabel', width: 130 },
{ title: '结算客户', index: 'shipperId', width: 160 },
{ title: '收款人', index: 'hrToName', width: 150 },
{ title: '应付已核销', index: 'callNo', width: 150 },
{ title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
{ title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 },
{ title: '创建人', index: 'createUserId', width: 160 },
{ title: '付款备注', index: 'payRemarks', width: 200 },
{
title: '操作',
width: '90px',
className: 'text-center',
fixed: 'right',
width: '110px',
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
},
{
text: '修改',
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
}
]
}

25
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -238,8 +238,15 @@ export class PaymentRecordComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '支付编号', render: 'orderPaymentCode', width: 170 },
{ title: '支付金额', render: 'payAmount', width: 100, format: item => `￥${item.payAmount}` },
{ title: '支付编号', render: 'orderPaymentCode', width: 180 },
{
title: '支付金额',
render: 'payAmount',
width: 120,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payAmount }) }
},
{
title: '运费明细',
render: 'amountDetails',
@ -259,10 +266,10 @@ export class PaymentRecordComponent implements OnInit {
index: 'payTypeLabel',
width: 130
},
{ title: '货主', index: 'enterpriseInfoName', width: 140 },
{ title: '订单号', render: 'billCode', width: 140 },
{ title: '运单号', render: 'wayBillCode', width: 140 },
{ title: '货源编号', index: 'resourceCode', width: 120 },
{ title: '货主', index: 'enterpriseInfoName', width: 160 },
{ title: '订单号', render: 'billCode', width: 160 },
{ title: '运单号', render: 'wayBillCode', width: 160 },
{ title: '货源编号', index: 'resourceCode', width: 160 },
{
title: '服务类型',
index: 'serviceTypeLabel',
@ -271,12 +278,12 @@ export class PaymentRecordComponent implements OnInit {
{ title: '承运司机', render: 'driverId', width: 120 },
{ title: '收款人', render: 'captainName', width: 120 },
{ title: '银行类型', index: 'bankType', width: 150, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '网络货运人', index: 'ltdName', width: 120 },
{ title: '网络货运人', index: 'ltdName', width: 160 },
{ title: '申请时间', index: 'applyTime', width: 160 },
{ title: '申请人', index: 'applyUserName', width: 90 },
{ title: '处理时间', index: 'handlerTime', width: 180 },
{ title: '处理人', index: 'handlerUserName', width: 90 },
{ title: '失败原因', index: 'failCause', width: 100 },
{ title: '失败原因', index: 'failCause', width: 250 },
{
title: '操作',
fixed: 'right',
@ -285,7 +292,7 @@ export class PaymentRecordComponent implements OnInit {
buttons: [
{
text: '关闭',
iif: item => item.paymentStatus === 4,
iif: item => item.paymentStatus === '4',
click: item => this.refund(item)
}
]

96
src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html Normal file
View File

@ -0,0 +1,96 @@
<page-header-wrapper title="收款单" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
</page-header-wrapper>
<nz-card class="search-box">
<div nz-row>
<div nz-col nzSpan="24">
<se-container col="3" labelWidth="100">
<se-title class="mb-md" style="font-size: 18px">基本信息</se-title>
<se label="网络货运人" required>
{{ costInfo?.ltdid }}
</se>
<se label="到账日期" required>
{{ costInfo?.feetype }}
</se>
<se label="收款方式" required>
{{ costInfo?.arremarks }}
</se>
<se label="银行类型">
{{ costInfo?.artoname }}
</se>
<se label="付款人" required>
{{ costInfo?.arvattype }}
</se>
<se label="收款类型" required>
{{ costInfo?.armoeny }}
</se>
<se label="收款账户" required>
{{ costInfo?.arkpmoney }}
</se>
<se label="尾差">
{{ costInfo?.arbrmmoney }}
</se>
<se label="手续费">
{{ costInfo?.ltdid }}
</se>
<se label="到账金额" required>
{{ costInfo?.feetype }}
</se>
<se label="核销金额">
{{ costInfo?.hrremarks }}
</se>
<se label="银行水单">
{{ costInfo?.hrtoname }}
</se>
<se label="预收金额">
{{ costInfo?.hrvattype }}
</se>
<se label="收款备注">
{{ costInfo?.hrmoney }}
</se>
</se-container>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="核销信息">
<st #st [scroll]="{ x: '2000px' }" [data]="[]" [columns]="columns.cost" [page]="{ show: false }"
[loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="hrvatmoney" let-item let-index="index">
{{ item.hrvatmoney | currency}}
</ng-template>
<ng-template st-row="armoney" let-item let-index="index">
{{ item.armoney | currency}}
</ng-template>
<ng-template st-row="arkpmoney" let-item let-index="index">
{{ item.arkpmoney | currency}}
</ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column">
</ng-template>
</st>
</nz-tab>
<nz-tab nzTitle="预收信息">
<st #st [scroll]="{ x: '2000px' }" [data]="service.$api_get_receipt_detail" [columns]="columns.requested"
[req]="{ method: 'POST', allInBody: true, process: beforeReq }"
[res]="{ reName: { list: 'data' } }" [page]="{ show: false }"
[loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="vatnotax" let-item let-index="index">
{{ item.vatnotax | currency}}
</ng-template>
<ng-template st-row="vatmoney" let-item let-index="index">
{{ item.vatmoney | currency}}
</ng-template>
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }}
</ng-template>
</st>
</nz-tab>
</nz-tabset>
</nz-card>

24
src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.less Normal file
View File

@ -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;
}
}

79
src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.ts Normal file
View File

@ -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 }
]
};
}
}

0
src/app/routes/financial-management/components/receipt-order/receipt-order.component.less
View File

25
src/app/routes/financial-management/components/receipt-order/receipt-order.component.spec.ts
View File

@ -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<ReceiptOrderComponent>;
beforeEach(async () => {
await TestBed.configureTestingModule({
declarations: [ ReceiptOrderComponent ]
})
.compileComponents();
});
beforeEach(() => {
fixture = TestBed.createComponent(ReceiptOrderComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

33
src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
View File

@ -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: '核销'
}
]
}

31
src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.html Normal file
View File

@ -0,0 +1,31 @@
<page-header-wrapper [title]="'凭证管理'">
</page-header-wrapper>
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出明细</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)" class="mt-md">
</st>
</nz-card>

225
src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts Normal file
View File

@ -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])
}
]
}
];
}
}

2
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts
View File

@ -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])
}
]
}

7
src/app/routes/financial-management/financial-managemen-routing.module.ts
View File

@ -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 },

4
src/app/routes/financial-management/financial-management.module.ts
View File

@ -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 {}

8
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -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';

6
src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
View File

@ -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 });
}

3
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -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 },

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

@ -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',