From 3929eb58cfe204d6f8101e77dd73bf5ad6c6d74f Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 5 May 2022 17:32:41 +0800
Subject: [PATCH] fix bug

---
 .../fund-reporting/fund-reporting.component.ts        |  8 ++++++--
 .../order-reporting/order-reporting.component.ts      |  8 ++++++--
 .../components/index/partner-list.component.ts        | 11 +++++++----
 3 files changed, 19 insertions(+), 8 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 0ccfd57d..55fb8aa8 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
@@ -468,8 +468,10 @@ export class DatatableFundReportingComponent implements OnInit {
   routeToOrder(item: any) {
     if (item.orderType === '1') {
       window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
-    } else {
+    } else if (item.orderType === '2') {
       window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
+    } else if (item.orderType === '3'){
+      this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.orderId]);
     }
   }
 
@@ -477,9 +479,11 @@ export class DatatableFundReportingComponent implements OnInit {
     if (item.orderType === '1') {
       window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`);
 
-    } else {
+    } else if (item.orderType === '2') {
       window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`);
 
+    } else if (item.orderType === '3') {
+      window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`);
     }
   }
 
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 9e87d018..a01eefb1 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
@@ -599,8 +599,10 @@ export class DatatableOrderReportingComponent implements OnInit {
   routeToOrder(item: any) {
     if (item.billType === '1') {
       window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
-    } else {
+    } else  if (item.billType === '2') {
       window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
+    } else  if (item.billType === '3') {
+      window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
     }
   }
 
@@ -608,8 +610,10 @@ export class DatatableOrderReportingComponent implements OnInit {
     if (item.billType === '1') {
       window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
 
-    } else {
+    } else if (item.billType === '2') {
       window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
+    } else if (item.billType === '3') {
+      window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
 
     }
   }
diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
index 31081842..0bc0d204 100644
--- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
+++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts
@@ -281,10 +281,13 @@ export class PartnerListComponent {
         approvalStatus: {
           type: 'string',
           title: '认证审核状态',
+          enum: [
+            { value: '', label: '全部' },
+            { value: 1, label: '企业' },
+            { value: 2, label: '个人' }
+          ],
           ui: {
-            widget: 'dict-select',
-            containsAllLabel: true,
-            params: { dictKey: 'pay:mode' },
+            widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
@@ -350,7 +353,7 @@ export class PartnerListComponent {
           title: '合伙人状态',
           enum: [
             { value: '', label: '全部' },
-            { value: 0, label: '启用' },
+            { value: 0, label: '正常' },
             { value: 1, label: '冻结' }
           ],
           ui: {