fix bug

2022-04-02 16:37:39 +08:00
parent ab9b88046d
commit d67ba84af0
39 changed files with 61 additions and 31 deletions
--- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
+++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.html
@ -41,7 +41,7 @@
          nz-button
          nzType="primary"
          [disabled]="!sf.valid"
-          [nzLoading]="service.http.loading"
+          [nzLoading]="isLoading && st.loading"
          (click)="st?.load(1)"
          acl
          [acl-ability]="['CONTRACT-INDEX-listFrame']"
@ -75,7 +75,7 @@
    [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, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loading]="false"
+    [loading]="service.http.loading"
    [scroll]="{ x: '1200px', y: '370px' }"
    (change)="stChange($event)"
  >
--- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts
+++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts
@ -26,6 +26,7 @@ export class ContractManagementFrameComponent implements OnInit {
  ui: SFUISchema = {};
  _$expand = false;
  selectedRows: any[] = [];
+  isLoading: boolean = false;
  constructor(
    public service: ContractManagementService,
    private nzModalService: NzModalService,
@ -293,6 +294,7 @@ export class ContractManagementFrameComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true;
  }

  /**
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.html
@ -29,7 +29,7 @@
        </sf>
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
          (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
--- a/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
+++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.ts
@ -25,6 +25,7 @@ export class ContractManagementContractListComponent implements OnInit {
  columns: STColumn[] = [];
  ui: SFUISchema = {};
  _$expand = false;
+  isLoading: boolean = false;
  /**
 * 查询参数
 */
@ -235,6 +236,7 @@ export class ContractManagementContractListComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 伸缩查询条件
--- a/src/app/routes/contract-management/components/policy/policy.component.html
+++ b/src/app/routes/contract-management/components/policy/policy.component.html
@ -32,7 +32,7 @@
        <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]="service.http.loading" (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-POLICY-search']">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st?.load(1)"  acl  [acl-ability]="['CONTRACT-POLICY-search']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/contract-management/components/policy/policy.component.ts
+++ b/src/app/routes/contract-management/components/policy/policy.component.ts
@ -26,6 +26,7 @@ export class ContractManagementPolicyComponent implements OnInit {

  selectedRows: any[] = [];
  paramValue = '';
+  isLoading: boolean = false;
  constructor(public service: ContractManagementService, private modal: NzModalService, private router: Router) {}

  /**
@ -185,6 +186,7 @@ export class ContractManagementPolicyComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }

  /**
--- a/src/app/routes/datatable/components/customtable/driver/driver.component.html
+++ b/src/app/routes/datatable/components/customtable/driver/driver.component.html
@ -9,7 +9,7 @@
          <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]="service.http.loading" (click)="search()">查询</button>
+          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()">查询</button>
          <button nz-button (click)="resetSF()">重置</button>
          <!-- <button nz-button (click)="export()">导出</button> -->
          <button nz-button nzType="link" (click)="expandToggle()">
--- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts
+++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts
@ -44,6 +44,7 @@ export class DatatableDriverComponent implements OnInit {
    { title: '已收运费金额', index: 'wbGetAmount', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.wbGetAmount }) } },
    { title: '待收运费金额', index: 'wbWaitAmount', className: 'text-right', width: '100px', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.wbWaitAmount }) } },
  ];
+  isLoading: boolean = false;
  /**
   * 查询参数
   */
@ -158,5 +159,6 @@ export class DatatableDriverComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
 }
--- a/src/app/routes/datatable/components/customtable/owner/owner.component.html
+++ b/src/app/routes/datatable/components/customtable/owner/owner.component.html
@ -9,7 +9,7 @@
          <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]="service.http.loading" (click)="search()">查询</button>
+          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()">查询</button>
          <button nz-button (click)="resetSF()">重置</button>
          <!-- <button nz-button (click)="export()">导出</button> -->
          <button nz-button nzType="link" (click)="expandToggle()">
--- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts
+++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts
@ -24,6 +24,7 @@ export class DatatableOwnerComponent implements OnInit {
  today = new Date();
  ui: SFUISchema = {};
  schema: SFSchema = {};
+  isLoading: boolean = false;
 
  columns: STColumn[] = [
    { title: '货主名称', index: 'enterpriseName', className: 'text-center', width: '200px' },
@ -181,5 +182,6 @@ export class DatatableOwnerComponent implements OnInit {
   resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
 }
--- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
+++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html
@ -5,7 +5,7 @@
    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
        <sf #sf mode="search" [schema]="schema" [button]="'none'">
-          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+          <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
            (click)="st?.load(1)" acl [acl-ability]="['companyStaff-search']">查询</button>
          <button nz-button (click)="resetSF()">重置</button>
        </sf>
@ -17,7 +17,7 @@
        <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]="service.http.loading"
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
          (click)="st?.load(1)" acl [acl-ability]="['companyStaff-search']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
--- a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
+++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts
@ -18,6 +18,7 @@ export class DatatablePartnertableComponent implements OnInit {
  schema!: SFSchema;
  phone = '';
  columns!: STColumn[];
+  isLoading: boolean = false;

  constructor(
    public service: DataService,
@ -62,6 +63,7 @@ export class DatatablePartnertableComponent implements OnInit {
   resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 程序初始化入口
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@ -7,7 +7,7 @@
      <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]="service.http.loading" (click)="search()" acl
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
        [acl-ability]="['RiskOrder-Search']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="resetSF()">导出</button>
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
@ -32,6 +32,7 @@ export class DatatableFundReportingComponent implements OnInit {
  selectedIndex = '1'; //选择的项目
  serviceTel = '';
  selectedRows: any[] = [];
+  isLoading: boolean = false;
  constructor(
    public service: ReportingService,
    private router: Router,
@ -80,6 +81,7 @@ export class DatatableFundReportingComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 程序初始化入口
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@ -7,7 +7,7 @@
      <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]="service.http.loading" (click)="search()" acl
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
        [acl-ability]="['RiskOrder-Search']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="resetSF()">导出</button>
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@ -30,6 +30,7 @@ export class DatatableOrderReportingComponent implements OnInit {
  ];
  selectedIndex = ''; //选择的项目
  serviceTel = '';
+  isLoading: boolean = false;
  constructor(
    public service: ReportingService,
    private router: Router,
@ -78,6 +79,7 @@ export class DatatableOrderReportingComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 程序初始化入口
--- a/src/app/routes/order-management/components/complaint/complaint.component.html
+++ b/src/app/routes/order-management/components/complaint/complaint.component.html
@ -25,7 +25,7 @@
        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
      </div>
      <div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
          (click)="st?.load(1)"  acl  [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
        <button nz-button nzType="primary" acl  [acl-ability]="['ORDER-COMPLAINT-export']"
         >导出</button>
--- a/src/app/routes/order-management/components/complaint/complaint.component.ts
+++ b/src/app/routes/order-management/components/complaint/complaint.component.ts
@ -29,6 +29,7 @@ export class OrderManagementComplaintComponent implements OnInit {
  @ViewChild('sfView', { static: false }) sfView!: SFComponent;
  columns: STColumn[] = [];
  selectedIndex: number = 0;
+  isLoading: boolean = false;
  mainTabs = [
    { name: '司机投诉', status: '2' },
    { name: '货主投诉', status: '1' },
@ -253,6 +254,7 @@ export class OrderManagementComplaintComponent implements OnInit {
   */
  resetSF(): void {
    this.sf.reset();
+    this.isLoading = true
  }
  selectChange(e: number) {
    this.resourceStatus = e;
--- a/src/app/routes/partner/ad/components/list/list.component.html
+++ b/src/app/routes/partner/ad/components/list/list.component.html
@ -14,7 +14,7 @@
                <sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
            </div>
            <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
+                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st.load()">查询</button>
                <button nz-button (click)="resetSF()">重置</button>
                <button nz-button nzType="link" (click)="expandToggle()">
                    {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.html
@ -29,7 +29,7 @@
      <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]="service.http.loading"
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
        (click)="st?.load(1)">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
--- a/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-order-detail/partner-order-detail.component.ts
@ -24,6 +24,7 @@ export class PartnerPartnerOrderDetailComponent implements OnInit {
  @ViewChild('sf') private readonly sf!: SFComponent;
  columns: STColumn[] = [];
  _$expand = false;
+  isLoading: boolean = false;

  constructor(public service: BussinessStatisticsService) {

@ -41,9 +42,7 @@ export class PartnerPartnerOrderDetailComponent implements OnInit {
  resetSF() {
    this._$expand = false;
    this.sf.reset();
-    setTimeout(() => {
-      this.st.reset();
-    })
+    this.isLoading = true
  }
  /**
 * 伸缩查询条件
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html
@ -1,6 +1,6 @@
 <nz-card>
  <sf mode="search" [schema]="schema" [ui]="ui" [button]="'none'" (formSubmit)="st.load(1)" (formReset)="resetSF()" #sf>
-    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
      (click)="st?.load(1)">查询</button>
    <button nz-button (click)="resetSF()">重置</button>
    <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
--- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
+++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts
@ -15,6 +15,7 @@ export class PartnerPartnerStatisticsComponent implements OnInit {
  @ViewChild('st') private readonly st!: STComponent;
  @ViewChild('sf') private readonly sf!: SFComponent;
  columns: STColumn[] = [];
+  isLoading: boolean = false;

  constructor(public service: BussinessStatisticsService) { }
  /**
@ -85,9 +86,7 @@ export class PartnerPartnerStatisticsComponent implements OnInit {

  resetSF() {
    this.sf.reset();
-    setTimeout(() => {
-      this.st.reset();
-    })
+    this.isLoading = true
  }

  export() {
--- a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.html
@ -1,6 +1,6 @@
 <nz-card>
  <sf mode="search" [schema]="schema" [button]="'none'" #sf>
-    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
      (click)="st?.load(1)">查询</button>
    <button nz-button (click)="resetSF()">重置</button>
    <button nz-button (click)="export()" nzType="primary" nzGhost>导出</button>
--- a/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
+++ b/src/app/routes/partner/business-statistics/components/sale-statistics/sale-statistics.component.ts
@ -15,6 +15,7 @@ export class PartnerSaleStatisticsComponent implements OnInit {
  @ViewChild('sf') private readonly sf!: SFComponent;
  columns: STColumn[] = [];
  ui!: SFUISchema;
+  isLoading: boolean = false;

  constructor(public service: BussinessStatisticsService) { }

@ -72,8 +73,6 @@ export class PartnerSaleStatisticsComponent implements OnInit {
  }
  resetSF() {
    this.sf.reset();
-    setTimeout(() => {
-      this.st.reset();
-    })
+    this.isLoading = true
  }
 }
--- a/src/app/routes/partner/knowledge/banner/components/list/list.component.html
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.html
@ -14,7 +14,7 @@
                <sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
            </div>
            <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
+                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st.load()">查询</button>
                <button nz-button (click)="resetSF()">重置</button>
                <button nz-button nzType="link" (click)="expandToggle()">
                    {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
+++ b/src/app/routes/partner/knowledge/banner/components/list/list.component.ts
@ -23,6 +23,7 @@ export class BannerComponentsListComponent implements OnInit {
    appName: '',
    appId: ''
  };
+  isLoading: boolean = false;

  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
@ -212,6 +213,7 @@ export class BannerComponentsListComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }

  /**
--- a/src/app/routes/partner/scrollimg/components/list/list.component.html
+++ b/src/app/routes/partner/scrollimg/components/list/list.component.html
@ -14,7 +14,7 @@
                <sf #sf [schema]="schema" [ui]="ui" [button]="'none'"></sf>
            </div>
            <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st.load()">查询</button>
+                <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st.load()">查询</button>
                <button nz-button (click)="resetSF()">重置</button>
                <button nz-button nzType="link" (click)="expandToggle()">
                    {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/partner/scrollimg/components/list/list.component.ts
+++ b/src/app/routes/partner/scrollimg/components/list/list.component.ts
@ -23,6 +23,7 @@ export class ScrollImgComponentsListComponent implements OnInit {
    appName: '',
    appId: ''
  };
+  isLoading: boolean = false;

  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
@ -256,6 +257,7 @@ export class ScrollImgComponentsListComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }

  /**
--- a/src/app/routes/supply-management/components/addmodal/addmodal.component.html
+++ b/src/app/routes/supply-management/components/addmodal/addmodal.component.html
@ -35,7 +35,7 @@
        <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]="service.http.loading" (click)="initData(true)">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="initData(true)">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/supply-management/components/addmodal/addmodal.component.ts
+++ b/src/app/routes/supply-management/components/addmodal/addmodal.component.ts
@ -24,6 +24,7 @@ export class CarAddmodalComponent implements OnInit {
  tableData: any = [];
  companyData: any = {};
  flag = false
+  isLoading: boolean = false;
  constructor(
    private modal: NzModalRef,
    private eaCacheSrv: EACacheService,
@ -68,6 +69,7 @@ export class CarAddmodalComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 程序初始化入口
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.html
@ -33,7 +33,7 @@
        <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]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st?.load(1)">查询</button>
        <button nz-button nzType="primary">导出</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
--- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
+++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts
@ -55,6 +55,7 @@ export class NetworkFreightComponent implements OnInit {
  isVisibleTicket = false;
  edit = false;
  editId = false;
+  isLoading: boolean = false;
  tabs: any[] = [{ name: '开票设置' }, { name: '税务设置' }, { name: 'NC设置' }];

  columns: STColumn[] = [
@ -591,6 +592,7 @@ export class NetworkFreightComponent implements OnInit {
   */
  resetSF() {
    this.sf.reset();
+    this.isLoading = false
  }
  handleCancel() {
    this.isVisible = false;
--- 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
@ -17,7 +17,7 @@
      <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]="service.http.loading" (click)="search()" acl
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
        [acl-ability]="['RiskOrder-Search']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="resetSF()">导出</button>
--- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
+++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts
@ -23,6 +23,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
  tabType!: string;
+  isLoading: boolean = false;
  tabs: any[] = [
    { name: '待申报', value: '1' },
    { name: '待审核', value: '2' },
@ -81,6 +82,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 程序初始化入口
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@ -17,7 +17,7 @@
      <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]="service.http.loading" (click)="search()" acl
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
        [acl-ability]="['RiskOrder-Search']">查询</button>
      <button nz-button (click)="resetSF()">重置</button>
      <button nz-button (click)="resetSF()">导出</button>
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@ -25,6 +25,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;
  tabType!: string;
+  isLoading: boolean = false;
  tabs: any[] = [
    { name: '待上传', value: '1' },
    { name: '上传中', value: '2' },
@ -83,6 +84,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  resetSF() {
    this.sf.reset();
    this._$expand = false;
+    this.isLoading = true
  }
  /**
   * 程序初始化入口
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
@ -30,7 +30,7 @@
        <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]="service.http.loading" (click)="search()"  acl  [acl-ability]="['WAYBILL-ABNORMAL-search']">查询</button>
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"  acl  [acl-ability]="['WAYBILL-ABNORMAL-search']">查询</button>
        <button nz-button (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@ -37,6 +37,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
  edit = false;
  editId = false;
  selectedIndex = 0;
+  isLoading: boolean = false;
  tabs = {
    stayQuantity: 0,
    receivedQuantity: 0
@ -69,6 +70,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
    { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
    { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
  ];
+  

  get reqParams() {
    return {
@ -244,6 +246,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   */
  resetSF() {
    this.sf.reset();
+    this.isLoading = true
  }
  // 获取城市列表
  getRegionCode(regionCode: any) {