From 870a2119d8da45b397db87c58b7dffeb51b9f95e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 22 Dec 2021 10:23:10 +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

---
 .../components/bulk/bulk.component.html          |  4 ++--
 .../components/bulk/bulk.component.ts            | 10 ++++++++++
 .../components/vehicle/vehicle.component.ts      | 16 +++++++++++++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html
index c493cfbb..782ee6ca 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.html
+++ b/src/app/routes/order-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-22 10:09:02
+ * @LastEditTime: 2021-12-22 10:10:22
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@@ -63,7 +63,7 @@
     <ng-template st-row="billCode" let-item let-index="index">
       <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a>
       <div>
-        <span>{{item?.billStatusLabel}}99999</span>
+        <span>{{item?.billStatusLabel}}</span>
       </div>
     </ng-template>
     <ng-template st-row="goodsName" let-item let-index="index">
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 5c6ffe4f..1942830e 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -432,22 +432,32 @@ tabs = {
           {
             text: '查看评价',
             click: (_record) => this.viewEvaluate(_record),
+            iif: item => item.billStatus == '5',
           },
           {
             text: '运费变更记录',
             click: (_record) => this.OpenPrice(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 
           },
           {
             text: '变更运费',
             click: (_record) => this.updateFreight(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
           {
             text: '确认签收',
             click: (_record) => this.confirmReceipt(_record),
+            iif: item => item.billStatus == '4',
           },
           {
             text: '取消订单',
             click: (_record) => this.cancellation(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
+          },
+          {
+            text: '修改订单',
+            click: (_record) => this.cancellation(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
         ],
       },
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 88deb548..d5fef683 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -374,23 +374,37 @@ resourceStatus: any;
           {
             text: '查看评价',
             click: (_record) => this.viewEvaluate(_record),
+            iif: item => item.billStatus == '5',
           },
           {
             text: '运费变更记录',
             click: (_record) => this.OpenPrice(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', 
           },
           {
             text: '变更运费',
             click: (_record) => this.updateFreight(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
           {
             text: '确认签收',
             click: (_record) => this.confirmReceipt(_record),
+            iif: item => item.billStatus == '4',
           },
           {
             text: '取消订单',
             click: (_record) => this.cancellation(_record),
-            iif: item => item.externalSn === '1' || item.externalSn === 1,
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1',
+          },
+          {
+            text: '修改订单',
+            click: (_record) => this.cancellation(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
+          },
+          {
+            text: '查看轨迹',
+            click: (_record) => this.cancellation(_record),
+            iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
           },
           
         ],