This commit is contained in:
Taric Xin
2022-01-10 13:20:56 +08:00
parent 5fa122dd25
commit 865534d2ab
15 changed files with 436 additions and 57 deletions

View File

@ -5,7 +5,7 @@
@media (min-width: 1200px) {
.expend-options {
max-width: 400px;
max-width: 450px;
position : absolute;
right : 0;
bottom : 25px;

View File

@ -0,0 +1,43 @@
<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: 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"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button> 导出明细</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>
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button (click)="this.addInvoice()" nzType="primary">添加付款</button>
<button nz-button (click)="this.addInvoice()" nzType="primary">导入付款</button>
<div class="ml-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 张单
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
</div>
<st #st [data]="service.$mock_url" [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)">
</st>
</nz-card>

View File

@ -0,0 +1,257 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { 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 { 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';
@Component({
selector: 'app-payment-order',
templateUrl: './payment-order.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class PaymentOrderComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
selectedRows: any[] = [];
constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
}
return requestOptions;
};
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
}
}
addInvoice() {
if (this.selectedRows?.length <= 0) {
this.service.msgSrv.warning('请选择付款单');
return;
}
const modal = this.nzModalService.create({
nzTitle: '付款单',
nzContent: AddCollectionInvoiceModalComponent,
nzComponentParams: { i: { userId: 0 } },
nzFooter: null
});
}
/**
* 重置表单
*/
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
}
},
orderSn: {
type: 'string',
title: '付款单号',
ui: {
autocomplete: 'off',
placeholder: '请输入'
}
},
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getNetworkFreightForwarder()
},
default: ''
},
orderS2n: {
type: 'string',
title: '付款状态',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择'
}
},
order2S2n: {
type: 'string',
title: '付款类型',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
order22S2n: {
type: 'string',
title: '付款方式',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
order221S2n: {
type: 'string',
title: '收款人',
ui: {
widget: 'dict-select',
params: { dictKey: 'refund:apply:status' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderS12n: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createTime: {
title: '要求付款日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
createTi1me: {
title: '确认日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
orderS1n2: {
type: 'string',
title: '运单号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderS3: {
type: 'string',
title: '费用号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
createT1i1me: {
title: '创建时间',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
orderSn4: {
type: 'string',
title: '付款备注',
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
};
}
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: 'call1N2o' },
{ title: '收款人', index: 'callNo' },
{ title: '应付已核销', index: 'callNo' },
{ title: '确认日期', index: 'updatedAt', type: 'date' },
{ title: '创建时间', index: 'updatedAt', type: 'date' },
{ title: '创建人', index: 'callNo' },
{ title: '付款备注', index: 'callNo' },
{
title: '操作',
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/ticket/input-invoice/detail/1'])
},
{
text: '修改',
click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
}
]
}
];
}
}

View File

@ -0,0 +1 @@
<p>receipt-order works!</p>

View File

@ -0,0 +1,25 @@
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

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-receipt-order',
templateUrl: './receipt-order.component.html',
styleUrls: ['./receipt-order.component.less']
})
export class ReceiptOrderComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

View File

@ -14,6 +14,8 @@ import { TransactionFlowComponent } from './components/transaction-flow/transact
import { CostManagementDetailComponent } from './components/cost-management/cost-management-detail/cost-management-detail.component';
import { ExpensesReceivableComponent } from './components/cost-management/expenses-receivable/expenses-receivable.component';
import { ExpensesPayableComponent } from './components/cost-management/expenses-payable/expenses-payable.component';
import { PaymentOrderComponent } from './components/payment-order/payment-order.component';
import { ReceiptOrderComponent } from './components/receipt-order/receipt-order.component';
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent },
@ -32,6 +34,8 @@ const routes: Routes = [
{ path: 'abnormal-gold', component: AbnormalGoldComponent },
{ path: 'payment-record', component: PaymentRecordComponent },
{ path: 'transaction-flow', component: TransactionFlowComponent },
{ path: 'payment-order', component: PaymentOrderComponent },
{ path: 'receipt-order', component: ReceiptOrderComponent },
];
@NgModule({

View File

@ -18,6 +18,8 @@ import { ClearingModalComponent } from './components/abnormal-gold/clearing-moda
import { CostManagementDetailComponent } from './components/cost-management/cost-management-detail/cost-management-detail.component';
import { ExpensesReceivableComponent } from './components/cost-management/expenses-receivable/expenses-receivable.component';
import { ExpensesPayableComponent } from './components/cost-management/expenses-payable/expenses-payable.component';
import { PaymentOrderComponent } from './components/payment-order/payment-order.component';
import { ReceiptOrderComponent } from './components/receipt-order/receipt-order.component';
const ROUTESCOMPONENTS = [
FreightAccountComponent,
@ -31,7 +33,9 @@ const ROUTESCOMPONENTS = [
CostManagementComponent,
CostManagementDetailComponent,
ExpensesReceivableComponent,
ExpensesPayableComponent
ExpensesPayableComponent,
PaymentOrderComponent,
ReceiptOrderComponent
];
const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent];

View File

@ -10,26 +10,26 @@
<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?.ltdidName}}
{{headerInfo?.ltdid}}
</se>
<se label="发票日期" required>
2021-12-11
{{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?.projectName}}
{{headerInfo?.hrto}}
</se>
<se label="发票号" required>
{{headerInfo?.taxNumber}}
{{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?.vatname}}
{{headerInfo?.invtype}}
</se>
<se label="收票备注">
{{headerInfo?.isdetail}}
{{headerInfo?.remarks}}
</se>
</div>
</div>
@ -55,7 +55,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_invoice_requested_order_detail" [columns]="columns" size="small"
<st #st [data]="service.$api_get_input_invoice_detail_page" [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] }"

