Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-01-14 14:23:10 +08:00
parent d4d49d12b1
commit 803835ba0a
9 changed files with 306 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,85 @@
<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="statistics-box">
<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}}
</se>
<se label="结算客户">
{{headerInfo?.cno}}
</se>
<se label="付款账户" required>
{{headerInfo?.shipperaccount}}
</se>
<se label="核销金额" required>
{{headerInfo?.ahxmoney | currency}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="核销日期" required>
{{headerInfo?.phxdate}}
</se>
<se label="收款人" required>
{{headerInfo?.arto}}
</se>
<se label="收款账户" required>
{{headerInfo?.ltdaccount}}
</se>
<se label="应付金额">
{{headerInfo?.prmoney | currency}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="银行类型">
{{headerInfo?.banktype==='1'?'平安':'浦发'}}
</se>
<se label="付款类型" required>
{{headerInfo?.arvattype==='1'?'费用款项':''}}
</se>
<se label="银行水单">
{{headerInfo?.bankreceipt}}
</se>
<se label="收款备注">
{{headerInfo?.remarks}}
</se>
</div>
</div>
</nz-card>
<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: 90,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.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</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_ph_detail_header" [columns]="columns" size="small"
[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: '200px' }">
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{index+1}}
</ng-template>
</st>
</nz-card>

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

@ -0,0 +1,13 @@
:host::ng-deep {
.statistics-box {
.ant-form-item {
margin-bottom: 0;
.ant-form-item-control-input-content {
color: #f5222d;
}
}
}
}

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

@ -0,0 +1,176 @@
import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STComponent, STColumn, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { FreightAccountService } from '../../../services/freight-account.service';
@Component({
selector: 'app-payable-order-detail',
templateUrl: './payable-order-detail.component.html',
styleUrls: ['./payable-order-detail.component.less', '../../../../commom/less/expend-but.less', '../../../../commom/less/box.less'],
providers: [CurrencyPipe]
})
export class PayableOrderDetailComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
id = null;
billHId = null;
headerInfo: any = {};
constructor(public service: FreightAccountService, private route: ActivatedRoute, private currencyPipe: CurrencyPipe) {
this.id = route.snapshot.params.id;
this.billHId = route.snapshot.queryParams.billHId;
this.loadHeadInfo();
}
ngOnInit(): void {}
loadHeadInfo() {
this.service.request(this.service.$api_get_fico_ph_header, { id: this.id }).subscribe(res => {
console.log(res);
if (res) {
this.headerInfo = res;
}
});
}
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { billHId: this.billHId });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
},
feedate: {
start: this.sf.value.feedate?.[0] || null,
end: this.sf.value.feedate?.[1] || null
}
});
if (this.sf.value.billTime) {
Object.assign(requestOptions.body, {
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
}
});
}
if (this.sf.value.feedate) {
Object.assign(requestOptions.body, {
feedate: {
start: this.sf.value.feedate?.[0] || null,
end: this.sf.value.feedate?.[1] || null
}
});
}
}
return requestOptions;
};
goBack() {
history.go(-1);
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
feeHCode: {
type: 'string',
title: '费用单',
ui: {
placeholder: '请输入'
}
},
billHCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
cno: {
type: 'string',
title: '结算客户',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择'
},
default: ''
},
feedate: {
title: '费用日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
billTime: {
title: '订单日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '序号', render: 'no', width: 80 },
{ title: '费用号', index: 'feeHCode', width: 100 },
{ title: '费用日期', index: 'feedate', type: 'date', width: 150 },
{ title: '订单号', index: 'billHCode', width: 100 },
{ title: '订单日期', index: 'billTime', width: 150 },
{ title: '费用类型', index: 'cnoName', width: 90 },
{ title: '订单费用科目', index: 'feeSubId', width: 100 },
{ title: '费用科目', index: 'feeSubId', width: 140 },
{ title: '结算客户', index: 'cno', width: 100 },
{
title: '已收金额',
index: 'phxmoney',
width: 100,
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.armoney || 0)}`
}
];
}
}

2
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -23,7 +23,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_fico_page" [columns]="columns"
<st #st [data]="service.$api_get_fico_ph_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] }"

43
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -11,7 +11,8 @@ import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-payable-order',
templateUrl: './payable-order.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
providers: [CurrencyPipe]
})
export class PayableOrderComponent implements OnInit {
@ViewChild('st', { static: true })
@ -128,18 +129,6 @@ export class PayableOrderComponent implements OnInit {
}
}
},
arvattype: {
type: 'string',
title: '付款类型',
enum: [{ value: '1', label: '费用款项' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
cno: {
type: 'string',
title: '结算客户',
@ -153,7 +142,7 @@ export class PayableOrderComponent implements OnInit {
},
arto: {
type: 'string',
title: '付款人',
title: '收款人',
ui: {
widget: 'select',
placeholder: '请选择',
@ -237,29 +226,28 @@ export class PayableOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
{ title: '核销单号', index: 'phxcode', type: 'link', width: 140 },
{ title: '网络货运人', index: 'ltdId', width: 140 },
{ title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
{ title: '核销日期', index: 'phxdate', type: 'date', width: 160 },
{ title: '付款账户', index: 'shipperaccount', width: 120 },
{ title: '收款账户', index: 'ltdaccount', width: 120 },
{ title: '核销类型', index: 'ahxType', type: 'enum', enum: { '1': '预收款' }, width: 120 },
{
title: '核销金额',
index: 'ahxmoney',
index: 'phxmoney',
width: 120,
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}`
},
{
title: '应收金额',
index: 'armoney',
title: '应付金额',
index: 'prmoney',
width: 120,
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.armoney)}`
format: item => `${this.currencyPipe.transform(item.prmoney || 0)}`
},
{ title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
{ title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
{ title: '付款人', index: 'artoname', width: 120 },
{ title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },
{ title: '收款人', index: 'artoname', width: 120 },
{ title: '结算客户', index: 'cno', width: 120 },
{ title: '银行水单', index: 'bankreceipt', width: 120 },
{ title: '创建时间', index: 'createTime', width: 160 },
@ -269,14 +257,13 @@ export class PayableOrderComponent implements OnInit {
{
title: '操作',
fixed: 'right',
className: 'text-center',
width: 120,
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/financial-management/receivable-order/detail/' + item.id])
},
{
text: '核销'
click: item =>
this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } })
}
]
}

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

@ -21,6 +21,7 @@ import { VoucherSummaryComponent } from './components/voucher-summary/voucher-su
import { ReceivableOrderComponent } from './components/receivable-order/receivable-order.component';
import { PayableOrderComponent } from './components/payable-order/payable-order.component';
import { ReceivableOrderDetailComponent } from './components/receivable-order/receivable-order-detail/receivable-order-detail.component';
import { PayableOrderDetailComponent } from './components/payable-order/payable-order-detail/payable-order-detail.component';
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent },
@ -44,6 +45,7 @@ const routes: Routes = [
{ path: 'receivable-order', component: ReceivableOrderComponent },
{ path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent },
{ path: 'payable-order', component: PayableOrderComponent },
{ path: 'payable-order/detail/:id', component: PayableOrderDetailComponent },
];
@NgModule({

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

@ -25,6 +25,7 @@ import { VoucherSummaryComponent } from './components/voucher-summary/voucher-su
import { ReceivableOrderComponent } from './components/receivable-order/receivable-order.component';
import { PayableOrderComponent } from './components/payable-order/payable-order.component';
import { ReceivableOrderDetailComponent } from './components/receivable-order/receivable-order-detail/receivable-order-detail.component';
import { PayableOrderDetailComponent } from './components/payable-order/payable-order-detail/payable-order-detail.component';
const ROUTESCOMPONENTS = [
FreightAccountComponent,
@ -51,7 +52,7 @@ const ROUTESCOMPONENTS = [
const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent];
@NgModule({
declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS],
declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS, PayableOrderDetailComponent],
imports: [CommonModule, FinancialManagementRoutingModule, SharedModule]
})
export class FinancialManagementModule {}

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

@ -64,6 +64,13 @@ export class FreightAccountService extends ShipperBaseService {
// 查询应收核销明细
$api_get_fico_detail_header = '/api/fcc/ficoAhxL/list/page';
// 查询应付核销抬头
$api_get_fico_ph_page = '/api/fcc/ficoPhxH/list/page';
// 获取应付核销抬头
$api_get_fico_ph_header = '/api/fcc/ficoPhxH/get';
// 查询应付核销明细
$api_get_fico_ph_detail_header = '/api/fcc/ficoPhxL/list/page';
constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);

5
src/assets/mocks/menu-data.json
View File

@ -314,6 +314,11 @@
{
"text": "应付核销",
"link": "/financial-management/payable-order"
},
{
"text": "应收核销详情",
"hide": true,
"link": "/financial-management/payable-order/detail/:id"
}
]
},