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-14 18:08:39 +08:00
parent 7f7f1f8ffc 04ddc1c111
commit 9d486e9cc8
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,19 +3,19 @@
<nz-card> <nz-card>
<!-- 搜索表单 --> <!-- 搜索表单 -->
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]=" 24 ">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand"> </div>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" <div [class.text-right]="true">
acl [acl-ability]="['RiskOrder-Search']">查询</button> <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
<button nz-button (click)="resetSF()">重置</button> acl [acl-ability]="['RiskOrder-Search']">查询</button>
<button nz-button (click)="export()">导出</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button (click)="export()">导出</button>
{{ !_$expand ? '展开' : '收起' }} <button nz-button nzType="link" (click)="expandToggle()">
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> {{ !_$expand ? '展开' : '收起' }}
</button> <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</div> </button>
</div> </div>
</nz-card> </nz-card>
<nz-card> <nz-card>

10
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -112,7 +112,6 @@ export class DatatableOrderReportingComponent implements OnInit {
placeholder: '请选择', placeholder: '请选择',
widget: 'select', widget: 'select',
asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
allowClear: true allowClear: true
} }
}, },
@ -266,8 +265,13 @@ export class DatatableOrderReportingComponent implements OnInit {
}, },
}; };
this.ui = { this.ui = {
'*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, '*': {
$time: { grid: { span: 24 } }, spanLabelFixed: 120,
grid: {
lg: 12,
xl: 8
}, enter: () => this.search()
},
}; };
} }