Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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',
+        // type: 'enum',
-
+        // enum: {
-        enum: {
+        //   '0': '校验中',
-          '0': '校验中',
+        //   '1': '通过',
-          '1': '通过',
+        //   '2': '不通过'
-          '2': '不通过'
+        // },
-        },
         width: '10%',
       },
       { title: '错误内容', index: 'remark', className: 'text-center', width: '20%', },

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)">
     <ng-template st-row="billPutStatus" let-item let-index="index">
-      <a *ngIf="item?.billPutStatus === 2" (click)="viewAuditResult(item)">{{filterStatus(item?.billPutStatus)}}</a>
+      <a *ngIf="item?.billPutStatus === '2'" (click)="viewAuditResult(item)">{{filterStatus(item?.billPutStatus)}}</a>
-      <span *ngIf="item?.billPutStatus !== 2">{{filterStatus(item?.billPutStatus)}}</span>
+      <span *ngIf="item?.billPutStatus !== '2'">{{filterStatus(item?.billPutStatus)}}</span>
     </ng-template>
     <ng-template st-row="driverPutStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.driverPutStatus === 2">{{filterStatus(item?.driverPutStatus)}}</a>
+      <a (click)="viewAuditResult(item)"
-      <span *ngIf="item?.driverPutStatus !== 2">{{filterStatus(item?.driverPutStatus)}}</span>
+        *ngIf="item?.driverPutStatus === '2'">{{filterStatus(item?.driverPutStatus)}}</a>
+      <span *ngIf="item?.driverPutStatus !== '2'">{{filterStatus(item?.driverPutStatus)}}</span>
     </ng-template>
     <ng-template st-row="carPutStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)" *ngIf="item?.carPutStatus === 2">{{filterStatus(item?.carPutStatus)}}</a>
+      <a (click)="viewAuditResult(item)" *ngIf="item?.carPutStatus === '2'">{{filterStatus(item?.carPutStatus)}}</a>
-      <span *ngIf="item?.carPutStatus !== 2">{{filterStatus(item?.carPutStatus)}}</span>
+      <span *ngIf="item?.carPutStatus !== '2'">{{filterStatus(item?.carPutStatus)}}</span>
     </ng-template>
 
     <ng-template st-row="checkStatus" let-item let-index="index">
-      <a *ngIf="item?.checkStatus === 2" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
+      <a *ngIf="item?.checkStatus === '2'" (click)="viewResult(item)">{{filterCheckStatus(item?.checkStatus)}}</a>
-      <span *ngIf="item?.checkStatus !== 2">{{filterCheckStatus(item?.checkStatus)}}</span>
+      <span *ngIf="item?.checkStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span>
     </ng-template>
 
     <ng-template st-row="billCode" let-item>

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: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
-      { title: '本地校验', index: 'checkStatusLabel', 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 '';

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',
+        title: '本地校验', render: 'checkStatus', className: 'text-center', width: '100px',
-        type: 'enum',
+        // type: 'enum',
-        enum: {
+        // enum: {
-          0: '校验中',
+        //   0: '校验中',
-          1: '通过',
+        //   1: '通过',
-          2: '不通过'
+        //   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: