diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
index e012daa0..45bc7f8f 100644
--- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
+++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts
@@ -61,17 +61,17 @@ export class DriverAccountComponent implements OnInit {
hidden: true
}
},
- tenantName: {
+ name: {
type: 'string',
title: '司机姓名',
ui: { placeholder: '请输入' }
},
- phone: {
+ idNo: {
type: 'string',
title: '证件号码',
ui: { placeholder: '请输入' }
},
- page: {
+ phone: {
type: 'string',
title: '手机号',
ui: {
@@ -126,9 +126,9 @@ export class DriverAccountComponent implements OnInit {
title: '创建时间',
type: 'string',
ui: {
- widget: 'date',
- mode: 'range',
+ widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
+ placeholder: '请选择',
visibleIf: {
expand: (value: boolean) => value
}
@@ -140,15 +140,15 @@ export class DriverAccountComponent implements OnInit {
private initST(): STColumn[] {
return [
- { title: '司机姓名', index: 'tenantName' },
- { title: '证件号码', index: 'description' },
- { title: '手机号', index: 'description' },
- { title: '网络货运人', index: 'ltdid' },
- { title: '银行类型', index: 'description', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
+ { title: '司机姓名', index: 'name' },
+ { title: '证件号码', index: 'idNo' },
+ { title: '手机号', index: 'phone' },
+ { title: '网络货运人', index: 'ltdName' },
+ { title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
{ title: '虚拟账户', index: 'virtualAccount' },
{ title: '可用余额', index: 'availableBalance' },
{ title: '冻结余额', index: 'freezeBalance' },
- { title: '本月累计提现金额', index: 'description', width: 150 },
+ { title: '本月累计提现金额', index: 'withdrawBalance', width: 150 },
{ title: '账户总余额', index: 'availableBalance' },
{ title: '创建时间', index: 'createTime', type: 'date', width: 150 },
{
@@ -156,7 +156,20 @@ export class DriverAccountComponent implements OnInit {
buttons: [
{
text: '查看明细',
- click: item => this.router.navigate(['/financial-management/driver-account/detail/1'])
+ click: item =>
+ this.router.navigate(['/financial-management/driver-account/detail/' + item.id], {
+ queryParams: {
+ name: item.name,
+ phone: item.phone,
+ ltdName: item.ltdName,
+ bankType: item.bankType,
+ projectId: item.projectId,
+ availableBalance: item.availableBalance,
+ enterpriseId: item.enterpriseId,
+ roleId: item.roleId,
+ ltdid: item.ltdid
+ }
+ })
}
]
}
diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
index 4997335b..b5393930 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html
@@ -14,7 +14,7 @@
-
@@ -39,7 +39,8 @@
[button]="'none'">
-
+