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-28 21:41:15 +08:00
parent 72eb70bf75 f46e817d05
commit 11df634a44
9 changed files with 149 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/routes/commom/components/basic-table/basic-table.component.ts
View File

@ -73,22 +73,29 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
for (let index = 0; index < tabset.length; index++) {
tabsetHeight += tabset[index].clientHeight;
}
console.log('tabsetHeight', tabsetHeight);
if (tabset) {
scrollY -= tabsetHeight;
}
// 剔除高度容器
// 计算所有tabs高度
const headerBox = document.getElementsByClassName('header_box');
let headerBoxHeight = 0;
for (let index = 0; index < headerBox.length; index++) {
headerBoxHeight += headerBox[index].clientHeight;
}
console.log('headerBoxHeight', headerBoxHeight);
if (headerBox) {
scrollY -= headerBoxHeight;
}
// 剔除高度容器
const heightBox = document.getElementsByClassName('height_box');
let heightBoxHeight = 0;
for (let index = 0; index < heightBox.length; index++) {
heightBoxHeight += heightBox[index].clientHeight;
}
if (heightBox) {
scrollY -= heightBoxHeight;
}
if (typeof this.deviationHeight === 'number') {
scrollY -= this.deviationHeight;
}

4
src/app/routes/commom/less/commom-table.less
View File

@ -136,4 +136,6 @@
margin-right: 6px;
}
}
}
}
.height_box{}

17
src/app/routes/commom/less/common-table-bar.less Normal file
View File

@ -0,0 +1,17 @@
:host::ng-deep {
nz-card {
margin: -8px -8px 0 !important
}
.height_box {
margin-bottom: 18px !important;
}
}
.total-footer {
position : absolute;
bottom : 0px;
height : 32px;
margin : 4px 8px;
line-height: 32px;
}

36
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -1,17 +1,10 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-14 14:39:04
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 16:20:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payable-order\\payable-order.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'应付核销'">
</page-header-wrapper>
<!-- <page-header-wrapper [title]="'应付核销'">
</page-header-wrapper> -->
<nz-card>
<nz-card class="height_box">
<div class="header_box" style="margin-left: -16px; margin-top: -16px;">
<label class="page_title"> <label class="driver">|</label> 应付核销</label>
</div>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="((info?.prmoneySum || 0) | currency)+'元' " [nzTitle]="'应付金额'"
@ -31,7 +24,7 @@
</nz-row>
</nz-card>
<nz-card class="search-box" nzBordered>
<!-- <nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema"
@ -41,17 +34,22 @@
<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" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="false"> 导出</button>
<button nz-button [disabled]="false"> 导出核销</button> -->
<button nz-button [disabled]="false"> 导出</button>
<button nz-button [disabled]="false"> 导出核销</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
</nz-card> -->
<nz-card class="table-box">
<div class="header_box">
<div></div>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
</div>
</div>
<st #st [data]="service.$api_get_fico_ph_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x:'1200px' }" (change)="stChange($event)">
</st>