View File

@ -31,7 +31,7 @@ export class InputInvoiceDetailComponent implements OnInit {
ngOnInit(): void {}
loadHeadInfo() {
this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
this.service.request(this.service.$api_get_input_invoice_header, { id: this.id }).subscribe(res => {
console.log(res);
if (res) {
this.headerInfo = res;
@ -41,7 +41,17 @@ export class InputInvoiceDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
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;
};
@ -74,21 +84,21 @@ export class InputInvoiceDetailComponent implements OnInit {
hidden: true
}
},
billHCode: {
feecode: {
type: 'string',
title: '费用单',
ui: {
placeholder: '请输入'
}
},
billHC2ode: {
billHCode: {
type: 'string',
title: '订单号',
ui: {
placeholder: '请输入'
}
},
vatappSts: {
cno: {
type: 'string',
title: '结算客户',
enum: [{ label: '全部', value: '' }],
@ -98,7 +108,7 @@ export class InputInvoiceDetailComponent implements OnInit {
},
default: ''
},
createTime: {
feedate: {
title: '费用日期',
type: 'string',
ui: {
@ -109,7 +119,7 @@ export class InputInvoiceDetailComponent implements OnInit {
}
} as SFDateWidgetSchema
},
create2Time: {
billTime: {
title: '订单日期',
type: 'string',
ui: {
@ -127,14 +137,14 @@ export class InputInvoiceDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '序号', render: 'billHCode', width: 80 },
{ title: '费用号', index: 'vatappSts', width: 100 },
{ title: '费用日期', index: 'billTime', type: 'date', width: 150 },
{ title: '订单号', index: 'projectId', width: 100 },
{ title: '订单日期', index: 'loadingfrom', width: 150 },
{ title: '结算客户', index: 'loadingto', width: 90 },
{ title: '费用科目', index: 'goodsinfo', width: 100 },
{ title: '收票金额', index: 'driverinfo', width: 140 },
{ title: '收票税额', index: 'billkpmoney', width: 100 }
{ title: '费用号', index: 'feecode', 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: 'feesubname', width: 100 },
{ title: '收票金额', index: 'invmoney', width: 140 },
{ title: '收票税额', index: 'invtax', width: 100 }
];
}
}

View File

@ -8,7 +8,7 @@
[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">
<div nz-col [nzXl]="_$expand ? 24 : 6" [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>
<button nz-button> 导出</button>
@ -31,7 +31,7 @@
</div>
</div>
<st #st [data]="service.$mock_url" [columns]="columns"
<st #st [data]="service.$api_get_input_invoice_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] }"

View File

@ -9,7 +9,7 @@ import { AddCollectionInvoiceModalComponent } from './add-collection-invoice-mod
@Component({
selector: 'app-input-invoice',
templateUrl: './input-invoice.component.html',
styleUrls: ['../../../commom/less/box.less']
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class InputInvoiceComponent implements OnInit {
@ViewChild('st', { static: true })
@ -31,7 +31,15 @@ export class InputInvoiceComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf.value,
createtime: {
start: this.sf.value.createtime?.[0] || null,
end: this.sf.value.createtime?.[1] || null
},
invdate: {
start: this.sf.value.invdate?.[0] || null,
end: this.sf.value.invdate?.[1] || null
}
});
}
return requestOptions;
@ -83,7 +91,7 @@ export class InputInvoiceComponent implements OnInit {
hidden: true
}
},
orderSn: {
inpinvcode: {
type: 'string',
title: '收票单号',
ui: {
@ -91,7 +99,7 @@ export class InputInvoiceComponent implements OnInit {
placeholder: '请输入'
}
},
ltdId: {
ltdid: {
type: 'string',
title: '网络货运人',
ui: {
@ -102,7 +110,7 @@ export class InputInvoiceComponent implements OnInit {
},
default: ''
},
orderS2n: {
invoiceno: {
type: 'string',
title: '发票号码',
ui: {
@ -110,7 +118,7 @@ export class InputInvoiceComponent implements OnInit {
placeholder: '请输入'
}
},
order2S2n: {
invtype: {
type: 'string',
title: '发票类型',
ui: {
@ -122,7 +130,7 @@ export class InputInvoiceComponent implements OnInit {
}
}
},
orderSn1: {
hrto: {
type: 'string',
title: '销售方',
ui: {
@ -132,7 +140,7 @@ export class InputInvoiceComponent implements OnInit {
}
}
},
createTime: {
createtime: {
title: '创建时间',
type: 'string',
ui: {
@ -143,7 +151,7 @@ export class InputInvoiceComponent implements OnInit {
}
} as SFDateWidgetSchema
},
ord0erSn1: {
sts: {
type: 'string',
title: '收票状态',
ui: {
@ -155,7 +163,7 @@ export class InputInvoiceComponent implements OnInit {
}
}
},
orderSn2: {
invdate: {
type: 'string',
title: '发票日期',
ui: {
@ -166,7 +174,7 @@ export class InputInvoiceComponent implements OnInit {
}
}
},
orderS1n2: {
remarks: {
type: 'string',
title: '收票备注',
ui: {
@ -176,23 +184,21 @@ export class InputInvoiceComponent implements OnInit {
}
}
},
orderS3: {
billCode: {
type: 'string',
title: '订单号',
ui: {
autocomplete: 'off',
placeholder: '请选择',
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
orderSn4: {
feecode: {
type: 'string',
title: '费用号',
ui: {
autocomplete: 'off',
placeholder: '请选择',
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
@ -205,23 +211,23 @@ export class InputInvoiceComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '收票单号', index: 'no', type: 'link' },
{ title: '网络货运人', index: 'no' },
{ title: '发票日期', index: 'no', type: 'date' },
{ title: '发票号', index: 'callNo' },
{ title: '发票金额', index: 'callNo' },
{ title: '税额', render: 'call1No' },
{ title: '发票类型', render: 'call1N2o' },
{ title: '销售方', index: 'callNo' },
{ title: '创建时间', index: 'updatedAt', type: 'date' },
{ title: '创建人', index: 'updatedAt' },
{ title: '收票状态', index: 'updatedAt' },
{ title: '收票单号', index: 'inpinvcode', type: 'link' },
{ title: '网络货运人', index: 'ltdid' },
{ title: '发票日期', index: 'invdate', type: 'date' },
{ title: '发票号', index: 'invoiceno' },
{ title: '发票金额', index: 'invmoney' },
{ title: '税额', index: 'invtax' },
{ title: '发票类型', index: 'invtype' },
{ title: '销售方', index: 'hrto' },
{ title: '创建时间', index: 'createtime', type: 'date' },
{ title: '创建人', index: 'createbyname' },
{ title: '收票状态', index: 'sts' },
{
title: '操作',
buttons: [
{
text: '浏览',
click: item => this.router.navigate(['/ticket/input-invoice/detail/1'])
click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
},
{
text: '修改',

View File

@ -47,7 +47,6 @@ export class TicketService extends ShipperBaseService {
// 保存开票申请费用明细
$api_ficoVatappFee_save = '/api/fcc/ficoVatappFee/save';
// 查询ETC白名单货主
$api_get_etc_shipper_list = '/api/fcc/ficoShipperWhiteList/list/page';
// 删除ETC白名单货主
@ -57,7 +56,14 @@ export class TicketService extends ShipperBaseService {
// 查询ETC企业列表
$api_get_etc_list = '/api/mdc/cuc/enterpriseInfo/operate/etcList';
constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
// 进项发票查询
$api_get_input_invoice_page = '/api/fcc/ficoInpinvH/getListPage';
// 根据ID获取进项发票详情
$api_get_input_invoice_header = '/api/fcc/ficoInpinvH/get';
// 查询进项发票明细
$api_get_input_invoice_detail_page = '/api/fcc/ficoInpinvL/list/page';
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
}
}

View File

@ -243,6 +243,14 @@
"hide": true,
"link": "/financial-management/cost-management/expenses-payable/:id"
},
{
"text": "付款单",
"link": "/financial-management/payment-order"
},
{
"text": "收款单",
"link": "/financial-management/receipt-order"
},
{
"text": "货主账户",
"link": "/financial-management/freight-account"