From 3cdd46cdced79935724accbdf5753e2fc4d246dd 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: Fri, 8 Apr 2022 13:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fund-reporting.component.ts               | 23 +++++++++++++------
 .../order-reporting.component.ts              |  3 +++
 2 files changed, 19 insertions(+), 7 deletions(-)

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 c62fca11..fa7ecd77 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
@@ -146,11 +146,16 @@ export class DatatableFundReportingComponent implements OnInit {
         uploadStatus: {
           title: '上传状态',
           type: 'string',
+          default: 0,
+          enum: [
+            { label: '待上传', value: 0 },
+            { label: '已上传', value: 1 },
+            { label: '异常', value: 2 }
+          ],
           ui: {
             placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
+            widget: 'select',
+            allowClear: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -159,11 +164,15 @@ export class DatatableFundReportingComponent implements OnInit {
         verifyStatus: {
           title: '本地校验',
           type: 'string',
+          enum: [
+            { label: '校验中', value: 0 },
+            { label: '通过', value: 1 },
+            { label: '不通过', value: 2 }
+          ],
           ui: {
             placeholder: '请选择',
-            widget: 'dict-select',
-            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
+            allowClear: true,
+            widget: 'select',
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -242,7 +251,7 @@ export class DatatableFundReportingComponent implements OnInit {
       { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' },
       { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' },
 
-      { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '150px' },
+      { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' },
       { title: '车队长', index: 'payee', className: 'text-center', width: '150px' },
       { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' },
 
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 b3ad4682..e10847f0 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
@@ -149,6 +149,7 @@ export class DatatableOrderReportingComponent implements OnInit {
         putStatus: {
           title: '上传状态',
           type: 'string',
+          default: 0,
           enum: [
             { label: '待上传', value: 0 },
             { label: '已上传', value: 1 },
@@ -158,6 +159,7 @@ export class DatatableOrderReportingComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
+            allowClear: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },
@@ -174,6 +176,7 @@ export class DatatableOrderReportingComponent implements OnInit {
           ui: {
             placeholder: '请选择',
             widget: 'select',
+            allowClear: true,
             visibleIf: {
               _$expand: (value: boolean) => value,
             },