From 1a3091eb1e2803ec71340be895a1bd5ee4c45767 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 22 Dec 2021 11:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../routes/order-management/components/risk/risk.component.ts | 4 ++--
 .../waybill-management/components/bulk/bulk.component.ts      | 2 ++
 .../components/vehicle/vehicle.component.ts                   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts
index 65879813..a620e7f5 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -417,7 +417,7 @@ export class OrderManagementRiskComponent implements OnInit {
         this.isVisibleRE = false;
         this.st.reload()
       } else {
-        // this.service.msgSrv.error(res.msg);
+        this.service.msgSrv.error(res?.msg);
       }
     });
   }
@@ -446,7 +446,7 @@ export class OrderManagementRiskComponent implements OnInit {
         this.isVisibleRE = false;
         this.st.reload()
       } else {
-        this.service.msgSrv.error(res.msg);
+        this.service.msgSrv.error(res?.msg);
       }
     });
   }
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
index f745f629..f092e0ad 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -427,10 +427,12 @@ tabs = {
           {
             text: '确认发车',
             click: (_record) => this.sureDepart(_record),
+            iif: item => item.wayBillStatus == '2' ,
           },
           {
             text: '确认到车',
             click: (_record) => this.sureArrive(_record),
+            iif: item => item.wayBillStatus == '3'  ,
           },
         ],
       },
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index 75b6f1ec..02650fd7 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -338,10 +338,12 @@ tabs = {
           {
             text: '确认发车',
             click: (_record) => this.sureDepart(_record),
+            iif: item => item.wayBillStatus == '2' ,
           },
           {
             text: '确认到车',
             click: (_record) => this.sureArrive(_record),
+            iif: item => item.wayBillStatus == '3'  ,
           },
         ],
       },