72
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -3,24 +3,21 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-payable-order',
templateUrl: './payable-order.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
providers: [CurrencyPipe]
styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less']
})
export class PayableOrderComponent implements OnInit {
export class PayableOrderComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
schema: SFSchema = this.initSF();
selectedRows: any[] = [];
info: any = {};
@ -28,10 +25,15 @@ export class PayableOrderComponent implements OnInit {
public service: FreightAccountService,
private nzModalService: NzModalService,
private router: Router,
private currencyPipe: CurrencyPipe
) {}
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
ngOnInit(): void {
ngOnInit(): void {}
search() {
this.st?.load(1);
}
loadInfo() {
@ -76,21 +78,6 @@ export class PayableOrderComponent implements OnInit {
}
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
@ -133,9 +120,6 @@ export class PayableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
cno: {
@ -146,9 +130,6 @@ export class PayableOrderComponent implements OnInit {
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
}
},
driver2IdName: {
@ -157,9 +138,6 @@ export class PayableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
sts: {
@ -172,9 +150,6 @@ export class PayableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
phxdate: {
@ -183,9 +158,6 @@ export class PayableOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
createTime: {
@ -194,9 +166,6 @@ export class PayableOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
billHCode: {
@ -204,9 +173,6 @@ export class PayableOrderComponent implements OnInit {
title: '订单号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
feeHCode: {
@ -214,9 +180,6 @@ export class PayableOrderComponent implements OnInit {
title: '费用号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
remarks: {
@ -225,9 +188,6 @@ export class PayableOrderComponent implements OnInit {
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
@ -246,15 +206,17 @@ export class PayableOrderComponent implements OnInit {
title: '核销金额',
index: 'phxmoney',
width: 140,
type: 'widget',
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.phxmoney || 0)}`
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.phxmoney }) }
},
{
title: '应付金额',
index: 'prmoney',
width: 140,
type: 'widget',
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.prmoney || 0)}`
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.prmoney }) }
},
{ title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
{ title: '付款类型', index: 'brmtype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },

26
src/app/routes/financial-management/components/platform-account/platform-account.component.html
View File

@ -1,7 +1,10 @@
<page-header-wrapper title="平台账户">
</page-header-wrapper>
<!-- <page-header-wrapper title="平台账户">
</page-header-wrapper> -->
<nz-card>
<nz-card class="height_box">
<div class="header_box" style="margin-left: -16px; margin-top: -16px;">
<label class="page_title"> <label class="driver">|</label> 平台账户</label>
</div>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="4" [nzLg]="6" [nzSm]="12">
<nz-statistic [nzValue]="((info.availableBalance |currency:' ') || 0)+'元'" nzTitle="平台账户余额"
@ -36,10 +39,10 @@
</nz-row>
</nz-card>
<nz-card class="search-box">
<!-- <nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}"
[compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
@ -48,9 +51,16 @@
<button nz-button (click)="exportList()"> 导出</button>
</div>
</div>
</nz-card>
</nz-card> -->
<nz-card class="content-box">
<nz-card class="table-box">
<div class="header_box">
<div></div>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
<button nz-button nzDanger (click)="exportList()"> 导出</button>
</div>
</div>
<st #st [data]="service.$api_get_platform_account_page" [columns]="columns" [req]="{ process: beforeReq }"
[page]="{}" [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
</st>
@ -60,4 +70,4 @@
<label class="text-red-dark font-weight-bold">{{static?.payAmount | currency }}</label>
</div>
</nz-card>
</nz-card>

24
src/app/routes/financial-management/components/platform-account/platform-account.component.ts
View File

@ -2,7 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { FreightAccountService } from '../../services/freight-account.service';
import { CwcBankCardManagementBindComponent } from '../bank-card-management/bind/bind.component';
import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit/withdraw-deposit.component';
@ -10,14 +12,12 @@ import { CwcAccountManagementWithdrawDepositComponent } from './withdraw-deposit
@Component({
selector: 'app-platform-account',
templateUrl: './platform-account.component.html',
styleUrls: ['../../../commom/less/box.less']
styleUrls: ['../../../commom/less/commom-table.less', '../../../commom/less/common-table-bar.less']
})
export class PlatformAccountComponent implements OnInit {
export class PlatformAccountComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
searchSchema: SFSchema = this.initSF();
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
info: any = {};
@ -27,11 +27,16 @@ export class PlatformAccountComponent implements OnInit {
public service: FreightAccountService,
private router: Router,
private nzModalService: NzModalService,
public modal: NzModalService
) {}
public modal: NzModalService,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
ngOnInit(): void {
this.loadInfo();
ngOnInit(): void {}
search() {
this.st?.load(1);
}
beforeReq = (requestOptions: STRequestOptions) => {
@ -39,6 +44,7 @@ export class PlatformAccountComponent implements OnInit {
Object.assign(requestOptions.body, { ...this.sf?.value });
}
this.loadStatistics(requestOptions.body);
this.loadInfo();
return requestOptions;
};

62
src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
View File

@ -1,16 +1,29 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-14 14:39:04
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 16:20:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receivable-order\\receivable-order.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'应收核销'"> </page-header-wrapper>
<!-- <page-header-wrapper [title]="'应收核销'"> </page-header-wrapper> -->
<nz-card>
<!-- <nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button [disabled]="false"> 导出</button>
<button nz-button [disabled]="false"> 导出核销</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card> -->
<nz-card class="height_box">
<div class="header_box" style="margin-left: -16px; margin-top: -16px;">
<label class="page_title"> <label class="driver">|</label> 应收核销</label>
</div>
<nz-row [nzGutter]="16">
<nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
<nz-statistic [nzValue]="((info?.armoneySum || 0) | currency)+'元' " [nzTitle]="'应收金额'"
@ -30,28 +43,15 @@
</nz-row>
</nz-card>
<nz-card class="search-box" nzBordered>
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="false"> 导出</button>
<button nz-button [disabled]="false"> 导出核销</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
<nz-card class="table-box">
<div class="header_box">
<div></div>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()">筛选</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_fico_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="false" [scroll]="{ x: '1200px' }" (change)="stChange($event)">
[loading]="false" [scroll]="{ x: '1200px',y:scrollY }" (change)="stChange($event)">
</st>
</nz-card>

78
src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
View File

@ -3,25 +3,22 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
import { FreightAccountService } from '../../services/freight-account.service';
@Component({
selector: 'app-receivable-order',
templateUrl: './receivable-order.component.html',
styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'],
providers: [CurrencyPipe]
styleUrls: ['../../../commom/less/commom-table.less','../../../commom/less/common-table-bar.less']
})
export class ReceivableOrderComponent implements OnInit {
export class ReceivableOrderComponent extends BasicTableComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
columns: STColumn[] = this.initST();
searchSchema: SFSchema = this.initSF();
_$expand = false;
schema: SFSchema = this.initSF();
selectedRows: any[] = [];
@ -30,10 +27,15 @@ export class ReceivableOrderComponent implements OnInit {
public service: FreightAccountService,
private nzModalService: NzModalService,
private router: Router,
private currencyPipe: CurrencyPipe
) {}
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
ngOnInit(): void {
ngOnInit(): void {}
search() {
this.st?.load(1);
}
loadInfo() {
@ -78,21 +80,6 @@ export class ReceivableOrderComponent implements OnInit {
}
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this._$expand = false;
}
/**
* 伸缩查询条件
*/
expandToggle() {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
private initSF(): SFSchema {
return {
@ -135,9 +122,6 @@ export class ReceivableOrderComponent implements OnInit {
widget: 'dict-select',
params: { dictKey: 'driverrecord:receive:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
arvattype: {
@ -147,9 +131,6 @@ export class ReceivableOrderComponent implements OnInit {
widget: 'dict-select',
params: { dictKey: 'pay:type' },
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
cno: {
@ -160,9 +141,6 @@ export class ReceivableOrderComponent implements OnInit {
placeholder: '请选择',
allowClear: true,
asyncData: () => this.service.getCloseAccount(),
visibleIf: {
expand: (value: boolean) => value
}
}
},
arto: {
@ -175,9 +153,6 @@ export class ReceivableOrderComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
visibleIf: {
expand: (value: boolean) => value
}
}
},
sts: {
@ -190,9 +165,7 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
},
banktype: {
@ -206,9 +179,7 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
},
default: ''
},
@ -218,9 +189,7 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
createTime: {
@ -229,9 +198,6 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
billHCode: {
@ -239,9 +205,6 @@ export class ReceivableOrderComponent implements OnInit {
title: '订单号',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
// orderS3: {
@ -260,9 +223,6 @@ export class ReceivableOrderComponent implements OnInit {
ui: {
autocomplete: 'off',
placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
}
}
}
@ -282,15 +242,17 @@ export class ReceivableOrderComponent implements OnInit {
title: '核销金额',
index: 'ahxmoney',
width: 140,
type: 'widget',
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.ahxmoney)}`
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ahxmoney }) }
},
{
title: '应收金额',
index: 'armoney',
width: 140,
type: 'widget',
className: 'text-right',
format: item => `${this.currencyPipe.transform(item.armoney)}`
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.armoney }) }
},
{ title: '银行类型', index: 'banktype', type: 'enum', enum: { '1': '平安', '2': '浦发' }, width: 120 },
{ title: '收款类型', index: 'arvattype', type: 'enum', enum: { '1': '费用款项' }, width: 120 },