From 9bc65559a10a47bbf29b9dea042c0acac5c5929b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 4 Mar 2022 13:53:09 +0800
Subject: [PATCH] fix bug

---
 .../bulk-detail-change/bulk-detail-change.component.html   | 7 ++++---
 .../bulk-detail-change/bulk-detail-change.component.ts     | 6 +++---
 .../components/bulk-detail/bulk-detail.component.ts        | 2 --
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index 0e98b137..f2a6e57e 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 13:33:51
+ * @LastEditTime : 2022-03-04 13:53:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -262,8 +262,9 @@
 </nz-card>
 
 <nz-card nzTitle="运费信息" #distannce3>
-  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）</h2>
-  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
+  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index 8569a071..ffe86843 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 13:26:50
+ * @LastEditTime : 2022-03-04 13:53:04
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -66,6 +66,7 @@ loadTime: any; // 货源单设置回显
   @ViewChild('sf4', { static: false }) sf4!: SFComponent;
   schema4: SFSchema = {};
   isVisible = false;
+  billExpenses: any[] = []; //运费信息表格信息
   ui4!: SFUISchema;
   formData: any;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
@@ -319,8 +320,7 @@ loadTime: any; // 货源单设置回显
     this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => {
       if (res) {
         this.i = res;
-        this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0];
-        this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+        this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
         // 对装货凭证进行初始化
         let arr : any= []
         res?.receiptFilePath.forEach((element: any, index: any) => {
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
index 69355b52..56d51e8b 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
@@ -71,9 +71,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
     this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
       if (res) {
         this.i = res;
-        console.log(this.i.billExpenseDetails )
         this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
-        console.log(this.billExpenses )
         this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
       }
     });