Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
wangshiming
2022-04-11 19:28:15 +08:00
2 changed files with 11 additions and 3 deletions

View File

@ -6,7 +6,7 @@
</div> </div>
<div style="width: 90%;"> <div style="width: 90%;">
<st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns" <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams ,process: beforeReq }"
[res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}" [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
[bordered]="true"> [bordered]="true">
<ng-template st-row="checkStatus" let-item> <ng-template st-row="checkStatus" let-item>

View File

@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { STColumn, STComponent } from '@delon/abc/st'; import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { NzModalRef } from 'ng-zorro-antd/modal'; import { NzModalRef } from 'ng-zorro-antd/modal';
import { ReportingService } from '../../services/reporting.service'; import { ReportingService } from '../../services/reporting.service';
@ -23,13 +23,21 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
get reqParams() { get reqParams() {
return { return {
subjectType: this.subjectType, subjectType: this.subjectType,
subjectId: this.record?.orderId subjectId: this.record?.orderId,
}; };
} }
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
} }
beforeReq(requestOptions: STRequestOptions) {
delete requestOptions?.body?.pageSize;
delete requestOptions?.body?.pageIndex;
return requestOptions;
}
ngOnInit(): void { ngOnInit(): void {
this.initST(); this.initST();
} }