From dd2f87e97bf01413dc970ad6e5b01572e1aa79c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 11 Apr 2022 14:03:34 +0800 Subject: [PATCH 1/2] - --- .../components/order-reporting/order-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index fb343fa0..3e2e3e8a 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -306,7 +306,7 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' }, { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' }, { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '100px' }, + { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '130px' }, { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' }, { title: '车牌颜色', From ebd8fc816f042f1ba080980489d395b4e02564b4 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 11 Apr 2022 14:04:49 +0800 Subject: [PATCH 2/2] edit --- .../cost-management/cost-management.component.ts | 8 ++++---- .../platform-account-detail.component.html | 3 +-- .../platform-account-detail.component.ts | 14 ++++++++++++-- .../services/freight-account.service.ts | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) 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;