From 73b7bd66a97ddb8705ac44c29b3993bc2e2495da Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 13 Jan 2022 14:17:07 +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/vehicle/vehicle.component.html          | 10 +++++-----
 .../components/vehicle/vehicle.component.ts            |  6 ------
 .../vehicle/update-freight/update-freight.component.ts |  2 +-
 .../services/order-management.service.ts               |  4 ++--
 4 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.html b/src/app/routes/order-management/components/vehicle/vehicle.component.html
index b32e9076..a6bea7a6 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-13 13:45:24
+ * @LastEditTime: 2022-01-13 14:14:33
  * @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
@@ -141,7 +141,7 @@
 </nz-card>
 
 
-<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
+<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录"  (nzOnCancel)="handleCancel('0')">
   <ng-container *nzModalContent>
     <st
     #stFloat
@@ -166,7 +166,7 @@
 </nz-modal>
 
 
-<nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
+<nz-modal [(nzVisible)]="isVisibleView"  [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看"  (nzOnCancel)="handleCancel('1')">
   <ng-container *nzModalContent>
     <st
     #stFloatView
@@ -189,7 +189,7 @@
   </ng-template>
 </nz-modal>
 
-<nz-modal [(nzVisible)]="isVisibleEvaluate"  [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate"  (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('2')">
+<nz-modal [(nzVisible)]="isVisibleEvaluate"  [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate"   (nzOnCancel)="handleCancel('2')">
   <ng-container *nzModalContent>
     <nz-tabset>
       <nz-tab nzTitle="我的评价">
@@ -207,7 +207,7 @@
   </ng-container>
   <ng-template #nzModalFooterEvaluate>
     <button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
-    <button nz-button nzType="primary" (click)="handleOK()">确定</button>
+    <button nz-button nzType="primary" (click)="handleCancel('2')">确定</button>
   </ng-template>
 </nz-modal>
 <ng-template #extraTemplate>
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 f20bc574..39e7d9c8 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -588,12 +588,6 @@ resourceStatus: any;
     console.log(type)
       this.isVisibleEvaluate = false
     }
-  }
-    /**
-  * 审核通过按钮
-  */
-  handleOK() {
-    
   }
   OpenPrice(value: any) {
     console.log(value)
diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
index 48b51512..925c3e03 100644
--- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
@@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2022-01-13 13:38:13
+ * @LastEditTime: 2022-01-13 14:08:56
  * @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
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 30ac45d8..27762d94 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: 2022-01-06 09:27:56
+ * @LastEditTime: 2022-01-13 14:08:57
  * @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
@@ -87,7 +87,7 @@ export class OrderManagementService extends ShipperBaseService {
   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`;