From c83c1e7a8e2eaa5356d0a47ec2af7ff5d5e2f076 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 6 Jan 2022 14:57:46 +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

---
 .../assigned-car/assigned-car.component.html    |  8 ++++++++
 .../assigned-car/assigned-car.component.ts      |  2 +-
 .../vehicle-detail/vehicle-detail.component.ts  | 13 +++++--------
 .../components/vehicle/vehicle.component.ts     | 17 ++++++++++-------
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
index ec9bc1ca..d7f2f471 100644
--- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
+++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.html
@@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-03 11:10:14
+ * @LastEditTime: 2022-01-06 14:55:47
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\assigned-car\assigned-car.component.html
+-->
 <div>
   <div nz-row>
     <div nz-col nzSpan="18">
diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
index adde5b77..da0b8757 100644
--- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
+++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts
@@ -117,7 +117,7 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit {
     if (this.selectedRows) {
       const { carId, appUserId: driverId, captainAppUserId: carCaptainId } = this.selectedRows;
       const params: any = { carId, driverId, carCaptainId };
-      this.service.request(this.service.$api_save_assign_bulk, { ...params, ...this.params }).subscribe((res: any) => {
+      this.service.request(this.url, { ...params, ...this.params }).subscribe((res: any) => {
         if (res) {
           this.modal.close(res);
         }
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
index da8237a1..a1529c26 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -143,21 +143,18 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
   /**
  * 重新指派
  */
-  assignedCar(item: any) {
-    const { resourceId } = item;
+   assignedCar(item: any) {
     const modalRef = this.modal.create({
       nzTitle: '指派熟车',
       nzWidth: '1200px',
-      nzContent:   SupplyManagementVehicleAssignedCarComponent,
+      nzContent: SupplyManagementVehicleAssignedCarComponent,
       nzComponentParams: {
         i: item,
-        status: 'anew',
-        url: this.service.$api_save_assign_vehicle,
-        params: { resourceId }
       },
-      nzFooter: null
+      nzFooter: null,
+
     });
-    modalRef.afterClose.subscribe(result => {
+    modalRef.afterClose.subscribe((result) => {
       if (result) {
         this.getGoodsSourceDetail();
       }
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 43fc8e88..bcbd8c05 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -157,27 +157,30 @@ export class SupplyManagementVehicleComponent implements OnInit {
   /**
    * 重新指派
    */
-  assignedCar(item: any) {
-    const { resourceId } = item;
+  /**
+  * 重新指派
+  */
+   assignedCar(item: any) {
+    const { id } = item;
     const modalRef = this.modal.create({
       nzTitle: '指派熟车',
       nzWidth: '1200px',
-      nzContent:   SupplyManagementVehicleAssignedCarComponent,
+      nzContent: SupplyManagementVehicleAssignedCarComponent,
       nzComponentParams: {
         i: item,
         status: 'anew',
+        params: { id },
         url: this.service.$api_save_assign_vehicle,
-        params: { resourceId }
       },
-      nzFooter: null
+      nzFooter: null,
+
     });
-    modalRef.afterClose.subscribe(result => {
+    modalRef.afterClose.subscribe((result) => {
       if (result) {
         this.st.reload();
       }
     });
   }
-
   /**
    * 审核
    */