diff --git a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
index ed3f6b4e..2e120e63 100644
--- a/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-info/fund-info.component.ts
@@ -60,13 +60,12 @@ export class DatatableReportingFundInfoComponent implements OnInit {
title: '本地校验',
render: 'checkStatus',
className: 'text-center',
- type: 'enum',
-
- enum: {
- '0': '校验中',
- '1': '通过',
- '2': '不通过'
- },
+ // type: 'enum',
+ // enum: {
+ // '0': '校验中',
+ // '1': '通过',
+ // '2': '不通过'
+ // },
width: '10%',
},
{ title: '错误内容', index: 'remark', className: 'text-center', width: '20%', },
diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
index b1d74f18..295b66ea 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@@ -31,21 +31,22 @@
[page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"
(change)="changeSt($event)">
- {{filterStatus(item?.billPutStatus)}}
- {{filterStatus(item?.billPutStatus)}}
+ {{filterStatus(item?.billPutStatus)}}
+ {{filterStatus(item?.billPutStatus)}}
- {{filterStatus(item?.driverPutStatus)}}
- {{filterStatus(item?.driverPutStatus)}}
+ {{filterStatus(item?.driverPutStatus)}}
+ {{filterStatus(item?.driverPutStatus)}}
- {{filterStatus(item?.carPutStatus)}}
- {{filterStatus(item?.carPutStatus)}}
+ {{filterStatus(item?.carPutStatus)}}
+ {{filterStatus(item?.carPutStatus)}}
- {{filterCheckStatus(item?.checkStatus)}}
- {{filterCheckStatus(item?.checkStatus)}}
+ {{filterCheckStatus(item?.checkStatus)}}
+ {{filterCheckStatus(item?.checkStatus)}}
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 3c1264f7..9e87d018 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
@@ -283,10 +283,8 @@ export class DatatableOrderReportingComponent implements OnInit {
{ title: '', type: 'checkbox', className: 'text-center', width: '60px', },
{ title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', },
{ title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px', },
-
{ title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px', },
-
- { title: '本地校验', index: 'checkStatusLabel', className: 'text-center', width: '120px', },
+ { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
{
title: '订单号',
render: 'billCode',
@@ -584,13 +582,13 @@ export class DatatableOrderReportingComponent implements OnInit {
}
}
- filterCheckStatus(status: number) {
+ filterCheckStatus(status: string | number) {
switch (status) {
- case 0:
+ case '0':
return '检测中';
- case 1:
+ case '1':
return '通过';
- case 2:
+ case '2':
return '不通过';
default:
return '';
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
index cd63765c..15ef42f2 100644
--- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
+++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts
@@ -64,13 +64,13 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
},
{ title: '上传值', index: 'fieldValue', className: 'text-center', width: '150px', },
{
- title: '本地校验', index: 'checkStatus', className: 'text-center', width: '100px',
- type: 'enum',
- enum: {
- 0: '校验中',
- 1: '通过',
- 2: '不通过'
- }
+ title: '本地校验', render: 'checkStatus', className: 'text-center', width: '100px',
+ // type: 'enum',
+ // enum: {
+ // 0: '校验中',
+ // 1: '通过',
+ // 2: '不通过'
+ // }
},
{ title: '错误内容', index: 'remark', className: 'text-center', width: '150px', },
]
@@ -120,7 +120,7 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
filterCheckStatus(status: number) {
switch (status) {
case 0:
- return '校验中';
+ return '检测中';
case 1:
return '通过';
case 2: