From c914ee023ed613ac3a1066b4db01cf54bc5dffc1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 22 Dec 2021 20:14:59 +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.ts         |  2 +-
 .../components/vehicle/vehicle.component.ts   | 11 +++++-
 .../update-freight.component.html             |  2 +-
 .../update-freight.component.ts               | 39 +++++++++++++++----
 .../services/order-management.service.ts      |  9 ++++-
 5 files changed, 51 insertions(+), 12 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 abd3da68..967c079b 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -633,7 +633,7 @@ tabs = {
           nzTitle: '变更运费',
           nzWidth: 580,
           nzContent: UpdateFreightComponent,
-          nzComponentParams: { data },
+          nzComponentParams: { data: { ...data, billId: item.id } },
           nzOnOk: sin => {
             this.service.request(this.service.$api_insertFreightChangeBulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
               if (res) {
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 9ee1cf34..db830dc4 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -585,7 +585,16 @@ resourceStatus: any;
           nzWidth: 580,
           nzContent: VehicleUpdateFreightComponent,
           nzComponentParams: { data: { ...data, id: item.id } },
-          nzFooter: null
+          nzOnOk: sin => {
+            this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+              if (res) {
+                this.service.msgSrv.success('变更运费成功');
+                modal.destroy();
+                this.st.reload();
+              }
+            });
+            return false;
+          }
         });
         modal.afterClose.subscribe(_ => this.st.reload());
       }
diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
index afb0cecd..8770c6cf 100644
--- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
+++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-21 15:03:17
+ * @LastEditTime: 2021-12-22 20:04:15
  * @LastEditors: your name
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.html
diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
index 8cfab1a7..15e1f9d6 100644
--- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
+++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-14 15:16:27
+ * @LastEditTime: 2021-12-22 20:08:13
  * @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\order-management\modal\bulk\update-freight\update-freight.component.ts
@@ -12,6 +12,8 @@ import {
   SFSelectWidgetSchema,
   SFStringWidgetSchema, SFTextWidgetSchema
 } from '@delon/form';
+import { Subscription } from 'rxjs';
+import { OrderManagementService } from '../../../services/order-management.service';
 
 @Component({
   selector: 'app-order-management-update-freight',
@@ -25,7 +27,8 @@ export class UpdateFreightComponent implements OnInit {
   @Input()
   data: any;
 
-  constructor() {}
+  calculateSub!: Subscription;
+  constructor(private service: OrderManagementService) {}
 
   ngOnInit(): void {
     this.schema = this.initSF(this.data);
@@ -48,7 +51,8 @@ export class UpdateFreightComponent implements OnInit {
                 placeholder: '请输入',
                 grid: {
                   span: 12
-                }
+                },
+                change: (val: any) => this.changeNumVal()
               } as SFStringWidgetSchema,
               default: data.freightPrice
             },
@@ -106,7 +110,8 @@ export class UpdateFreightComponent implements OnInit {
                 grid: {
                   span: 12
                 },
-                hideStep: true
+                hideStep: true,
+                change: (val: any) => this.changeNumVal()
               } as SFNumberWidgetSchema
             },
             acceptVolume: {
@@ -119,7 +124,8 @@ export class UpdateFreightComponent implements OnInit {
                 grid: {
                   span: 12
                 },
-                hideStep: true
+                hideStep: true,
+                change: (val: any) => this.changeNumVal()
               } as SFNumberWidgetSchema
             },
             settlementWeight: {
@@ -132,7 +138,8 @@ export class UpdateFreightComponent implements OnInit {
                 grid: {
                   span: 12
                 },
-                hideStep: true
+                hideStep: true,
+                change: (val: any) => this.changeNumVal()
               } as SFNumberWidgetSchema
             },
             settlementVolume: {
@@ -145,7 +152,8 @@ export class UpdateFreightComponent implements OnInit {
                 grid: {
                   span: 12
                 },
-                hideStep: true
+                hideStep: true,
+                change: (val: any) => this.changeNumVal()
               } as SFNumberWidgetSchema
             }
           },
@@ -169,4 +177,21 @@ export class UpdateFreightComponent implements OnInit {
       }
     };
   }
+
+  changeNumVal() {
+    if (this.calculateSub) {
+      this.calculateSub.unsubscribe();
+    }
+    this.calculateSub = this.service
+      .request(this.service.$api_calculate_cost, { billId: this.data.billId, ...this.sf.value, changeCause: '' })
+      .subscribe((res: any) => {
+        if (res) {
+          Object.assign(this.data, {
+            totalFreight: res.totalFreight,
+            freight: res.freight,
+            surcharge: res.surcharge
+          });
+        }
+      });
+  }
 }
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 322ef5c0..d6be72b8 100644
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-22 10:09:37
+ * @LastEditTime: 2021-12-22 20:06:45
  * @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\order-management\services\order-management.service.ts
@@ -81,7 +81,12 @@ export class OrderManagementService extends BaseService {
   public $api_getChangeRecordBulkDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordBulkDetail`;
   // 查看运费变更记录详情-整车
   public $api_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`;
-
+  //运费变更申请计算费用-大宗
+  $api_calculate_cost = `/api/sdc/billFreightChangeApplication/getBulkSurchargeDetail`;
+  //运费变更申请计算费用-大宗
+  $api_getWholeSurchargeDetail = `/api/sdc/billFreightChangeApplication/getWholeSurchargeDetail`;
+   //运费变更申请-大宗
+   $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
   constructor(public injector: Injector) {
     super(injector)
   }