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

Merge branch 'weiyu'

Browse Source
This commit is contained in:
weiyu
2022-04-21 17:36:15 +08:00
parent 139227864e 6138a75312
commit fd82d7790e
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.html
View File

@ -34,9 +34,6 @@
<span *ngIf="item?.uploadSts == '2'">上传中</span>
<span *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span>
</ng-template>
<ng-template st-row="invoiceNO" let-item let-index="index">
<a href="/">{{item.invoiceno}}</a>
</ng-template>
<ng-template st-row="artoname" let-item let-index="index">
<a href="/">{{item.artoname}}</a>
</ng-template>

27
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
View File

@ -50,7 +50,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
* 查询参数
*/
get reqParams() {
const params = Object.assign({}, this.sf?.value || {}, {uploadSts: this.selectedIndex});
const params = Object.assign({}, this.sf?.value || {}, { uploadSts: this.selectedIndex });
delete params._$expand;
return { ...params };
}
@ -213,9 +213,12 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
{
title: '发票号码',
index: 'invoiceno',
render: 'invoiceNO',
className: 'text-center',
width: '150px',
type: 'link',
click: item => {
window.open(`/#/ticket/invoice-list/detail/${item.invoiceno}`, '_blank', 'noopener')
}
},
{ title: '发票代码', index: 'invoiceno2', className: 'text-center', width: '150px', },
{
@ -224,14 +227,24 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
className: 'text-center',
width: '180px',
},
{ title: '购买方企业名称', index: 'artoname', render: 'artoname', className: 'text-center', width: '200px' },
{
title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link',
click: item => {
window.open(`/#/usercenter/freight/list/detail/${item.ltdId}`, '_blank', 'noopener')
}
},
{ title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },
{ title: '订单号', index: 'billHCode', render: 'billHCode', className: 'text-center', width: '120px' },
{
title: '订单号', index: 'billHCode', render: 'billHCode', className: 'text-center', width: '120px', type: 'link',
click: item => {
window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener')
}
},
{ title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' },
{ title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' },
{ title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' },
{ title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' },
{ title: '发票状态', index: 'sts', render:'sts', className: 'text-center', width: '200px' },
{ title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '200px' },
{ title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' },
];
}
@ -258,7 +271,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
nzOkText: '确定',
nzCancelText: '取消',
nzOnOk: () => {
this.service.request(this.service.$api_invoiceUpload_withdraw, {ids}).subscribe((res: any) => {
this.service.request(this.service.$api_invoiceUpload_withdraw, { ids }).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('撤销成功');
this.search();
@ -324,7 +337,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
this.selectedIndex = item?.value || '';
console.log(this.selectedIndex);
setTimeout(() => {
this.st.load();
})