Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangshiming
2022-04-06 14:38:13 +08:00
parent c484687413 fa25714764
commit eb7ba37bf3
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
View File

@ -19,15 +19,13 @@ export class DatatableReportingFundInfoComponent implements OnInit {
get reqParams() { get reqParams() {
return { capitalCode: this?.record?.orderCode }; return { capitalCode: this?.record?.serialNumberCode };
} }
beforeReq(requestOptions: STRequestOptions) { beforeReq(requestOptions: STRequestOptions) {
delete requestOptions?.body?.pageSize; delete requestOptions?.body?.pageSize;
delete requestOptions?.body?.pageIndex; delete requestOptions?.body?.pageIndex;
return requestOptions; return requestOptions;
} }
constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {

2
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
View File

@ -28,7 +28,7 @@
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_fund_reporting_page" [columns]="columns" <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_fund_reporting_page" [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 }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [1,10,20, 50, 100] }" [loading]="false" [page]="{ show: true, showSize: true, pageSizes: [1,10,20, 50, 100] }"
(change)="changeSt($event)"> (change)="changeSt($event)">
<ng-template st-row="uploadStatus" let-item> <ng-template st-row="uploadStatus" let-item>
<span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.billStatusLabel}}</span> <span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.billStatusLabel}}</span>

2
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
View File

@ -28,7 +28,7 @@
<st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns" <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_order_reporting_page" [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 }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"> [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" >
<ng-template st-row="orderCheckStatus" let-item let-index="index"> <ng-template st-row="orderCheckStatus" let-item let-index="index">
<a (click)="viewAuditResult(item)" <a (click)="viewAuditResult(item)"
*ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a> *ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>