fix bug

src/app/routes/tax-management/components/individual-collect/individual-collect.component.html

@@ -39,7 +39,7 @@
     </div>
     <button nz-button nzDanger [nzLoading]="service.http.loading" acl [acl-ability]="['TAX-COLLECT-search']"
       (click)="openDrawer()">筛选</button>
-    <button nz-button nzDanger acl [acl-ability]="['TAX-COLLECT-export']"> 导出</button>
+    <button nz-button nzDanger (click)="exprot()"  acl [acl-ability]="['TAX-COLLECT-export']"> 导出</button>
     <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
       更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
     <nz-dropdown-menu #menu="nzDropdownMenu">

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);
   }
 
-  /**
+ // 导出
-   * 异步导出
+ exprot() {
-   */
+  this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxSummary_export);
-  export() {
+}
-    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
-  }
 }

src/app/routes/tax-management/components/individual-declare/individual-declare.component.html

@@ -26,8 +26,15 @@
   </div>
 
   <!-- 数据列表 -->
-  <st #st [scroll]="{ x: '1200px',y:scrollY }" [data]="service.$api_get_taxDeclaration" [columns]="columns"
+  <st
-    [req]="{  params: reqParams }" [page]="{  }" [loading]="false">
+    #st
+    [scroll]="{ x: '1200px', y: scrollY }"
+    [data]="service.$api_get_taxDeclaration"
+    [columns]="columns"
+    [req]="{ params: reqParams }"
+    [page]="{}"
+    [loading]="false"
+  >
     <ng-template st-row="orderStatus" let-item let-index="index">
       <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{ item?.billStatusLabel }}</a>
       <span *ngIf="item?.billStatus !== '2'">{{ item?.billStatusLabel }}</span>
@@ -49,33 +56,25 @@
       已选择
       <strong class="text-red">{{ selectedRows.length }}</strong> 条数据
     </div>
-    <button nz-button nzDanger [nzLoading]="service.http.loading" acl [acl-ability]="['TAX-DECLARE-search']"
+    <button nz-button nzDanger [nzLoading]="service.http.loading" acl [acl-ability]="['TAX-DECLARE-search']" (click)="openDrawer()"
-      (click)="openDrawer()">筛选</button>
+      >筛选</button
-    <button nz-button nzDanger acl [acl-ability]="['TAX-DECLARE-export']"> 导出</button>
+    >
+    <button nz-button nzDanger (click)="exprot()"  acl [acl-ability]="['TAX-DECLARE-export']"> 导出</button>
     <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
-      更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
+      更多<i nz-icon nzType="down" nzTheme="outline"></i
+    ></button>
     <nz-dropdown-menu #menu="nzDropdownMenu">
       <ul nz-menu>
-        <li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-DECLARE-declare']">
+        <li nz-menu-item (click)="upload()" acl [acl-ability]="['TAX-DECLARE-declare']"> 申报 </li>
-          申报
+        <li nz-menu-item (click)="recall()" acl [acl-ability]="['TAX-DECLARE-change']"> 更正 </li>
-        </li>
+        <li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-DECLARE-threshold']"> 修改起征点 </li>
-        <li nz-menu-item (click)="recall()" acl [acl-ability]="['TAX-DECLARE-change']">
+        <li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-DECLARE-resetData']"> 更新数据 </li>
-          更正
-        </li>
-        <li nz-menu-item (click)="uploadSetting()" acl [acl-ability]="['TAX-DECLARE-threshold']">
-          修改起征点
-        </li>
-        <li nz-menu-item (click)="resetData()" acl [acl-ability]="['TAX-DECLARE-resetData']">
-          更新数据
-        </li>
       </ul>
     </nz-dropdown-menu>
-
   </div>
 </ng-template>
 
-<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()"
+<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
-  (nzOnCancel)="handleCancel()">
   <ng-container *nzModalContent>
     <div> 司机姓名：张三/13812345678 </div>
     <div> 是否确认要将该司机的起征点同步调整为超过15万？ </div>

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);
   }
 
-  /**
+  // 导出
-   * 异步导出
+  exprot() {
-   */
+    this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxDeclaration_export);
-  export() {
-    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
   }
 
   openWainingModal(content: string, title = '提示') {

src/app/routes/tax-management/components/individual-income/individual-income.component.html

@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-05-06 15:31:19
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-11 14:54:00
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <!-- <page-header-wrapper [title]="''"></page-header-wrapper>
 <nz-card class="search-box">
   <div nz-row nzGutter="8">
@@ -39,7 +49,7 @@
     </div>
     <button nz-button nzDanger [nzLoading]="isLoading && st.loading" acl [acl-ability]="['TAX-INCOME-search']"
       (click)="openDrawer()">筛选</button>
-    <button nz-button nzDanger acl [acl-ability]="['TAX-INCOME-export']"> 导出</button>
+    <button nz-button nzDanger     (click)="exprot()" acl [acl-ability]="['TAX-INCOME-export']"> 导出</button>
     <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
       更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
     <nz-dropdown-menu #menu="nzDropdownMenu">

src/app/routes/tax-management/components/individual-income/individual-income.component.ts

@@ -338,12 +338,10 @@ export class TaxManagementIndividualIncomeComponent extends BasicTableComponent
     this.st.load(1);
   }
 
-  /**
+ // 导出
-   * 异步导出
+ exprot() {
-   */
+  this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxIncome_export);
-  export() {
+}
-    this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list);
-  }
 
   handleOK() {}
   handleCancel() {

src/app/routes/tax-management/services/tax-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-27 10:30:56
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-19 14:19:44
+ * @LastEditTime : 2022-05-11 14:53:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -60,6 +60,12 @@ export class TaxManagementService extends ShipperBaseService {
   $api_getInvoiceReport_page = '/api/sdc/invoiceUploadInfo/list/page';
   // 发票上传列表导出
   $api_invoiceUpload_export = '/api/sdc/invoiceUploadInfo/reportList';
+  // 个税明细导出接口
+  $api_taxIncome_export = '/api/sdc/taxIncome/asyncExport';
+  // 个税汇总导出接口
+  $api_taxSummary_export = '/api/sdc/taxSummary/asyncExport';
+  // 税务申报导出接口
+  $api_taxDeclaration_export = '/api/sdc/taxDeclaration/asyncExport';
   // 发票上传撤回
   $api_invoiceUpload_withdraw = '/api/sdc/invoiceUploadInfo/withdraw';
   constructor(public injector: Injector) {