diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
index 78ec7e3a..57203a7e 100644
--- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
+++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts
@@ -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([]);
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
index 3fb082ed..2f7d6102 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.html
@@ -49,8 +49,7 @@
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'">
-
+
diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
index 012d9967..34a9e8e0 100644
--- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
@@ -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 },
{
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index e00bb7f9..f2ab2022 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -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;