From 6339e3359abe6f8ae3d203991c9065cb02dc6f9e Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 24 Dec 2021 15:11:49 +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

---
 .../vehicle-detail-change.component.html      | 18 +++----
 .../vehicle-detail-change.component.ts        | 47 +++++++++++++++----
 .../services/order-management.service.ts      | 10 ++--
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
index 5ad7a904..c00d5ea7 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-24 14:13:00
+ * @LastEditTime: 2021-12-24 15:11:30
  * @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\components\vehicle-detail\vehicle-detail.component.html
@@ -117,9 +117,9 @@
                 <span  style="padding: 0 10px"
                   ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
                 ></span>
-                <span 
+                <!-- <span 
                   ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
-                ></span>
+                ></span> -->
               </div>
             </nz-form-control>
           </nz-form-item>
@@ -133,10 +133,10 @@
             </nz-form-control>
           </nz-form-item>
         </div>
-        <button  nz-button nzType="primary" (click)="addStartInfo($event)">
+        <!-- <button  nz-button nzType="primary" (click)="addStartInfo($event)">
           <i nz-icon nzType="plus"></i>
           添加装货地
-        </button>
+        </button> -->
       </div>
       <div nz-col [nzSpan]="8">
         <div style="display: flex; justify-content: center">
@@ -159,9 +159,9 @@
                   />
                 </nz-input-group>
                 <span  style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
-                <span 
+                <!-- <span 
                   ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
-                ></span>
+                ></span> -->
               </div>
             </nz-form-control>
           </nz-form-item>
@@ -175,10 +175,10 @@
             </nz-form-control>
           </nz-form-item>
         </div>
-        <button  nz-button nzType="primary" (click)="addEndInfo($event)">
+        <!-- <button  nz-button nzType="primary" (click)="addEndInfo($event)">
           <i nz-icon nzType="plus"></i>
           添加卸货地
-        </button>
+        </button> -->
       </div>
     </div>
     <div  nz-row [nzGutter]="24" style="margin-top: 24px">
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
index 12bb2ff9..1a9b7416 100644
--- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
@@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-24 14:31:53
+ * @LastEditTime: 2021-12-24 14:59: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\components\vehicle-detail\vehicle-detail.component.ts
@@ -284,7 +284,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     };
   }
   initData() {
-    this.service.request(this.service.$api_get_getWholeBillDetail, {id: this.id}).subscribe(res => {
+    this.service.request(this.service.$api_set_getWholeOrderDetail, {id: this.id}).subscribe(res => {
       console.log(res)
       if (res) {
         this.i = res;
@@ -339,9 +339,31 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           }
         });
         // 对装货凭证进行初始化
-        if (res.unloadingLadingBillFilePath) {
+        if (res.loadingLadingBillFilePath) {
           this.formData = {
             loadingLadingBillFilePath: [
+              {
+                uid: 'logo',
+                name: 'LOGO',
+                status: 'done',
+                url: res.loadingLadingBillFilePath,
+                response: {
+                  url: res.loadingLadingBillFilePath,
+                },
+              },
+        ],
+        loadingPeopleVehiclesGoodsFilePath: [
+              {
+                uid: 'logo',
+                name: 'LOGO',
+                status: 'done',
+                url: res.loadingPeopleVehiclesGoodsFilePath,
+                response: {
+                  url: res.loadingPeopleVehiclesGoodsFilePath,
+                },
+              },
+        ],
+        unloadingLadingBillFilePath: [
               {
                 uid: 'logo',
                 name: 'LOGO',
@@ -352,7 +374,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
                 },
               },
         ],
-            loadingPeopleVehiclesGoodsFilePath: [
+        unloadingPeopleVehiclesGoodsFilePath: [
               {
                 uid: 'logo',
                 name: 'LOGO',
@@ -365,6 +387,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
         ],
           };
         }
+        // 发车时间到车时间初始化
+        this.loadingTime = res.loadingTime
+        this.loadingTime = res.unloadTime
       }
     })
   }
@@ -396,6 +421,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     }
     console.log(this.sf3.value)
     console.log(this.sf4.value)
+    console.log(this.sf.value)
     const params = {
       id: this.id,
       unLoadingPlaceList: [...this.startInfo, ...this.endInfo,], 
@@ -418,13 +444,16 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       loadPlanTime: this.loadingTime,
       // 到车时间
       unloadPlanTime: this.loadingTime,
-      loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath.data.fullFilePath,
-      loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
-      unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath,
-      unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath,
+      loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
+
+      loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
+
+      unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath : this.sf.value?.unloadingLadingBillFilePath?.url,
+
+      unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url,
     }
     console.log(params)
-    this.service.request(this.service.$api_set_getWholeOrderDetail, params).subscribe((res: any) => {
+    this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => {
       console.log(res)
     })
   }
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 82b44c4f..49eaf6f6 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-23 20:49:05
+ * @LastEditTime: 2021-12-24 14:43: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\services\order-management.service.ts
@@ -91,10 +91,14 @@ export class OrderManagementService extends BaseService {
    $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
      // 删除装卸货信息
   $api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`;
-     // 修改-大宗订单详情
-  $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
+     // 修改-大宗订单
+  $api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`;
+     // 修改-整车订单
+  $api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`;
      // 修改-整车订单详情
   $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`;
+     // 修改--大宗订单详情
+  $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
   constructor(public injector: Injector) {
     super(injector)
   }