Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -59,8 +59,6 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes
|
|||||||
}
|
}
|
||||||
|
|
||||||
openDrawer() {
|
openDrawer() {
|
||||||
console.log(this.sfValue);
|
|
||||||
|
|
||||||
if (this.searchDrawerService.drawer?.length > 0) {
|
if (this.searchDrawerService.drawer?.length > 0) {
|
||||||
this.searchDrawerService.create(this.sfValue, this.schema);
|
this.searchDrawerService.create(this.sfValue, this.schema);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -109,7 +109,7 @@
|
|||||||
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" (click)="openDrawer()"
|
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" (click)="openDrawer()"
|
||||||
>筛选</button
|
>筛选</button
|
||||||
>
|
>
|
||||||
<button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']"> 导出</button>
|
<button nz-button nzDanger acl [acl-ability]="['TAX-ORDERREPORT-export']" (click)="exportList()"> 导出</button>
|
||||||
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
|
<button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
|
||||||
更多<i nz-icon nzType="down" nzTheme="outline"></i
|
更多<i nz-icon nzType="down" nzTheme="outline"></i
|
||||||
></button>
|
></button>
|
||||||
|
|||||||
@ -290,9 +290,9 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
|
|||||||
resetData() {
|
resetData() {
|
||||||
let params: any = {};
|
let params: any = {};
|
||||||
if (this.selectedRows.length === 0) {
|
if (this.selectedRows.length === 0) {
|
||||||
params ={}
|
params = {};
|
||||||
} else {
|
} else {
|
||||||
params =[]
|
params = [];
|
||||||
this.selectedRows.forEach(item => {
|
this.selectedRows.forEach(item => {
|
||||||
params.push(item.billId);
|
params.push(item.billId);
|
||||||
});
|
});
|
||||||
@ -436,6 +436,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
|
|||||||
const modalRef = this.modal.create({
|
const modalRef = this.modal.create({
|
||||||
nzTitle: '本地校验结果',
|
nzTitle: '本地校验结果',
|
||||||
nzWidth: 1200,
|
nzWidth: 1200,
|
||||||
|
nzNoAnimation: true,
|
||||||
nzContent: TaxManagementOrderVerifyResultComponent,
|
nzContent: TaxManagementOrderVerifyResultComponent,
|
||||||
nzComponentParams: {
|
nzComponentParams: {
|
||||||
record: item
|
record: item
|
||||||
@ -479,10 +480,13 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
|
|||||||
}
|
}
|
||||||
|
|
||||||
viewPhoto(images: any[]) {
|
viewPhoto(images: any[]) {
|
||||||
|
|
||||||
if (images.length > 0) {
|
if (images.length > 0) {
|
||||||
const imgs = images.map(item => ({ src: item }));
|
const imgs = images.map(item => ({ src: item }));
|
||||||
this.imageService.preview(imgs);
|
this.imageService.preview(imgs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exportList() {
|
||||||
|
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_getTaxOrderPage_page_export);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -37,6 +37,8 @@ export class TaxManagementService extends ShipperBaseService {
|
|||||||
|
|
||||||
// 订单上报列表
|
// 订单上报列表
|
||||||
$api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
|
$api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
|
||||||
|
// 订单上报列表
|
||||||
|
$api_getTaxOrderPage_page_export = `/api/sdc/taxOrder/asyncExport`;
|
||||||
// 根据订单Id更新税务订单
|
// 根据订单Id更新税务订单
|
||||||
$api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`;
|
$api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`;
|
||||||
// 撤回税务订单
|
// 撤回税务订单
|
||||||
|
|||||||
Reference in New Issue
Block a user