From d55e607d555db17af5d3c275e5ae3a4f0a89c30e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 25 Jan 2022 14:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.ts               |  3 +++
 .../components/risk/risk.component.ts               | 13 ++++++++++++-
 .../components/bulk/bulk.component.ts               |  4 ----
 .../components/vehicle/vehicle.component.ts         |  4 ----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts
index 8e449949..e7032e97 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -624,6 +624,9 @@ export class OrderManagementBulkComponent implements OnInit {
    */
   viewEvaluate(item: any) {
     this.isVisibleEvaluate = true;
+    this.service.request(this.service.$api_getChangeRecordBulkDetail, { id: item.id }).subscribe(res => {
+      this.ViewCause = res;
+    });
   }
   /**
    *变更运费
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 768b0740..774ad548 100644
--- a/src/app/routes/order-management/components/risk/risk.component.ts
+++ b/src/app/routes/order-management/components/risk/risk.component.ts
@@ -1,3 +1,4 @@
+import { registerLocaleData } from '@angular/common';
 import { Router } from '@angular/router';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
@@ -448,6 +449,10 @@ export class OrderManagementRiskComponent implements OnInit {
     } else {
       idList.push(this.sfView.value.billCode)
     }
+    if(!this.sfView.value.representationsCause) {
+      this.service.msgSrv.error('拒绝原因为空！');
+      return;
+    }
     const parms = {
       ids: idList,
       auditRemark: this.sfView.value.representationsCause,
@@ -466,12 +471,18 @@ export class OrderManagementRiskComponent implements OnInit {
    *审核
    */
   audit(item?: any) {
-    this.isVisibleRE = true;
     if (item) {
       this.auditId = item.id;
       this.initSTAudit(1);
+       this.isVisibleRE = true;
     } else {
+      if(this.selectedRows.length <= 0) {
+        this.service.msgSrv.error('请选择订单！')
+        return;
+      } else {
       this.initSTAudit(2);
+      this.isVisibleRE = true;
+      }
     }
   }
   /**
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 395f9cf6..7f7c1c1f 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts
@@ -312,10 +312,6 @@ tabs = {
         width: '110px',
         className: 'text-left',
         buttons: [
-          {
-            text: '查看评价',
-            click: (_record) => this.viewEvaluate(_record),
-          },
           {
             text: '确认发车',
             click: (_record) => this.sureDepart(_record),
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 a0f2caba..a0243691 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -313,10 +313,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
         width: '110px',
         className: 'text-left',
         buttons: [
-          {
-            text: '查看评价',
-            click: _record => this.viewEvaluate(_record)
-          },
           {
             text: '确认发车',
             click: _record => this.sureDepart(_record),