diff --git 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 index 023f6697..37e24dfb 100644 --- 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)" > diff --git 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 index 86bee964..517ec984 100644 --- 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; } /** diff --git 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 index ec2c52ea..2c054c6a 100644 --- 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 @@
-
- +
- +
- + @@ -17,7 +17,7 @@
-
- diff --git 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 index 60b9d23d..8e772ccd 100644 --- 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 } /** * 程序初始化入口 diff --git 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 index 7e7f8c6a..87a9e720 100644 --- 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 @@
- diff --git 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 index 05361849..43cc4b2a 100644 --- 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 } /** * 程序初始化入口 diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index 9a60a60d..460d650e 100644 --- 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 @@
- diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index 9f9b1aca..23c7cae1 100644 --- 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; diff --git a/src/app/routes/partner/ad/components/list/list.component.html b/src/app/routes/partner/ad/components/list/list.component.html index 4dc94725..5a266913 100644 --- 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 @@
- +
- diff --git 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 index bfda06d7..50c33e77 100644 --- 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 } /** * 伸缩查询条件 diff --git 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 index eff67eb6..e832275b 100644 --- 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 @@ - diff --git 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 index 11bca202..43cc7831 100644 --- 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() { diff --git 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 index aa6f6c90..3a68680d 100644 --- 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 @@ - diff --git 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 index d9279bd2..5e3524ef 100644 --- 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 } } diff --git a/src/app/routes/partner/knowledge/banner/components/list/list.component.html b/src/app/routes/partner/knowledge/banner/components/list/list.component.html index 86ae2518..d533734b 100644 --- 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 @@
- +
- +
- +
- +
- diff --git 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 index cc2fe881..85ba228c 100644 --- 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 } /** * 程序初始化入口 diff --git 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 index bd81729b..789d9c54 100644 --- 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 @@
- diff --git 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 index c0707690..eae59243 100644 --- 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 } /** * 程序初始化入口 diff --git 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 index a18b63d4..d4ac94de 100644 --- 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 @@
- +