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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-11 14:04:49 +08:00
parent e8df63e1e6
commit ebd8fc816f
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -195,8 +195,8 @@ export class CostManagementComponent implements OnInit {
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.request(this.service.$api_crm_enterpriceList, { enterpriseName: str })
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.enterpriseId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -220,8 +220,8 @@ export class CostManagementComponent implements OnInit {
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.request(this.service.$api_crm_enterpriceList, { enterpriseName: str })
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.crmUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);

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

@ -49,8 +49,7 @@
[ui]="{ '*': { spanLabelFixed: 90,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.expend-options]="_$expand"
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" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button>

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

@ -66,7 +66,7 @@ export class PlatformAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceByPage,);
this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceByPage);
}
goBack() {
@ -153,6 +153,16 @@ export class PlatformAccountDetailComponent implements OnInit {
},
default: ''
},
roleName: {
type: 'string',
title: '账户名称',
ui: {
placeholder: '请输入',
visibleIf: {
expand: (value: boolean) => value
}
}
},
incomeType: {
type: 'string',
title: '收支类型',
@ -201,7 +211,7 @@ export class PlatformAccountDetailComponent implements OnInit {
{ title: '订单号', index: 'orderSn', width: 170 },
{ title: '运单号', index: 'businessNumber', width: 190 },
{ title: '账户类型', index: 'accountTypeLabel', className: 'text-center', width: 130 },
{ title: '账户名称', index: 'payName', className: 'text-center', width: 150 },
{ title: '账户名称', index: 'roleName', className: 'text-center', width: 150 },
{ title: '所属项目', index: 'projectName', className: 'text-center', width: 150 },
{ title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 130 },
{

2
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -188,6 +188,8 @@ export class FreightAccountService extends ShipperBaseService {
}
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
// 获取企业CRM信息
public $api_crm_enterpriceList = '/api/mdc/cuc/enterprise/getCrmSelectList';
reviewPDF(url: string) {
if (!url) {
return;