From de44c746565e76ce84fb1216885127a20294d6be Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 12 Jan 2022 14:07:28 +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             |  1 +
 .../confir-receipt/confir-receipt.component.html  |  6 +++---
 .../confir-receipt/confir-receipt.component.ts    | 14 +-------------
 .../confir-receipt/confir-receipt.component.html  |  6 +++---
 .../confir-receipt/confir-receipt.component.ts    | 15 +--------------
 5 files changed, 9 insertions(+), 33 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 c0ef5cb5..10b86e1e 100644
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@@ -691,6 +691,7 @@ tabs = {
                 this.st?.reload(1);
                 this.initST();
               }
+              this.st?.reload(1);
             }),
         })
       }
diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
index 526df3c5..0e8c3c41 100644
--- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
+++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-22 18:53:54
+ * @LastEditTime: 2022-01-12 14:01: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\order-management\modal\bulk\update-freight\update-freight.component.html
@@ -50,10 +50,10 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
       <div>{{detailList?.price}} 元</div>
   </sv>
   <sv label="司机车辆">
-    <div>{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}</div>
+    <div>{{detailList?.driverName}} / {{detailList?.driverPhone}}/ {{detailList?.carNo}}</div>
 </sv>
 <sv label="收款人">
-  <div>{{payeeList?.nickName}} / {{payeeList?.telephone}}</div>
+  <div>{{detailList?.payeeName}} / {{detailList?.payeePhone}}</div>
 </sv>
 <sv label="回单凭证">
   <nz-upload
diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts
index 73f1279a..c09490a1 100644
--- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts
+++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts
@@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
 /*
  * @Author: your name
  * @Date: 2021-12-14 14:03:07
- * @LastEditTime: 2021-12-22 19:10:07
+ * @LastEditTime: 2022-01-12 14:01:08
  * @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
@@ -96,18 +96,6 @@ export class ConfirReceiptComponent implements OnInit {
         })
         });
         this.listImagUrls = arr;
-        this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.payeeId}).subscribe((res: any) => {
-          console.log(res)
-          this.payeeList = res;
-        })
-        this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.driverId}).subscribe((res: any) => {
-          console.log(res)
-          this.driverList = res;
-        })
-        this.service.request(this.service.$api_getCarLicenseByIds, {id: this.detailList?.carId}).subscribe((res: any) => {
-          console.log(res)
-          this.carList = res;
-        })
       })
   
     
diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
index 72dbeece..c270eac2 100644
--- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
+++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2021-12-21 14:34:16
+ * @LastEditTime: 2022-01-12 14:04:38
  * @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\vehicle\confir-receipt\confir-receipt.component.html
@@ -18,10 +18,10 @@
     <st #st [widthMode]="{ type: 'strict' }" [data]="costDetail" [columns]="columns" bordered="true" [page]="{ show: false }"></st>
   </sv>
   <sv label="司机车辆">
-    <div>{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}</div>
+    <div>{{dataInfo?.driverName}} / {{dataInfo?.driverPhone}}/ {{dataInfo?.carNo}}</div>
   </sv>
   <sv label="收款人">
-    <div>{{payeeList?.nickName}} / {{payeeList?.telephone}}</div>
+    <div>{{dataInfo?.payeeName}} / {{dataInfo?.payeePhone}}</div>
   </sv>
   <sv label="回单凭证">
     <nz-upload
diff --git a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
index cc8a3e4c..ed49cdde 100644
--- a/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-15 13:17:42
- * @LastEditTime: 2022-01-12 13:37:05
+ * @LastEditTime: 2022-01-12 14:01:00
  * @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\vehicle\confir-receipt\confir-receipt.component.ts
@@ -143,19 +143,6 @@ export class VehicleConfirReceiptComponent implements OnInit {
         })
         });
         this.listImagUrls = arr;
-        // this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => {
-        //   console.log(res)
-        //   this.payeeList = res;
-        // })
-        // this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => {
-        //   console.log(res)
-        //   this.driverList = res;
-        // })
-        // this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => {
-        //   console.log(res)
-        //   this.carList = res;
-        // })
-        console.log(cost)
         this.costDetail = [cost];
       })
   }