From 181d85c7ebd5eca34de8b777cb9427bb254c324c 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: Mon, 18 Apr 2022 09:22:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E8=BF=90=E8=B4=B9=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/bulk/bulk.component.ts         | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 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 e4944856..6504791e 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -60,7 +60,7 @@ export class OrderManagementBulkComponent implements OnInit {
     public shipperservice: ShipperBaseService,
     private router: Router,
     private ar: ActivatedRoute,
-  ) {}
+  ) { }
 
   /**
    * 查询参数
@@ -108,7 +108,7 @@ export class OrderManagementBulkComponent implements OnInit {
     this.loading = false
     return data.map(item => ({
       ...item,
-      disabled: item.billStatus !== '4' 
+      disabled: item.billStatus !== '4'
     }));
   };
   get selectedRows() {
@@ -185,14 +185,14 @@ export class OrderManagementBulkComponent implements OnInit {
           type: 'string',
           title: '订单号',
           ui: {
-          placeholder: '最多100个单号，空号隔开',
+            placeholder: '最多100个单号，空号隔开',
           }
         },
         wayBillCode: {
           type: 'string',
           title: '运单号',
           ui: {
-          placeholder: '最多100个单号，空号隔开',
+            placeholder: '最多100个单号，空号隔开',
           }
         },
         resourceCode: {
@@ -212,7 +212,7 @@ export class OrderManagementBulkComponent implements OnInit {
               _$expand: (value: boolean) => value
             },
             onSearch: (q: any) => {
-              let str =q.replace(/^\s+|\s+$/g,"");
+              let str = q.replace(/^\s+|\s+$/g, "");
               if (str) {
                 return this.service
                   .request(this.service.$api_enterpriceList, { enterpriseName: str })
@@ -469,7 +469,7 @@ export class OrderManagementBulkComponent implements OnInit {
         width: '180px',
         className: 'text-left',
         format: (item: any) =>
-        `${item?.goodsName}/
+          `${item?.goodsName}/
         ${item?.weight || '0'}吨/
         ${item?.volume || '0'}方/
         ${item?.goodsNumber || '0'}件`
@@ -559,7 +559,10 @@ export class OrderManagementBulkComponent implements OnInit {
           {
             text: '变更运费',
             click: _record => this.updateFreight(_record),
-            iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
+            iif: _record => {
+              const flag = _record.mybidDetailInfo.find((item: any) => item?.expenseCode === 'TRA' && item?.paymentStatus === '4');
+              return _record.billStatus !== '1' && _record.billStatus !== '6' && !flag;
+            },
             acl: { ability: ['ORDER-BULK-FreightChangeBulkDetail'] },
           },
           {
@@ -857,6 +860,6 @@ export class OrderManagementBulkComponent implements OnInit {
   }
   // 导出
   exprot() {
-    this.service.exportStart({ ...this.reqParams, pageSize: -1 },this.service.$api_get_asyncExportBulkList);
+    this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportBulkList);
   }
 }