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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-05-13 14:48:13 +08:00
parent a0d9718eaa a07a8a9e2f
commit 86453331a0
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/commom/components/basic-table/basic-table.component.ts
View File

@ -59,8 +59,6 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy, OnReuseDes
}
openDrawer() {
console.log(this.sfValue);
if (this.searchDrawerService.drawer?.length > 0) {
this.searchDrawerService.create(this.sfValue, this.schema);
} else {

2
src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
View File

@ -109,7 +109,7 @@
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-ORDERREPORT-search']" (click)="openDrawer()"
>筛选</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">
更多<i nz-icon nzType="down" nzTheme="outline"></i
></button>

14
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -290,9 +290,9 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
resetData() {
let params: any = {};
if (this.selectedRows.length === 0) {
params ={}
} else{
params =[]
params = {};
} else {
params = [];
this.selectedRows.forEach(item => {
params.push(item.billId);
});
@ -436,6 +436,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
const modalRef = this.modal.create({
nzTitle: '本地校验结果',
nzWidth: 1200,
nzNoAnimation: true,
nzContent: TaxManagementOrderVerifyResultComponent,
nzComponentParams: {
record: item
@ -467,7 +468,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
* 异步导出
*/
export() {
this.service.exportStart({...this.reqParams, pageSize: -1} ,this.service.$api_async_export_order_reporting_list);
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_async_export_order_reporting_list);
}
openWainingModal(content: string, title = '提示') {
@ -479,10 +480,13 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
}
viewPhoto(images: any[]) {
if (images.length > 0) {
const imgs = images.map(item => ({ src: item }));
this.imageService.preview(imgs);
}
}
exportList() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_getTaxOrderPage_page_export);
}
}

2
src/app/routes/tax-management/services/tax-management.service.ts
View File

@ -37,6 +37,8 @@ export class TaxManagementService extends ShipperBaseService {
// 订单上报列表
$api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`;
// 订单上报列表
$api_getTaxOrderPage_page_export = `/api/sdc/taxOrder/asyncExport`;
// 根据订单Id更新税务订单
$api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`;
// 撤回税务订单