This commit is contained in:
Taric Xin
2022-01-19 16:30:12 +08:00
parent ce64b48674
commit 48ce6a1d10
22 changed files with 623 additions and 144 deletions

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>

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

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

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

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