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:
Taric Xin
2022-04-21 16:48:29 +08:00
parent 91fc645b50 19b9fe515d
commit 1a0ba55ea0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-04-06 10:57:56 * @Date : 2022-04-06 10:57:56
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-21 09:45:41 * @LastEditTime : 2022-04-21 16:41:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\freight-account\\freight-account-detail\\freight-account-detail.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\freight-account\\freight-account-detail\\freight-account-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -50,7 +50,7 @@
</div> </div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"> <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" <button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="st?.load(1);loadInfo();">查询</button> (click)="st?.load(1);">查询</button>
<button nz-button (click)="resetSF()">重置</button> <button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button> <button nz-button (click)="exportList()"> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">

2
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
View File

@ -46,7 +46,7 @@ export class FreightAccountDetailComponent implements OnInit {
} }
}); });
} }
this.loadStatistics(requestOptions.body); // this.loadStatistics(requestOptions.body);
return requestOptions; return requestOptions;
}; };

6
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -150,9 +150,9 @@ export class PaymentRecordComponent implements OnInit {
type: 'string', type: 'string',
title: '车队长收款', title: '车队长收款',
enum: [ enum: [
{ label: '全部', value: '' }, {label: '全部', value: ''},
{ label: '否', value: '0' }, {label: '是', value: '1'},
{ label: '是', value: '1' } {label: '否', value: '2'}
], ],
ui: { ui: {
widget: 'select', widget: 'select',