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-18 15:49:09 +08:00
parent 7775b39bc6
commit 9d1ba35333
28 changed files with 699 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,82 @@
<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="收款人" required>
{{headerInfo?.invdate}}
</se>
<se label="付款账户" required>
{{headerInfo?.invdate}}
</se>
<se label="应付已核销" required>
{{headerInfo?.invdate}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="要求付款日期" required>
{{headerInfo?.hrtoName}}
</se>
<se label="收款账户" required>
{{headerInfo?.invoiceno}}
</se>
<se label="确认日期" required>
{{headerInfo?.invoiceno}}
</se>
<se label="付款备注" >
{{headerInfo?.invoiceno}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<se label="付款方式" required>
{{headerInfo?.invtype}}
</se>
<se label="付款类型" required>
{{headerInfo?.remarks}}
</se>
<se label="付款金额" required>
{{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_payment_detail" [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="billHCode" let-item let-index="index" let-column="column">
{{index+1}}
</ng-template>
</st>
</nz-card>

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

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

@ -0,0 +1,158 @@
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-payment-order-detail',
templateUrl: './payment-order-detail.component.html',
styleUrls: ['./payment-order-detail.component.less']
})
export class PaymentOrderDetailComponent 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;
headerInfo: any = {};
constructor(public service: FreightAccountService, private route: ActivatedRoute) {
this.id = route.snapshot.params.id;
this.loadHeadInfo();
}
ngOnInit(): void {}
loadHeadInfo() {
// this.service.request(this.service.$api_get_input_invoice_header, { id: this.id }).subscribe(res => {
// console.log(res);
// if (res) {
// this.headerInfo = res;
// }
// });
}
beforeReq = (requestOptions: STRequestOptions) => {
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
}
});
}
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: '请输入'
}
},
waybillHCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入'
}
},
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
},
cno: {
type: 'string',
title: '结算客户',
enum: [{ label: '全部', value: '' }],
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
}
}
};
}
private initST(): STColumn[] {
return [
{ title: '序号', render: 'billHCode', 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: 'paymoney', width: 140 },
{ title: '收票税额', index: 'invtax', width: 100 }
];
}
}

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

@ -3,12 +3,12 @@
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 110,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"
<div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
@ -34,7 +34,7 @@
</div>
</div>
<st #st [data]="service.$mock_url" [columns]="columns"
<st #st [data]="service.$api_get_payment_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] }"

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

@ -5,6 +5,7 @@ import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-payment-order',
@ -22,7 +23,7 @@ export class PaymentOrderComponent implements OnInit {
_$expand = false;
selectedRows: any[] = [];
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
@ -81,15 +82,15 @@ export class PaymentOrderComponent implements OnInit {
hidden: true
}
},
orderSn: {
paycodes: {
type: 'string',
title: '付款单号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
widget: 'select',
placeholder: '请选择'
}
},
ltdId: {
ltdid: {
type: 'string',
title: '网络货运人',
ui: {
@ -98,7 +99,7 @@ export class PaymentOrderComponent implements OnInit {
allowClear: true,
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
default: null
},
orderS2n: {
type: 'string',
@ -109,53 +110,51 @@ export class PaymentOrderComponent implements OnInit {
placeholder: '请选择'
}
},
order2S2n: {
paytype: {
type: 'string',
title: '付款类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
order22S2n: {
paymode: {
type: 'string',
title: '付款方式',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
order221S2n: {
arto: {
type: 'string',
title: '收款人',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderS12n: {
billHCodes: {
type: 'string',
title: '订单号',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createTime: {
paydate: {
title: '要求付款日期',
type: 'string',
ui: {
@ -177,27 +176,29 @@ export class PaymentOrderComponent implements OnInit {
}
} as SFDateWidgetSchema
},
orderS1n2: {
waybillHCodes: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入',
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderS3: {
feeHCodes: {
type: 'string',
title: '费用号',
ui: {
placeholder: '请输入',
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createT1i1me: {
createTime: {
title: '创建时间',
type: 'string',
ui: {
@ -208,11 +209,10 @@ export class PaymentOrderComponent implements OnInit {
}
} as SFDateWidgetSchema
},
orderSn4: {
remarks: {
type: 'string',
title: '付款备注',
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
@ -226,26 +226,26 @@ export class PaymentOrderComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '付款单号', index: 'no', type: 'link' },
{ title: '网络货运人', index: 'no' },
{ title: '要求付款日期', index: 'no', type: 'date', width: 140 },
{ title: '付款金额', index: 'callNo' },
{ title: '付款类型', index: 'callNo' },
{ title: '付款方式', index: 'call1No' },
{ title: '付款单号', index: 'paycode', type: 'link' },
{ title: '网络货运人', index: 'ltdId' },
{ title: '要求付款日期', index: 'paydate', type: 'date', width: 140 },
{ title: '付款金额', index: 'paymoney' },
{ title: '付款类型', index: 'paytype' },
{ title: '付款方式', index: 'paymode' },
{ title: '结算客户', index: 'call1N2o' },
{ title: '收款人', index: 'callNo' },
{ title: '收款人', index: 'hrto' },
{ title: '应付已核销', index: 'callNo' },
{ title: '确认日期', index: 'updatedAt', type: 'date' },
{ title: '创建时间', index: 'updatedAt', type: 'date' },
{ title: '创建人', index: 'callNo' },
{ title: '付款备注', index: 'callNo' },
{ title: '确认日期', index: 'paydate2', type: 'date' },
{ title: '创建时间', index: 'createTime', type: 'date' },
{ title: '创建人', index: 'createUserId' },
{ title: '付款备注', index: 'payremarks' },
{
title: '操作',
width: '90px',
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/ticket/input-invoice/detail/1'])
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
},
{
text: '修改',