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

Merge branch 'weiyu' into develop

Browse Source
This commit is contained in:
weiyu
2022-04-28 16:09:45 +08:00
parent 1fab74e445 384a55a1e2
commit 3d5f6bc8c4
2 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" >查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="export()">导出</button>
<button nz-button (click)="export()" acl [acl-ability]="['TAX_INVOICE_REPORT-export']">导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -32,7 +32,8 @@
<span *ngIf="item?.uploadSts == '1'">待上传</span>
<span *ngIf="item?.uploadSts == '3'">已上传</span>
<span *ngIf="item?.uploadSts == '2'">上传中</span>
<span *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span>
<span *ngIf="item?.uploadSts == '4'" style="color: red;">上传异常</span>
<!-- <span *ngIf="item?.uploadSts == '4'" style="color: red;" (click)="unnormal(item)">上传异常</span> -->
</ng-template>
<ng-template st-row="invoiceType" let-item let-index="index">
<span>增值税专用发票</span>
@ -53,6 +54,6 @@
<strong class="text-red">{{ selectedRows.length }}</strong> 条数据
</div>
<button *ngIf="selectedIndex === '1' || selectedIndex === '4'" nz-button nzType="primary" (click)="upload()">上传</button>
<button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()">撤回</button>
<button *ngIf="selectedIndex === '3'" nz-button nzType="primary" (click)="recall()" acl [acl-ability]="['TAX_INVOICE_REPORT-recall']">撤回</button>
</div>
</ng-template>

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

@ -281,26 +281,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
});
}
/**
*撤销
* @param record 记录实例
*/
resetData() {
if (this.selectedRows.length === 0) {
this.openWainingModal('请选择需要更新的数据！');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.billId);
});
this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('更新成功');
this.st.load(1);
}
})
}
/**
*撤销
* @param record 记录实例
@ -333,28 +314,13 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
}
selectChange(item: any) {
console.log(item);
this.selectedIndex = item?.value || '';
console.log(this.selectedIndex);
setTimeout(() => {
this.st.load();
})
}
/**
* 查看当行数据
*/
view(record: STData) {
// this.router.navigate(['../view', record.uuid], { relativeTo: this.ar });
this.router.navigate(['../detail'], {
queryParams: {
id: record.id,
},
relativeTo: this.ar
});
}
/**
* 上传
@ -368,6 +334,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
this.selectedRows.forEach(item => {
params.push(item.id);
});
return; //TODO 接口未提供
this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('上传成功');