From 67f1c84f7e01bad2d265051bfa391cf0fd8fb8cc 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, 11 Apr 2022 10:49:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/order-reporting/order-reporting.component.html | 2 +-
 .../components/order-reporting/order-reporting.component.ts   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
index 780962ea..df751a97 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@@ -56,7 +56,7 @@
     </ng-template>
 
     <ng-template st-row="freightAmount" let-item let-index="index">
-      <div class="text-right">{{item?.freightAmount | currency :' '}}</div>
+      <div class="text-right">{{item?.freightAmount | currency }}</div>
     </ng-template>
     <ng-template st-row="goodsInfoList" let-item let-index="index">
       <div *ngFor="let _item of item?.goodsInfoList">
diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
index e0a604ac..fb343fa0 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
@@ -306,7 +306,7 @@ export class DatatableOrderReportingComponent implements OnInit {
       { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' },
       { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' },
       { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' },
-      { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' },
+      { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '100px' },
       { title: '车牌号', index: 'carNo', className: 'text-center', width: '150px' },
       {
         title: '车牌颜色',
@@ -518,7 +518,7 @@ export class DatatableOrderReportingComponent implements OnInit {
   * 异步导出
   */
   export() {
-    this.service.exportStart({...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order);
+    this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order);
   }
 
   openWainingModal(content: string, title = '提示') {

From 2f7c9dcdb5eeb051d3a97617227397f9a5dd76ec Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Mon, 11 Apr 2022 11:10:18 +0800
Subject: [PATCH 2/2] fix bug

---
 .../vehicle/cancel-confirm/cancel-confirm.component.html      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
index a609acaf..d6326ce7 100644
--- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
+++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-22 13:53:29
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-28 13:35:23
+ * @LastEditTime : 2022-04-11 11:09:25
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel-confirm\\cancel-confirm.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -15,7 +15,7 @@
   <sv label="司机">
     <div>{{ i.driverName }} / {{ i.driverPhone }} / {{ i.carNo }}</div>
   </sv>
-  <sv label="收款人">
+  <sv label="车队长" *ngIf ="i?.payeePhone && i?.payeePhone !== i?.driverPhone">
     <div>{{ i.payeeName }} / {{ i.payeePhone }}</div>
   </sv>
   <sv label="退款金额">