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-02-17 16:45:21 +08:00
parent d884571904 13415b9260
commit b1a18bbc54
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.html
View File

@ -40,7 +40,7 @@
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<nz-tabset> <nz-tabset>
<nz-tab nzTitle="转入信息"> <nz-tab nzTitle="转入信息">
<div nz-row nzGutter="8"> <!-- <div nz-row nzGutter="8">
<div nz-col [nzXl]="16" [nzLg]="18" [nzSm]="24" [nzXs]="24"> <div nz-col [nzXl]="16" [nzLg]="18" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="inputSearchSchema" <sf #sf [schema]="inputSearchSchema"
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 12, md: 12, sm: 12, xs: 24 } }}" [compact]="true" [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 12, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
@ -51,9 +51,9 @@
(click)="inputST?.load(1)">查询</button> (click)="inputST?.load(1)">查询</button>
<button nz-button (click)="resetInputSF()">重置</button> <button nz-button (click)="resetInputSF()">重置</button>
</div> </div>
</div> </div> -->
<st #inputST [scroll]="{ x: '2000px' }" [data]="service.$api_get_advance_collection_detail" <st #inputST [data]="service.$api_get_advance_collection_detail" [columns]="columns.input"
[columns]="columns.input" [page]="{ show: false }" [res]="{ reName: { list: 'data' } }" [page]="{ show: false }" [req]="{ process: beforeReq }" [res]="{ reName: { list: 'data' } }"
[loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md"> [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }" class="mt-md">
<ng-template st-row="no" let-item let-index="index" let-column="column"> <ng-template st-row="no" let-item let-index="index" let-column="column">
{{index+1}} {{index+1}}

4
src/app/routes/financial-management/components/advance-collection/advance-collection-detail/advance-collection-detail.component.ts
View File

@ -112,7 +112,7 @@ export class AdvanceCollectionDetailComponent implements OnInit {
input: [ input: [
{ title: '序号', render: 'no', width: 70, className: 'text-left' }, { title: '序号', render: 'no', width: 70, className: 'text-left' },
{ title: '收款单号', index: 'brmHCode', className: 'text-left', width: 200 }, { title: '收款单号', index: 'brmHCode', className: 'text-left', width: 200 },
{ title: '到账日期', index: 'billHId', className: 'text-center', width: 150 }, // { title: '到账日期', index: 'billHId', className: 'text-center', width: 150 },
{ {
title: '到账金额', title: '到账金额',
index: 'yskmoney', index: 'yskmoney',
@ -129,7 +129,7 @@ export class AdvanceCollectionDetailComponent implements OnInit {
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) }, widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yskmoney }) },
width: 140 width: 140
}, },
{ title: '预收备注', index: 'callNo', width: 200 } // { title: '预收备注', index: 'callNo', width: 200 }
], ],
info: [ info: [
{ title: '序号', render: 'no', width: 70, className: 'text-left' }, { title: '序号', render: 'no', width: 70, className: 'text-left' },