From 29a18967c90a3f8656923079e5f97c31e425f919 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 8 Mar 2022 13:22:17 +0800
Subject: [PATCH] fix bug

---
 .../modify-rate/modify-rate.component.html    | 20 ++++++++++++-------
 .../modify-rate/modify-rate.component.ts      | 13 ++++++++----
 .../services/order-management.service.ts      |  5 ++++-
 .../bulk-detail/bulk-detail.component.html    |  2 +-
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
index fa6106e2..ad382091 100644
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
@@ -4,20 +4,26 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 14:51:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-10 10:19:34
+ * @LastEditTime : 2022-03-08 13:21:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <nz-alert nzType="info" [nzMessage]="'已选择'+ data?.ids?.length + '条订单'" nzShowIcon></nz-alert>
 <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 
-<st #st [data]="service.$api_getChangeRecordWholeDetail" [columns]="columns"
-[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams}"
-[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-[page]="{}"
+<st #st [data]="service.$api_searchAdditionalRateBatch" [columns]="columns"
+[req]="{ method: 'POST',params: reqParams}"
+[res]="{ reName: { list: 'data' } }"
+[page]="{show: false,showSize: false,front: false}"
 >
-<ng-template st-row="operator" let-item>
-  {{item?.operator}}/{{item.telephone}}
+<ng-template st-row="oldAdditionalRate" let-item>
+  {{ item?.oldAdditionalRate? (item?.oldAdditionalRate * 100).toFixed(2) + '%' : ''}}
+</ng-template>
+<ng-template st-row="oldSurcharge" let-item>
+  {{ item?.oldSurcharge | currency}}
+</ng-template>
+<ng-template st-row="newSurcharge" let-item>
+  {{ item?.newSurcharge | currency}}
 </ng-template>
 </st>
 <div class="modal-footer">
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
index 2a3c201b..3c3fa764 100644
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 14:51:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-04 14:45:58
+ * @LastEditTime : 2022-03-08 13:21:59
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -26,9 +26,10 @@ export class VehicleModifyRateComponent implements OnInit {
   schema: SFSchema = {};
   ui: SFUISchema = {};
   columns: STColumn[] = [
-    { title: '内容', index: 'operationContent' },
-    { title: '操作人', index: 'operator' },
-    { title: '操作时间', index: 'operatorTimestamp' },
+    { title: '订单号', index: 'billCode' },
+    { title: '原附加费率', render: 'oldAdditionalRate' },
+    { title: '原附加费', render: 'oldSurcharge' },
+    { title: '新附加费', render: 'newSurcharge' },
   ];
   aggreechecked = false;
 
@@ -40,11 +41,15 @@ export class VehicleModifyRateComponent implements OnInit {
   ngOnInit(): void {
     console.log(this.data);
     this.initSF();
+    console.log(this.data?.ids)
   }
   get reqParams() {
+
     return { 
       // operateObject: this.i?.resourceCode,
       // operateType: 4,
+      ids: this.data?.ids,
+      additionalRate: this.sf?.value?.additionalRate || 0
      };
   }
   initSF() {
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index b426ad03..1c1ba18b 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-01 19:21:53
+ * @LastEditTime : 2022-03-08 09:27:47
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -158,6 +158,9 @@ export class OrderManagementService extends ShipperBaseService {
     // 保存订单退款申请表
   public $api_billRefundApplication_save = '/api/fcc/billRefundApplication/save';
 
+    // 批量修改费率-实时查看附加费
+  public $api_searchAdditionalRateBatch = '/api/sdc/billOperate/searchAdditionalRateBatch';
+
 
 
 
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 87af10ed..411cb93b 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -209,7 +209,7 @@
       <div nz-row>
         <div nz-col [nzSpan]="12">
           <st [scroll]="{y: '500px'}" #st [data]="addressItems" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st>
+    </st> 
         </div>
         <div nz-col [nzSpan]="12">
           <amap-path-simplifier [mapWidth]="'100%'" [mapHeight]="'600px'" [MapList]="MapList"></amap-path-simplifier>