This commit is contained in:
Taric Xin
2022-01-19 11:37:10 +08:00
parent 4ccb9db42a
commit 54565374c0
14 changed files with 240 additions and 138 deletions

View File

@ -87,7 +87,7 @@
</nz-card>
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md">
<div class="d-flex align-items-center mb-md mt-sm">
<button nz-button (click)="openRequestedModal('1')">全部开票</button>
<button nz-button (click)="openRequestedModal('2')">开票</button>
<button nz-button (click)="removeOrder()">移除</button>

View File

@ -1,15 +1,4 @@
:host::ng-deep {
.search-box {
.ant-card-body {
padding-bottom: 18px;
}
}
.content-box {
.ant-card-body {
padding-top: 16px;
}
}
.statistics-box {
.ant-form-item {
@ -21,19 +10,4 @@
}
}
}
.expend-options {
margin-top: 0px;
}
@media (min-width: 1200px) {
.expend-options {
max-width: 400px;
position : absolute;
right : 0;
bottom : 25px;
}
}

View File

@ -10,7 +10,7 @@ import { RequestedInvoiceModalComponent } from '../requested-invoice-modal/reque
@Component({
selector: 'app-invoice-requested-detail',
templateUrl: './invoice-requested-detail.component.html',
styleUrls: ['./invoice-requested-detail.component.less']
styleUrls: ['./invoice-requested-detail.component.less', '../../../../commom/less/expend-but.less', '../../../../commom/less/box.less']
})
export class InvoiceRequestedDetailComponent implements OnInit {
@ViewChild('st', { static: true })
@ -42,7 +42,6 @@ export class InvoiceRequestedDetailComponent implements OnInit {
loadHeadInfo() {
this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
console.log(res);
if (res) {
this.headerInfo = res;
}
@ -73,7 +72,6 @@ export class InvoiceRequestedDetailComponent implements OnInit {
this.service.msgSrv.warning('请选择订单!');
return;
}
console.log(this.selectedRows);
const modal = this.nzModalService.create({
nzTitle: '开票',
nzContent: RequestedDetailComponent,
@ -88,22 +86,36 @@ export class InvoiceRequestedDetailComponent implements OnInit {
type: 'default',
label: '手工处理',
onClick: () => {
console.log('11111');
const params = {
ficoVatappBillVOList: this.selectedRows,
id: this.id
};
this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
console.log(res);
if (res) {
this.loadHeadInfo();
this.st.load(1);
modal.destroy();
}
});
modal.destroy();
}
},
{
type: 'primary',
label: '自动开票',
onClick: () => {
modal.destroy();
const params = {
ficoVatappBillVOList: this.selectedRows,
id: this.id
};
this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
console.log(res);
if (res) {
this.loadHeadInfo();
this.st.load(1);
modal.destroy();
}
});
}
}
]
@ -141,9 +153,9 @@ export class InvoiceRequestedDetailComponent implements OnInit {
routeToOrder(item: any) {
if (item.billType === 1) {
this.router.navigate(['/order-management/vehicle-detail/' + item.billHCode]);
this.router.navigate(['/order-management/vehicle-detail/' + item.billHId]);
} else {
this.router.navigate(['/order-management/bulk-detail/' + item.billHCode]);
this.router.navigate(['/order-management/bulk-detail/' + item.billHId]);
}
}
@ -259,19 +271,47 @@ export class InvoiceRequestedDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox' },
{ title: '订单号', render: 'billHCode', width: 150 },
{ title: '订单号', render: 'billHCode', width: 170 },
{ title: '订单完成日期', index: 'billTime', type: 'date', width: 150 },
{ title: '开票状态', index: 'vatappSts', width: 100 },
{ title: '所属项目', index: 'projectId', width: 100 },
{ title: '所属项目', index: 'projectId', width: 140 },
{ title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } },
{ title: '装货地', index: 'loadingfrom', width: 90 },
{ title: '卸货地', index: 'loadingto', width: 90 },
{ title: '装货地', index: 'loadingfrom', width: 220 },
{ title: '卸货地', index: 'loadingto', width: 220 },
{ title: '货物信息', index: 'goodsinfo', width: 100 },
{ title: '承运司机', index: 'driverinfo', width: 140 },
{ title: '申请金额', index: 'billkpmoney', width: 100 },
{ title: '运输费', index: 'fjfmoney2', width: 90 },
{ title: '附加费', index: 'fjfmoney', width: 90 },
{ title: '开票金额', index: 'billkpmoney', width: 100 },
{
title: '申请金额',
index: 'billkpmoney',
width: 100,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) }
},
{
title: '运输费',
index: 'fjfmoney2',
width: 90,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney2 }) }
},
{
title: '附加费',
index: 'fjfmoney',
width: 90,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.fjfmoney }) }
},
{
title: '开票金额',
index: 'billkpmoney',
width: 100,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.billkpmoney }) }
},
{ title: '税率', index: 'billvatrate', width: 90 },
{ title: '发票号码', index: 'vatinvcode', width: 100 },
{ title: '开票日期', index: 'vatinvtime', type: 'date', width: 150 }