From 18f9769662cabdd60249ece3ad957ca2c603ed03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 30 Mar 2022 19:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../individual-income.component.html          | 27 +++++--------------
 .../services/tax-management.service.ts        |  2 +-
 2 files changed, 8 insertions(+), 21 deletions(-)

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 de71d3e2..8f9d0783 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,5 +1,5 @@
 <!--
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2022-03-30 14:00:43
@@ -17,16 +17,8 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button
-        nz-button
-        nzType="primary"
-        [disabled]="!sf.valid"
-        [nzLoading]="false"
-        (click)="search()"
-        acl
-        [acl-ability]="['RiskOrder-Search']"
-        >查询</button
-      >
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="false" (click)="search()" acl
+        [acl-ability]="['RiskOrder-Search']">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -41,16 +33,10 @@
     <nz-tab *ngFor="let tab of tabs" [nzTitle]="tab.name" (nzSelect)="selectChange(tab)"> </nz-tab>
   </nz-tabset>
   <!-- 数据列表 -->
-  <st
-    #st
-    [scroll]="{ x: '1200px' }"
-    [data]="service.$api_order_reporting_page"
-    [columns]="columns"
+  <st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_individual_income_page" [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }"
-    [loading]="false"
-  >
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 50, 100] }" [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>
@@ -79,7 +65,8 @@
   </div>
 </ng-template>
 
-<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel()">
   <ng-container *nzModalContent>
     <div> 司机姓名：张三/13812345678 </div>
     <div> 是否确认要将该司机的起征点同步调整为超过15万？ </div>
diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts
index d60ef650..ef736e9a 100644
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/src/app/routes/tax-management/services/tax-management.service.ts
@@ -24,7 +24,7 @@ export class TaxManagementService extends BaseService {
   public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
   // 查询运营报表
   $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`;
-  $api_get_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
+  $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表
   $api_recall_reporting = ``; // 撤回
   $api_async_export_order_reporting_list = ``; // 导出订单上报
   $api_get_upload_setting = ``; // 修改上传设置