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 @@