diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.html b/src/app/routes/financial-management/components/driver-account/driver-account.component.html index ea3f5792..d2633c6d 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.html +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.html @@ -22,7 +22,7 @@ - - + @@ -19,7 +19,8 @@ - + @@ -50,7 +51,7 @@ - { - Object.assign(requestOptions.body, { transactionNumber: this.route.snapshot.params.id }); + Object.assign(requestOptions.body, { + ltdid: this.params.ltdid, + projectId: this.params.projectId, + roleId: this.params.roleId + }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); } @@ -34,7 +42,6 @@ export class FreightAccountDetailComponent implements OnInit { }; afterReq = (data: any[], rawData?: any) => { - console.log(data, rawData); if (rawData?.success) { this.info = { incomeAmount: rawData.data.rawData, @@ -81,9 +88,10 @@ export class FreightAccountDetailComponent implements OnInit { title: '交易时间', type: 'string', ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd' + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true } as SFDateWidgetSchema }, transactionNumber: { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.html b/src/app/routes/financial-management/components/freight-account/freight-account.component.html index 12b1bcd6..9ac3bbae 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.html +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.html @@ -22,7 +22,7 @@ - this.router.navigate(['/financial-management/freight-account/detail/' + item.id]) + click: item => + this.router.navigate(['/financial-management/freight-account/detail/' + item.id], { + queryParams: { + tenantName: item.tenantName, + ltdName: item.ltdName, + bankType: item.bankType, + projectId: item.projectId, + roleId: item.roleId, + ltdid: item.ltdid + } + }) } ] } 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 c9d7f5f6..000bce84 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -7,8 +7,13 @@ import { BaseService, ShipperBaseService } from '@shared'; export class FreightAccountService extends ShipperBaseService { $mock_url = '/rule?_allow_anonymous=true'; - // 获取账户余额信息 - $api_get_account_balance = '/api/fcc/accountBalance/getAccountBalance'; + // 运营端获取货主账户信息 + $api_get_shipper_account_page = '/api/fcc/accountBalance/getShipperAccountBalanceByOperator'; + // 运营端获取司机账户信息 + $api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator'; + + // 运营端获取货主账户明细信息 + $api_get_shipper_account_detail = '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator'; // 货主端获取账户余额交易明细 $api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage';