From 902e35e6db9aa756d12585907a6f8bbe7e6e793b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 6 Apr 2022 16:42:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E6=8A=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fund-reporting.component.html             | 13 +++++-----
 .../fund-reporting.component.ts               |  4 +++-
 .../order-reporting.component.html            | 17 +++++++------
 .../order-reporting.component.ts              | 24 +++++++++++++++----
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
index e8ded1e5..98069a2c 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html
@@ -7,8 +7,8 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
-        [acl-ability]="['RiskOrder-Search']">查询</button>
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
+        acl [acl-ability]="['RiskOrder-Search']">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -28,14 +28,13 @@
   <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_fund_reporting_page" [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [1,10,20, 50, 100] }" 
-    (change)="changeSt($event)">
+    [page]="{ show: true, showSize: true, pageSizes: [1,10,20, 50, 100] }" (change)="changeSt($event)">
     <ng-template st-row="uploadStatus" let-item>
-      <span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.billStatusLabel}}</span>
+      <span [ngClass]="{'text-red-dark':item?.uploadStatus === '4'}">{{item?.uploadStatusLabel}}</span>
     </ng-template>
     <ng-template st-row="verifyStatus" let-item>
-      <a (click)="viewResult(item)" *ngIf="item?.verifyStatus === '1'">1111{{item?.verifyStatusLabel}}</a>
-      <span *ngIf="item?.verifyStatus !== '1'">{{item?.verifyStatusLabel}}</span>
+      <a (click)="viewResult(item)" *ngIf="item?.verifyStatus === '2'">{{item?.verifyStatusLabel}}</a>
+      <span *ngIf="item?.verifyStatus === '1'">{{item?.verifyStatusLabel}}</span>
     </ng-template>
     <ng-template st-row="orderCode" let-item>
       <span class="text-blue-dark">{{item?.orderCode}}</span>
diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
index 8e772ccd..e6d1d68a 100644
--- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
@@ -241,7 +241,7 @@ export class DatatableFundReportingComponent implements OnInit {
       { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '120px' },
       { title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' },
       { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
-      { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '250px' },
+      { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' },
 
       { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '180px' },
       { title: '车队长', index: 'payee', className: 'text-center', width: '250px' },
@@ -450,4 +450,6 @@ export class DatatableFundReportingComponent implements OnInit {
     }
   }
 
+
+
 }
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 b03b7d1c..c500e2d0 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
@@ -7,8 +7,8 @@
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()" acl
-        [acl-ability]="['RiskOrder-Search']">查询</button>
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
+        acl [acl-ability]="['RiskOrder-Search']">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button (click)="resetSF()">导出</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -28,7 +28,7 @@
   <st #st [scroll]="{x:'1200px'}" [data]="service.$api_get_order_reporting_page" [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" >
+    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
     <ng-template st-row="orderCheckStatus" let-item let-index="index">
       <a (click)="viewAuditResult(item)"
         *ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
@@ -39,15 +39,14 @@
         *ngIf="item?.driverCheckStatus === '2'">{{filterStatus(item?.driverCheckStatus)}}</a>
       <span *ngIf="item?.driverCheckStatus !== '2'">{{filterStatus(item?.driverCheckStatus)}}</span>
     </ng-template>
-    <ng-template st-row="orderCheckStatus" let-item let-index="index">
-      <a (click)="viewAuditResult(item)"
-        *ngIf="item?.orderCheckStatus === '2'">{{filterStatus(item?.orderCheckStatus)}}</a>
-      <span *ngIf="item?.orderCheckStatus !== '2'">{{filterStatus(item?.orderCheckStatus)}}</span>
+    <ng-template st-row="carCheckStatus" let-item let-index="index">
+      <a (click)="viewAuditResult(item)" *ngIf="item?.carCheckStatus === '2'">{{filterStatus(item?.carCheckStatus)}}</a>
+      <span *ngIf="item?.carCheckStatus !== '2'">{{filterStatus(item?.carCheckStatus)}}</span>
     </ng-template>
 
     <ng-template st-row="checkStatus" let-item let-index="index">
-      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{filterStatus(item?.checkStatus)}}</a>
-      <span *ngIf="item?.billStatus !== '2'">{{filterStatus(item?.checkStatus)}}</span>
+      <a (click)="viewResult(item)" *ngIf="item?.billStatus === '2'">{{filterCheckStatus(item?.checkStatus)}}</a>
+      <span *ngIf="item?.billStatus !== '2'">{{filterCheckStatus(item?.checkStatus)}}</span>
     </ng-template>
     <ng-template st-row="billCode" let-item>
       <span class="text-red-dark">{{item?.billCode}}</span>
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 54ab6360..6d3fe302 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
@@ -276,7 +276,7 @@ export class DatatableOrderReportingComponent implements OnInit {
       { title: '订单状态', render: 'orderCheckStatus', className: 'text-center', width: '120px', },
       { title: '司机状态', render: 'driverCheckStatus', className: 'text-center', width: '120px', },
 
-      { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', },
+      { title: '车辆状态', render: 'carCheckStatus', className: 'text-center', width: '120px', },
 
       { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', },
       {
@@ -483,13 +483,27 @@ export class DatatableOrderReportingComponent implements OnInit {
     })
   }
 
-  filterStatus(status: string) {
+  filterStatus(status: number) {
     switch (status) {
-      case '0':
+      case 0:
         return '校验中';
-      case '1':
+      case 1:
         return '通过';
-      case '2':
+      case 2:
+        return '不通过';
+      default:
+        return '';
+
+    }
+  }
+
+  filterCheckStatus(status: number) {
+    switch (status) {
+      case 0:
+        return '校验中';
+      case 1:
+        return '通过';
+      case 2:
         return '不通过';
       default:
         return '';