diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index b21bb753..b81b2741 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -39,7 +39,7 @@ - + diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index a006411a..05582e51 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -257,10 +257,8 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent this.st.load(1); } - /** - * 异步导出 - */ - export() { - this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxSummary_export); +} } diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html index daee8554..c0299bc2 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html @@ -26,8 +26,15 @@ - + {{ item?.billStatusLabel }} {{ item?.billStatusLabel }} @@ -49,33 +56,25 @@ 已选择 {{ selectedRows.length }} 条数据 - - + + + 更多
    -
  • - 申报 -
  • -
  • - 更正 -
  • -
  • - 修改起征点 -
  • -
  • - 更新数据 -
  • +
  • 申报
  • +
  • 更正
  • +
  • 修改起征点
  • +
  • 更新数据
-
- +
司机姓名:张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万?
@@ -84,4 +83,4 @@ -
\ No newline at end of file +
diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 196dbc14..3c70d41c 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -428,11 +428,9 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent this.st.load(1); } - /** - * 异步导出 - */ - export() { - this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); + // 导出 + exprot() { + this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxDeclaration_export); } openWainingModal(content: string, title = '提示') { diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 021f0ec1..0f3e49be 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -1,3 +1,13 @@ +