From 120e12c246aad1a2190e8697b094160e65918e51 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 16:27:40 +0800
Subject: [PATCH 1/8] fix bug

---
 .../vehicle-detail.component.html               | 17 +++++++++++++++--
 .../bulk-detail/bulk-detail.component.html      |  2 +-
 .../components/bulk/bulk.component.html         |  5 +----
 .../vehicle-detail.component.html               | 15 ++++++++++++++-
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index 506d5428..7838d45d 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 10:59:57
+ * @LastEditTime : 2022-03-11 16:09:47
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -132,7 +132,20 @@
     </div>
   </div>
 </nz-card>
-<nz-card nzTitle="保险待定"> </nz-card>
+<nz-card nzTitle="服务信息">
+  <sv-container>
+    <sv label="服务包">
+      {{i?.goodsResource?.insuranceTypeLabel}}
+    </sv>
+    <sv label="货物价值">
+      {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+    </sv>
+    <sv label="保价费金额">
+      {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+    </sv>
+  </sv-container>
+</nz-card>
+
 
 <nz-card nzTitle="运费信息" #distannce3>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index e75cee2f..58c5732f 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 15:52:33
+ * @LastEditTime : 2022-03-11 15:57:39
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html
index 16a60a9f..c111c064 100644
--- a/src/app/routes/waybill-management/components/bulk/bulk.component.html
+++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-02-23 15:41:43
+ * @LastEditTime : 2022-03-11 16:04:29
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
@@ -63,9 +63,6 @@
       [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
       [loading]="service.http.loading"
     >
-    <ng-template st-row="createUserName" let-item let-index="index">
-      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
-    </ng-template>
     <ng-template st-row="createUserName" let-item let-index="index">
       <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
     </ng-template>
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index e557eaa3..28fe9152 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 15:52:07
+ * @LastEditTime : 2022-03-11 16:11:01
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@@ -130,6 +130,19 @@
   </div>
 </div>
 </nz-card>
+<nz-card nzTitle="服务信息">
+  <sv-container>
+    <sv label="服务包">
+      {{i?.goodsResource?.insuranceTypeLabel}}
+    </sv>
+    <sv label="货物价值">
+      {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+    </sv>
+    <sv label="保价费金额">
+      {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+    </sv>
+  </sv-container>
+</nz-card>
 <nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
   <div  *ngIf="(i?.wayBillStatus == '3' && i.goodsInfos?.[0].settlementBasis == '2') || (i?.wayBillStatus == '4' && i.goodsInfos?.[0].settlementBasis == '1')" >
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">

From 5ebf478c3589d08449802ca21a7691aca8b63490 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 16:41:17 +0800
Subject: [PATCH 2/8] fix bug

---
 .../bulk-detail-change/bulk-detail-change.component.html      | 4 +---
 .../components/bulk-detail/bulk-detail.component.html         | 4 +---
 .../vehicle-detail-change.component.html                      | 4 ++--
 .../components/bulk-detail/bulk-detail.component.html         | 4 +---
 .../components/vehicle-detail/vehicle-detail.component.html   | 4 +---
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
index 56f4b723..b345a0b4 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 11:02:51
+ * @LastEditTime : 2022-03-11 16:40:47
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -256,7 +256,6 @@
 </nz-card>
 
 <nz-card nzTitle="运费信息"#distannce3>
- <div  *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -274,7 +273,6 @@
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
- </div>
 </nz-card>
 
 
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 679760ef..e66fda9d 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 11:03:14
+ * @LastEditTime : 2022-03-11 16:40:33
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -138,7 +138,6 @@
   </div>
 </nz-card>
 <nz-card nzTitle="运费信息" #distannce3>
-  <div  *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
   <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -156,7 +155,6 @@
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
-</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
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 fa512f26..bb79f5ec 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 11:00:28
+ * @LastEditTime : 2022-03-11 16:41:08
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -43,7 +43,7 @@
       <nz-tabset style="margin-top: 15px">
         <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
         <nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
-        <!-- <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab> -->
+        <nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab>
         <nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
         <nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
       </nz-tabset>
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 58c5732f..6ec05cc5 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 15:57:39
+ * @LastEditTime : 2022-03-11 16:40:09
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@@ -158,7 +158,6 @@
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
 </nz-card> -->
 <nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'"  #distannce3>
-  <div  *ngIf="(i?.wayBillStatus == '3' && i.goodsInfos?.[0].settlementBasis == '2') || (i?.wayBillStatus == '4' && i.goodsInfos?.[0].settlementBasis == '1')" >
   <h2>{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
@@ -176,7 +175,6 @@
     </div>
   </div>
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
-</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index 28fe9152..4ca6d51d 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 16:11:01
+ * @LastEditTime : 2022-03-11 16:39:50
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@@ -144,7 +144,6 @@
   </sv-container>
 </nz-card>
 <nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
-  <div  *ngIf="(i?.wayBillStatus == '3' && i.goodsInfos?.[0].settlementBasis == '2') || (i?.wayBillStatus == '4' && i.goodsInfos?.[0].settlementBasis == '1')" >
   <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
@@ -158,7 +157,6 @@
     附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
   </div>
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
-  </div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>

From e4e76db5d8b076f30c4e02039646ffff33c087fc Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 17:13:59 +0800
Subject: [PATCH 3/8] fix bug

---
 .../sure-arrive/sure-arrive.component.ts      | 32 +++++++++----------
 .../sure-depart/sure-depart.component.ts      | 16 +++++-----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
index e0007949..99899e08 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
@@ -64,7 +64,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -77,7 +77,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -103,7 +103,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -116,7 +116,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -149,7 +149,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -162,7 +162,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -187,7 +187,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -200,7 +200,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -251,7 +251,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -264,7 +264,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -290,7 +290,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -303,7 +303,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -336,7 +336,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -349,7 +349,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
@@ -374,7 +374,7 @@ export class VehicleSureArriveComponent implements OnInit {
           ui: {
             widget: 'upload',
             action: apiConf.fileUpload,
-            fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+            accept: 'image/png,image/jpeg,image/jpg,image/gif',
             limit: 1,
             limitFileCount: 1,
             resReName: 'data.fullFileWatermarkPath',
@@ -387,7 +387,7 @@ export class VehicleSureArriveComponent implements OnInit {
             beforeUpload: (file: any, fileList: any) => {
               return new Observable((observer: Observer<boolean>) => {
                 const isLt1M = file.size / 1024 / 1024 < 5;
-                const fileType = 'image/png,image/jpeg';
+                const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                 if (fileType.indexOf(file.type) === -1) {
                   this.service.msgSrv.warning('图片格式不正确！');
                   observer.complete();
diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
index 490d20a7..6bc299cf 100644
--- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
@@ -69,7 +69,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -82,7 +82,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();
@@ -107,7 +107,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -120,7 +120,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();
@@ -178,7 +178,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -191,7 +191,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();
@@ -216,7 +216,7 @@ export class VehicleSureDepartComponent implements OnInit {
             ui: {
               widget: 'upload',
               action: apiConf.fileUpload,
-              fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+              accept: 'image/png,image/jpeg,image/jpg,image/gif',
               limit: 1,
               limitFileCount: 1,
               resReName: 'data.fullFileWatermarkPath',
@@ -229,7 +229,7 @@ export class VehicleSureDepartComponent implements OnInit {
               beforeUpload: (file: any, fileList: any) => {
                 return new Observable((observer: Observer<boolean>) => {
                   const isLt1M = file.size / 1024 / 1024 < 5;
-                  const fileType = 'image/png,image/jpeg';
+                  const fileType = 'image/png,image/jpeg,image/jpg,image/gif';
                   if (fileType.indexOf(file.type) === -1) {
                     this.service.msgSrv.warning('图片格式不正确！');
                     observer.complete();

From 6d703cf325e253bcba7da6c1df7a2dec82c228ef Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 17:28:04 +0800
Subject: [PATCH 4/8] fix bug

---
 .../components/bulk-detail/bulk-detail.component.html  |  4 ++--
 .../services/waybill-management.service.ts             | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 6ec05cc5..2e284475 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-11 16:40:09
+ * @LastEditTime : 2022-03-11 17:27:42
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@@ -83,7 +83,7 @@
       {{i?.driver?.name}}/{{i?.driver?.phone}}
     </sv>
     <sv label="车型车长载重">
-      {{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
+      {{i?.car?.carModelLabel}},{{i?.car?.carLengthLabel}}米,{{i?.car?.carLoad ? i?.car?.carLoad +'吨': ''}}
     </sv>
     <sv label="计划装货时间">
       {{i?.loadPlanTime}}
diff --git a/src/app/routes/waybill-management/services/waybill-management.service.ts b/src/app/routes/waybill-management/services/waybill-management.service.ts
index 5f698ce4..d4b60735 100644
--- a/src/app/routes/waybill-management/services/waybill-management.service.ts
+++ b/src/app/routes/waybill-management/services/waybill-management.service.ts
@@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
 /*
  * @Author: your name
  * @Date: 2021-12-07 14:52:29
- * @LastEditTime : 2022-03-08 14:51:11
+ * @LastEditTime : 2022-03-11 17:26:20
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts
@@ -53,10 +53,10 @@ export class WaybillManagementServe extends BaseService {
   $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage';
   // 查询运营端已回复异常上报
   $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
-  // 获取轨迹
-  $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
-  //  获取订单司机轨迹
-  $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
+ // 获取轨迹
+ $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
+ //  获取订单司机轨迹
+ $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
   // 获取货主企业列表
   public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
   constructor(public injector: Injector) {

From b1d769e215dacd53389a14d59d672adcd754ff09 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 17:58:14 +0800
Subject: [PATCH 5/8] fix bug

---
 .../bulk-detail-change.component.ts           | 873 +++++++++---------
 .../vehicle-detail-change.component.ts        | 127 ++-
 2 files changed, 509 insertions(+), 491 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
index e11f3786..9d9756a2 100644
--- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
+++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
@@ -1,10 +1,10 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 11:24:51
+ * @LastEditTime : 2022-03-11 17:51:15
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -42,13 +42,13 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
   validateForm1: FormGroup;
   id = this.route.snapshot.params.id;
   @ViewChild('distannce3', { static: false })
-  i: any= {unLoadingPlaceList:[]};
+  i: any = { unLoadingPlaceList: [] };
   totalDistance = 0.0; //总里程
   totalTime = 0.0; //路程总时间
-  startInfo: any = [];  // 装货信息
-  endInfo: any = [];   // 卸货信息
+  startInfo: any = []; // 装货信息
+  endInfo: any = []; // 卸货信息
   unloadTime: any; // 货源单设置回显
-loadTime: any; // 货源单设置回显
+  loadTime: any; // 货源单设置回显
   sf3data: any; // 货源单设置回显
   sf4data: any; // 货源单设置回显
   dirverPhone: any; // 货源单设置回显
@@ -75,7 +75,7 @@ loadTime: any; // 货源单设置回显
   ui: SFUISchema = {};
   logColumns2: STColumn[] = [
     { title: '时间', index: 'vinOutTime' },
-    { title: '地点', index: 'cityName' },
+    { title: '地点', index: 'cityName' }
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
@@ -98,8 +98,8 @@ loadTime: any; // 货源单设置回显
     }
   ];
   trajectory = 'car';
-  mapList:any[] = [];  //地图点位数据组
-  addressItems:any[] = [];  //打点地址数据组
+  mapList: any[] = []; //地图点位数据组
+  addressItems: any[] = []; //打点地址数据组
   constructor(
     private route: ActivatedRoute,
     private router: Router,
@@ -108,21 +108,21 @@ loadTime: any; // 货源单设置回显
     private modalService: NzModalService,
     private amapService: AmapService,
     public shipperservice: ShipperBaseService,
-    fb: FormBuilder, 
+    fb: FormBuilder,
     private envSrv: EAEnvironmentService,
-    private ar: ActivatedRoute,
+    private ar: ActivatedRoute
   ) {
     this.validateForm1 = fb.group({
-    loadTime: [null, []],
-      unloadTime: [null, []],
+      loadTime: [null, []],
+      unloadTime: [null, []]
     });
   }
 
   ngOnInit(): void {
-    this.initData()
+    this.initData();
     this.initSF3();
     this.initSF4();
-    this.getTrajectory()
+    this.getTrajectory();
   }
   initSF() {
     this.schema = {
@@ -141,7 +141,7 @@ loadTime: any; // 货源单设置回显
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '提货单',
             data: {
-              appId: this.envSrv.env.appId,
+              appId: this.envSrv.env.appId
             },
             name: 'multipartFile',
             beforeUpload: (file: any, fileList: any) => {
@@ -163,8 +163,8 @@ loadTime: any; // 货源单设置回显
               });
             },
             multiple: false,
-            listType: 'picture-card',
-          } as SFUploadWidgetSchema,
+            listType: 'picture-card'
+          } as SFUploadWidgetSchema
         },
         loadingPeopleVehiclesGoodsFilePath: {
           type: 'string',
@@ -180,7 +180,7 @@ loadTime: any; // 货源单设置回显
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '人车货照片',
             data: {
-              appId: this.envSrv.env.appId,
+              appId: this.envSrv.env.appId
             },
             name: 'multipartFile',
             beforeUpload: (file: any, fileList: any) => {
@@ -202,24 +202,16 @@ loadTime: any; // 货源单设置回显
               });
             },
             multiple: false,
-            listType: 'picture-card',
-          } as SFUploadWidgetSchema,
-        },
-        no4: {
-          type: 'string',
-          title: '',
-          ui: {
-            widget: 'text',
-           },
-           default: '',
+            listType: 'picture-card'
+          } as SFUploadWidgetSchema
         },
         no7: {
           type: 'string',
           title: '',
           ui: {
-            widget: 'text',
-           },
-           default: '',
+            widget: 'text'
+          },
+          default: ''
         },
         unloadingLadingBillFilePath: {
           type: 'string',
@@ -235,7 +227,7 @@ loadTime: any; // 货源单设置回显
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '提货单',
             data: {
-              appId: this.envSrv.env.appId,
+              appId: this.envSrv.env.appId
             },
             name: 'multipartFile',
             beforeUpload: (file: any, fileList: any) => {
@@ -257,8 +249,8 @@ loadTime: any; // 货源单设置回显
               });
             },
             multiple: false,
-            listType: 'picture-card',
-          } as SFUploadWidgetSchema,
+            listType: 'picture-card'
+          } as SFUploadWidgetSchema
         },
         unloadingPeopleVehiclesGoodsFilePath: {
           type: 'string',
@@ -274,7 +266,7 @@ loadTime: any; // 货源单设置回显
             urlReName: 'data.fullFileWatermarkPath',
             descriptionI18n: '人车货照片',
             data: {
-              appId: this.envSrv.env.appId,
+              appId: this.envSrv.env.appId
             },
             name: 'multipartFile',
             beforeUpload: (file: any, fileList: any) => {
@@ -296,62 +288,62 @@ loadTime: any; // 货源单设置回显
               });
             },
             multiple: false,
-            listType: 'picture-card',
-          } as SFUploadWidgetSchema,
+            listType: 'picture-card'
+          } as SFUploadWidgetSchema
         },
         no5: {
           type: 'string',
           title: '',
           ui: {
-            widget: 'text',
-           },
-           default: '',
+            widget: 'text'
+          },
+          default: ''
         },
         no6: {
           type: 'string',
           title: '',
           ui: {
-            widget: 'text',
-           },
-           default: '',
-        },
+            widget: 'text'
+          },
+          default: ''
+        }
       },
-      required: ['loadingLadingBillFilePath','unloadingLadingBillFilePath']
+      required: ['loadingLadingBillFilePath', 'unloadingLadingBillFilePath']
     };
     this.ui = {
       '*': {
         spanLabelFixed: 100,
         grid: { span: 20 }
       },
-      $unloadingLadingBillFilePath: { grid: { span: 12} },
-      $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
-      $loadingLadingBillFilePath: { grid: { span: 12} },
-      $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12} },
-      $no5: { grid: { span: 24} },
+      $unloadingLadingBillFilePath: { grid: { span: 12 } },
+      $unloadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
+      $loadingLadingBillFilePath: { grid: { span: 12 } },
+      $loadingPeopleVehiclesGoodsFilePath: { grid: { span: 12 } },
+      $no5: { grid: { span: 24 } }
     };
   }
   initData() {
-    this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => {
+    this.service.request(this.service.$api_getBulkBillDetail, { id: this.id }).subscribe(res => {
       if (res) {
         this.i = res;
         this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TRA');
         this.initSF();
         // 对装货凭证进行初始化
-        let arr : any= []
+        let arr: any = [];
         res?.receiptFilePath.forEach((element: any, index: any) => {
-         arr.push(  {
-          url: element,
-          status: 'done',
-          uid: index
-        })
+          arr.push({
+            url: element,
+            status: 'done',
+            uid: index
+          });
         });
-        this.sf4data
+        this.sf4data;
         this.listImagUrls = arr;
         // this.sf4data = res?.goodsInfoList?.[0]
         this.sf4data = {
           ...res,
           ...res?.goodsInfoList?.[0]
-        }
+        };
         this.sf3data = {
           goodsTypeId: res?.goodsInfoList[0]?.goodsTypeId || '',
           goodsTypeName: res?.goodsInfoList[0]?.goodsTypeName || '',
@@ -364,104 +356,102 @@ loadTime: any; // 货源单设置回显
         this.changeGoodsType(this.sf3data.goodsTypeId, { label: this.sf3data.goodsTypeName, value: this.sf3data.goodsTypeId });
         // 对装卸货信息进行初始化
         res?.unLoadingPlaceList.forEach((element: any) => {
-          if(element.type === 1 || element.type === '1') {
+          if (element.type === 1 || element.type === '1') {
             const controlId = this.startInfo.length;
-              this.startInfo.push({
-                detailedAddress: element.detailedAddress,
-                appUserName: element.appUserName,
-                contractTelephone: element.contractTelephone,
-                latitude: element.latitude,
-                longitude: element.longitude,
-                province: element.province,
-                city: element.city,
-                area: element.area,
-                type: element.type,
-                id: element.id
-              })
+            this.startInfo.push({
+              detailedAddress: element.detailedAddress,
+              appUserName: element.appUserName,
+              contractTelephone: element.contractTelephone,
+              latitude: element.latitude,
+              longitude: element.longitude,
+              province: element.province,
+              city: element.city,
+              area: element.area,
+              type: element.type,
+              id: element.id
+            });
             this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
             this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
             this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
-          } else if(element.type === 2 || element.type === '2') {
+          } else if (element.type === 2 || element.type === '2') {
             const controlId = this.endInfo.length;
-              this.endInfo.push({
-                detailedAddress: element?.detailedAddress,
-                appUserName: element?.appUserName,
-                contractTelephone: element?.contractTelephone,
-                latitude: element.latitude,
-                longitude: element.longitude,
-                province: element.province,
-                city: element.city,
-                area: element.area,
-                type: element.type,
-                id: element.id
-              })
+            this.endInfo.push({
+              detailedAddress: element?.detailedAddress,
+              appUserName: element?.appUserName,
+              contractTelephone: element?.contractTelephone,
+              latitude: element.latitude,
+              longitude: element.longitude,
+              province: element.province,
+              city: element.city,
+              area: element.area,
+              type: element.type,
+              id: element.id
+            });
             this.validateForm1.addControl(`unloadAddress${controlId}`, new FormControl(null, Validators.required));
             this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
             this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required));
           }
         });
         // 对装货凭证进行初始化
-        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',
-                status: 'done',
-                url: res.unloadingLadingBillFilePath,
-                response: {
-                  url: res.unloadingLadingBillFilePath,
-                },
-              },
-        ],
-        unloadingPeopleVehiclesGoodsFilePath: [
-              {
-                uid: 'logo',
-                name: 'LOGO',
-                status: 'done',
-                url: res.unloadingPeopleVehiclesGoodsFilePath,
-                response: {
-                  url: res.unloadingPeopleVehiclesGoodsFilePath,
-                },
-              },
-        ],
-          };
-        }
+        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',
+              status: 'done',
+              url: res?.unloadingLadingBillFilePath,
+              response: {
+                url: res?.unloadingLadingBillFilePath
+              }
+            }
+          ],
+          unloadingPeopleVehiclesGoodsFilePath: [
+            {
+              uid: 'logo',
+              name: 'LOGO',
+              status: 'done',
+              url: res?.unloadingPeopleVehiclesGoodsFilePath,
+              response: {
+                url: res?.unloadingPeopleVehiclesGoodsFilePath
+              }
+            }
+          ]
+        };
         // 发车时间到车时间初始化
-        this.loadTime = res.loadTime
-        this.unloadTime = res.unloadTime
-        this.dirvingMessage = res.billExpenseDetails;
-          // 计算里程，时间
-      if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
-        this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
-          this.totalDistance = res.distance;
-          this.totalTime = res.time;
-        });
+        this.loadTime = res?.loadTime;
+        this.unloadTime = res?.unloadTime;
+        this.dirvingMessage = res?.billExpenseDetails;
+        // 计算里程，时间
+        if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
+          this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
+            this.totalDistance = res?.distance;
+            this.totalTime = res?.time;
+          });
+        }
       }
-      }
-    })
+    });
   }
 
   goBack() {
@@ -479,39 +469,66 @@ loadTime: any; // 货源单设置回显
     });
     this.sf3.validator({ emitError: true });
     this.sf4.validator({ emitError: true });
-    if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid ) {
+    if (this.validateForm1.invalid || !this.sf3.valid || !this.sf4.valid) {
       this.service.msgSrv.warning('请完善必填项！');
       return;
     }
-    if ((this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight) || (this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight) ) {
+    if (
+      this.sf4.value?.acceptWeight > this.i?.goodsInfoList?.[0]?.weight ||
+      this.sf4.value?.settlementWeight.settlementWeight > this.i?.goodsInfoList?.[0]?.weight
+    ) {
       this.service.msgSrv.warning('装货重量/卸货重量不能大于货物重量！');
       return;
     }
-    let imgList : any= [];
-    if(this.listImagUrls.length > 0) {
-      this.listImagUrls?.forEach((res :any) => {
-        if(res.url) {
-          imgList.push(res.url)
+    let imgList: any = [];
+    if (this.listImagUrls.length > 0) {
+      this.listImagUrls?.forEach((res: any) => {
+        if (res?.url) {
+          imgList.push(res?.url);
         }
-      })
+      });
     }
-    if(typeof(this.unloadTime) !== 'string' ){
-      var c = new Date(this.unloadTime);  
-      this.unloadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
+    if (typeof this.unloadTime !== 'string') {
+      var c = new Date(this.unloadTime);
+      this.unloadTime =
+        c.getFullYear() +
+        '-' +
+        this.addPreZero(c.getMonth() + 1) +
+        '-' +
+        this.addPreZero(c.getDate()) +
+        ' ' +
+        this.addPreZero(c.getHours()) +
+        ':' +
+        this.addPreZero(c.getMinutes()) +
+        ':' +
+        this.addPreZero(c.getSeconds());
     }
-    if(typeof(this.loadTime) !== 'string' ) {
-      var c = new Date(this.loadTime);  
-      this.loadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
+    if (typeof this.loadTime !== 'string') {
+      var c = new Date(this.loadTime);
+      this.loadTime =
+        c.getFullYear() +
+        '-' +
+        this.addPreZero(c.getMonth() + 1) +
+        '-' +
+        this.addPreZero(c.getDate()) +
+        ' ' +
+        this.addPreZero(c.getHours()) +
+        ':' +
+        this.addPreZero(c.getMinutes()) +
+        ':' +
+        this.addPreZero(c.getSeconds());
     }
     const params = {
       id: this.id,
-      unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,], 
+      unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
       receiptFilePath: imgList,
-      goodsInfoDTOList: [{
-        id: this.i?.goodsInfoList?.[0].id,
-        goodsName: this.sf3.value?.goodsName,
-        ...this.sf4.value
-      }],
+      goodsInfoDTOList: [
+        {
+          id: this.i?.goodsInfoList?.[0].id,
+          goodsName: this.sf3.value?.goodsName,
+          ...this.sf4.value
+        }
+      ],
       // 运费信息
       // 收款人
       payeeId: this.dirverPhone,
@@ -524,32 +541,40 @@ loadTime: any; // 货源单设置回显
       acceptVolume: this.sf4.value?.acceptVolume,
       settlementWeight: this.sf4.value?.settlementWeight,
       settlementVolume: this.sf4.value?.settlementVolume,
-      loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
+      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,
+      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,
+      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,
-    }
+      unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data
+        ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
+        : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url
+    };
     this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
-      if(res) {
+      if (res) {
         this.service.msgSrv.success('修改成功！');
         this.router.navigate(['/order-management/bulk/bulk-detail/', this.id]);
       } else {
         this.service.msgSrv.error(res?.msg);
       }
-    })
+    });
   }
-  addPreZero(num: any){
-    if(num<10){
-     return '0'+num;
+  addPreZero(num: any) {
+    if (num < 10) {
+      return '0' + num;
     } else {
-     return num;
+      return num;
     }
-   }
+  }
   // -------------------装卸货信息处理
-   // 打开地图
+  // 打开地图
   // 打开地图
   // 打开地图
   openMap(type: string, index: number, address: string) {
@@ -589,8 +614,8 @@ loadTime: any; // 货源单设置回显
 
         if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
           this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
-            this.totalDistance = res.distance;
-            this.totalTime = res.time;
+            this.totalDistance = res?.distance;
+            this.totalTime = res?.time;
           });
         }
       }
@@ -672,235 +697,235 @@ loadTime: any; // 货源单设置回显
       }
     };
   }
-changeGoodsType(value: string, data: any) {
-  if (data.label === '其它') return;
-  const params = {
-    pageIndex: 1,
-    pageSize: 100,
-    configId: value
-  };
-  this.service
-    .request(this.service.$api_get_config_item_page, params)
-    .pipe(
-      map(data => {
-        return data.records?.map((m: any) => {
-          return { label: m.name, value: m.id };
-        });
-      })
-    )
-    .subscribe(res => {
-      if (res) {
-        this.sf3.getProperty('/goodsNameId')!.schema.enum = res;
-        this.sf3.getProperty('/goodsNameId')!.widget?.reset(res);
-        if (this.sf3data.goodsNameId) {
-          this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
+  changeGoodsType(value: string, data: any) {
+    if (data.label === '其它') return;
+    const params = {
+      pageIndex: 1,
+      pageSize: 100,
+      configId: value
+    };
+    this.service
+      .request(this.service.$api_get_config_item_page, params)
+      .pipe(
+        map(data => {
+          return data.records?.map((m: any) => {
+            return { label: m.name, value: m.id };
+          });
+        })
+      )
+      .subscribe(res => {
+        if (res) {
+          this.sf3.getProperty('/goodsNameId')!.schema.enum = res;
+          this.sf3.getProperty('/goodsNameId')!.widget?.reset(res);
+          if (this.sf3data.goodsNameId) {
+            this.sf3.setValue('/goodsNameId', this.sf3data.goodsNameId);
+          }
         }
-      }
-    });
-}
-initSF4() {
-  this.schema4 = {
-    properties: {
-      weight: {
-        type: 'string',
-        title: '货物数量',
-        ui: {
-          widget: 'custom',
-          placeholder: '请输入',
-          errors: { required: '必填项' }
-        }
-      },
-      carmand: {
-        type: 'string',
-        title: '用车需求',
-        ui: {
-          widget: 'custom',
-          placeholder: '请输入'
-        }
-      },
-      drivers: {
-        type: 'string',
-        title: '承运司机',
-        ui: {
-          widget: 'custom',
-          placeholder: '请输入'
-        }
-      },
-      weightModel: {
-        type: 'string',
-        title: '车型车长承重',
-        ui: {
-          widget: 'custom',
-          placeholder: '请输入'
-        }
-      },
-    loadTime: {
-        type: 'string',
-        title: '发车时间',
-        ui: {
-          widget: 'custom',
-          placeholder: '请输入'
-        }
-      },
-      unloadTime: {
-        type: 'string',
-        title: '到车时间',
-        ui: {
-          widget: 'custom',
-          placeholder: '请输入'
-        }
-      },
-      acceptWeight: {
-        type: 'number',
-        title: '装货重量',
-        minimum:0,
-        maximum:99999,
-        ui: {
-          unit: '吨',
-          placeholder: '请输入',
-          grid: {
-            span: 12
-          },
-          hideStep: true,
-        } as SFNumberWidgetSchema
-      },
-      acceptVolume: {
-        type: 'number',
-        title: '装货体积',
-        minimum:0,
-        maximum:99999,
-        ui: {
-          unit: '吨',
-          placeholder: '请输入',
-          grid: {
-            span: 12
-          },
-          hideStep: true,
-        } as SFNumberWidgetSchema
-      },
-      settlementWeight: {
-        type: 'number',
-        title: '卸货重量',
-        minimum:0,
-        maximum:99999,
-        ui: {
-          unit: '吨',
-          placeholder: '请输入',
-          grid: {
-            span: 12
-          },
-          hideStep: true,
-        } as SFNumberWidgetSchema
-      },
-      settlementVolume: {
-        type: 'number',
-        title: '卸货体积',
-        minimum:0,
-        maximum:99999,
-        ui: {
-          unit: '吨',
-          placeholder: '请输入',
-          grid: {
-            span: 12
-          },
-          hideStep: true,
-        } as SFNumberWidgetSchema
-      }
-    },
-    required: ['loadTime','unloadTime']
-  };
-  this.ui4 = {
-    '*': {
-      spanLabelFixed: 110,
-      grid: { span: 24 }
-    },
-    $weight: {
-      grid: { span: 24 }
-    },
-    $carmand: {
-      grid: { span: 24 }
-    },
-    $weightModel: {
-      spanLabelFixed: 120,
-      grid: { span: 12 }
-    },
-    $drivers: {
-      grid: { span: 12 }
-    },
-    $loadTime: {
-      grid: { span: 12 }
-    },
-    $unloadTime: {
-      grid: { span: 12 }
-    },
-  };
-}
-// 处理上传图片
-handlePreview1 = async (file: NzUploadFile) => {
-  if (!file.url && !file.preview) {
-    file.preview = await getBase64(file.originFileObj!);
-  }
-  this.previewImage1 = file.url || file.preview;
-  this.previewVisible1 = true;
-};
-
-handleChange1(info: NzUploadChangeParam): void {
-  switch (info.file.status) {
-    case 'uploading':
-      break;
-    case 'done':
-      let fileList = [...info.fileList];
-      // 2. Read from response and show file link
-      fileList = fileList.map((file: any) => {
-        if (file.response) {
-          file.url = file.response.data.fullFilePath;
-        }
-        return file;
       });
-      break;
-    case 'error':
-      this.service.msgSrv.error('网络错误');
-      break;
   }
-}
-beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
-  return new Observable((observer: Observer<boolean>) => {
-    const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp';
-    if (!isJpgOrPng) {
-      this.service.msgSrv.warning('只能上传图片!');
-      observer.complete();
-      return;
-    }
-    // tslint:disable-next-line: no-non-null-assertion
-    const isLt2M = file.size! / 1024 / 1024 < 3;
-    if (!isLt2M) {
-      this.service.msgSrv.warning('图片大小超过3兆!');
-      observer.complete();
-      return;
-    }
-    observer.next(isJpgOrPng && isLt2M);
-    observer.complete();
-  });
-};
-agreement(value: any) {
-  if(value === '1') {
-    this.imges = this.i?.supplementAgreement
-  } else if (value === '2') {
-    this.imges = this.i?.supplementAgreement
-   }
-  this.isVisible = true;
-}
-handleCancel() {
-  this.isVisible = false
-}
-handleOK() {
-this.isVisible = false
-}
-goDistance(elf: NzCardComponent) {
-  if (elf) {
-    elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
+  initSF4() {
+    this.schema4 = {
+      properties: {
+        weight: {
+          type: 'string',
+          title: '货物数量',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入',
+            errors: { required: '必填项' }
+          }
+        },
+        carmand: {
+          type: 'string',
+          title: '用车需求',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入'
+          }
+        },
+        drivers: {
+          type: 'string',
+          title: '承运司机',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入'
+          }
+        },
+        weightModel: {
+          type: 'string',
+          title: '车型车长承重',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入'
+          }
+        },
+        loadTime: {
+          type: 'string',
+          title: '发车时间',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入'
+          }
+        },
+        unloadTime: {
+          type: 'string',
+          title: '到车时间',
+          ui: {
+            widget: 'custom',
+            placeholder: '请输入'
+          }
+        },
+        acceptWeight: {
+          type: 'number',
+          title: '装货重量',
+          minimum: 0,
+          maximum: 99999,
+          ui: {
+            unit: '吨',
+            placeholder: '请输入',
+            grid: {
+              span: 12
+            },
+            hideStep: true
+          } as SFNumberWidgetSchema
+        },
+        acceptVolume: {
+          type: 'number',
+          title: '装货体积',
+          minimum: 0,
+          maximum: 99999,
+          ui: {
+            unit: '吨',
+            placeholder: '请输入',
+            grid: {
+              span: 12
+            },
+            hideStep: true
+          } as SFNumberWidgetSchema
+        },
+        settlementWeight: {
+          type: 'number',
+          title: '卸货重量',
+          minimum: 0,
+          maximum: 99999,
+          ui: {
+            unit: '吨',
+            placeholder: '请输入',
+            grid: {
+              span: 12
+            },
+            hideStep: true
+          } as SFNumberWidgetSchema
+        },
+        settlementVolume: {
+          type: 'number',
+          title: '卸货体积',
+          minimum: 0,
+          maximum: 99999,
+          ui: {
+            unit: '吨',
+            placeholder: '请输入',
+            grid: {
+              span: 12
+            },
+            hideStep: true
+          } as SFNumberWidgetSchema
+        }
+      },
+      required: ['loadTime', 'unloadTime']
+    };
+    this.ui4 = {
+      '*': {
+        spanLabelFixed: 110,
+        grid: { span: 24 }
+      },
+      $weight: {
+        grid: { span: 24 }
+      },
+      $carmand: {
+        grid: { span: 24 }
+      },
+      $weightModel: {
+        spanLabelFixed: 120,
+        grid: { span: 12 }
+      },
+      $drivers: {
+        grid: { span: 12 }
+      },
+      $loadTime: {
+        grid: { span: 12 }
+      },
+      $unloadTime: {
+        grid: { span: 12 }
+      }
+    };
+  }
+  // 处理上传图片
+  handlePreview1 = async (file: NzUploadFile) => {
+    if (!file.url && !file.preview) {
+      file.preview = await getBase64(file.originFileObj!);
+    }
+    this.previewImage1 = file.url || file.preview;
+    this.previewVisible1 = true;
+  };
+
+  handleChange1(info: NzUploadChangeParam): void {
+    switch (info.file.status) {
+      case 'uploading':
+        break;
+      case 'done':
+        let fileList = [...info.fileList];
+        // 2. Read from response and show file link
+        fileList = fileList.map((file: any) => {
+          if (file.response) {
+            file.url = file.response.data.fullFilePath;
+          }
+          return file;
+        });
+        break;
+      case 'error':
+        this.service.msgSrv.error('网络错误');
+        break;
+    }
+  }
+  beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
+    return new Observable((observer: Observer<boolean>) => {
+      const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp';
+      if (!isJpgOrPng) {
+        this.service.msgSrv.warning('只能上传图片!');
+        observer.complete();
+        return;
+      }
+      // tslint:disable-next-line: no-non-null-assertion
+      const isLt2M = file.size! / 1024 / 1024 < 3;
+      if (!isLt2M) {
+        this.service.msgSrv.warning('图片大小超过3兆!');
+        observer.complete();
+        return;
+      }
+      observer.next(isJpgOrPng && isLt2M);
+      observer.complete();
+    });
+  };
+  agreement(value: any) {
+    if (value === '1') {
+      this.imges = this.i?.supplementAgreement;
+    } else if (value === '2') {
+      this.imges = this.i?.supplementAgreement;
+    }
+    this.isVisible = true;
+  }
+  handleCancel() {
+    this.isVisible = false;
+  }
+  handleOK() {
+    this.isVisible = false;
+  }
+  goDistance(elf: NzCardComponent) {
+    if (elf) {
+      elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
+    }
   }
-}
   // 装卸货地址互换
   swapAddress() {
     let item = this.startInfo;
@@ -917,18 +942,18 @@ goDistance(elf: NzCardComponent) {
     // 计算里程，时间
     if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
       this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => {
-        this.totalDistance = res.distance;
-        this.totalTime = res.time;
+        this.totalDistance = res?.distance;
+        this.totalTime = res?.time;
       });
     }
   }
 
   // 获取车辆轨迹
-  getTrajectory(){
+  getTrajectory() {
     this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
       if (res) {
-        const points = res.trackArray;
-        let list :any[] = [];
+        const points = res?.trackArray;
+        let list: any[] = [];
         points?.forEach((item: any) => {
           list.push({
             name: item.hgt,
@@ -936,8 +961,8 @@ goDistance(elf: NzCardComponent) {
           });
         });
         this.mapList = list;
-        this.addressItems = res.cityArray;
-        if(this.addressItems && this.addressItems.length > 0){
+        this.addressItems = res?.cityArray;
+        if (this.addressItems && this.addressItems.length > 0) {
           this.addressItems.forEach(item => {
             item.vinOutTime = this.getLocalTime(item.vinOutTime);
           });
@@ -946,12 +971,12 @@ goDistance(elf: NzCardComponent) {
     });
   }
 
-   // 获取司机轨迹
-   getDriverTrajectory(){
+  // 获取司机轨迹
+  getDriverTrajectory() {
     this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
       if (res) {
-        const points = res.tracks;
-        let list :any[] = [];
+        const points = res?.tracks;
+        let list: any[] = [];
         points?.forEach((item: any) => {
           list.push({
             name: item.hgt,
@@ -959,8 +984,8 @@ goDistance(elf: NzCardComponent) {
           });
         });
         this.mapList = list;
-        this.addressItems = [...res.enclosureDataAppTrack];
-        if(this.addressItems && this.addressItems.length > 0){
+        this.addressItems = [...res?.enclosureDataAppTrack];
+        if (this.addressItems && this.addressItems.length > 0) {
           this.addressItems.forEach(item => {
             item.vinOutTime = this.getLocalTime(item.gtm);
             item.cityName = item.appAdress;
@@ -968,14 +993,14 @@ goDistance(elf: NzCardComponent) {
         }
       }
     });
-   }
-   trajectoryChange(event:any){
-    if(event ==='car'){
-      this.getTrajectory()
-    }else if(event ==='driver'){
+  }
+  trajectoryChange(event: any) {
+    if (event === 'car') {
+      this.getTrajectory();
+    } else if (event === 'driver') {
       this.getDriverTrajectory();
     }
- }
+  }
   getLocalTime(time: any) {
     return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
   }
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 16f9777a..21405058 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 11:24:29
+ * @LastEditTime : 2022-03-11 17:57:24
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -93,11 +93,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
     }
   ];
   trajectory = 'car';
-  mapList:any[] = [];  //地图点位数据组
-  addressItems:any[] = [];  //打点地址数据组
+  mapList: any[] = []; //地图点位数据组
+  addressItems: any[] = []; //打点地址数据组
   logColumns2: STColumn[] = [
     { title: '时间', index: 'vinOutTime' },
-    { title: '地点', index: 'cityName' },
+    { title: '地点', index: 'cityName' }
   ];
   constructor(
     private route: ActivatedRoute,
@@ -204,14 +204,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             listType: 'picture-card'
           } as SFUploadWidgetSchema
         },
-        no4: {
-          type: 'string',
-          title: '',
-          ui: {
-            widget: 'text'
-          },
-          default: ''
-        },
         no7: {
           type: 'string',
           title: '',
@@ -405,7 +397,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           }
         });
         // 对装货凭证进行初始化
-        if (res?.loadingLadingBillFilePath) {
+        if(res?.loadingLadingBillFilePath || res?.loadingPeopleVehiclesGoodsFilePath || res?.unloadingLadingBillFilePath || res?.unloadingPeopleVehiclesGoodsFilePath) {
           this.formData = {
             loadingLadingBillFilePath: [
               {
@@ -425,7 +417,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
                 status: 'done',
                 url: res?.loadingPeopleVehiclesGoodsFilePath,
                 response: {
-                  url: res?.loadingPeopleVehiclesGoodsFilePath
+                  url: res?.loadingPeopleVehiclesGoodsFilePath,
                 }
               }
             ],
@@ -453,6 +445,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             ]
           };
         }
+    
         // 发车时间到车时间初始化
         this.loadTime = res?.loadTime;
         this.unloadTime = res?.unloadTime;
@@ -683,7 +676,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       '*': {
         spanLabelFixed: 110,
         grid: { span: 12 }
-      },
+      }
     };
   }
   changeGoodsType(value: string, data: any) {
@@ -821,7 +814,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       file.preview = await getBase64(file.originFileObj!);
     }
     console.log('888888888');
-    
+
     this.previewImage1 = file.url || file.preview;
     this.previewVisible1 = true;
   };
@@ -921,60 +914,60 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       });
     }
   }
-    // 获取车辆轨迹
-    getTrajectory(){
-      this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
-        if (res) {
-          const points = res?.trackArray;
-          let list :any[] = [];
-          points?.forEach((item: any) => {
-            list.push({
-              name: item.hgt,
-              lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
-            });
+  // 获取车辆轨迹
+  getTrajectory() {
+    this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res?.trackArray;
+        let list: any[] = [];
+        points?.forEach((item: any) => {
+          list.push({
+            name: item.hgt,
+            lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
           });
-          this.mapList = list;
-          this.addressItems = res?.cityArray;
-          if(this.addressItems && this.addressItems.length > 0){
-            this.addressItems.forEach(item => {
-              item.vinOutTime = this.getLocalTime(item.vinOutTime);
-            });
-          }
-        }
-      });
-    }
-  
-     // 获取司机轨迹
-     getDriverTrajectory(){
-      this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
-        if (res) {
-          const points = res?.tracks;
-          let list :any[] = [];
-          points?.forEach((item: any) => {
-            list.push({
-              name: item.hgt,
-              lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
-            });
+        });
+        this.mapList = list;
+        this.addressItems = res?.cityArray;
+        if (this.addressItems && this.addressItems.length > 0) {
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.vinOutTime);
           });
-          this.mapList = list;
-          this.addressItems = [...res?.enclosureDataAppTrack];
-          if(this.addressItems && this.addressItems.length > 0){
-            this.addressItems.forEach(item => {
-              item.vinOutTime = this.getLocalTime(item.gtm);
-              item.cityName = item.appAdress;
-            });
-          }
         }
-      });
-     }
-     trajectoryChange(event:any){
-      if(event ==='car'){
-        this.getTrajectory()
-      }else if(event ==='driver'){
-        this.getDriverTrajectory();
       }
-   }
-    getLocalTime(time: any) {
-      return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+    });
+  }
+
+  // 获取司机轨迹
+  getDriverTrajectory() {
+    this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => {
+      if (res) {
+        const points = res?.tracks;
+        let list: any[] = [];
+        points?.forEach((item: any) => {
+          list.push({
+            name: item.hgt,
+            lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))]
+          });
+        });
+        this.mapList = list;
+        this.addressItems = [...res?.enclosureDataAppTrack];
+        if (this.addressItems && this.addressItems.length > 0) {
+          this.addressItems.forEach(item => {
+            item.vinOutTime = this.getLocalTime(item.gtm);
+            item.cityName = item.appAdress;
+          });
+        }
+      }
+    });
+  }
+  trajectoryChange(event: any) {
+    if (event === 'car') {
+      this.getTrajectory();
+    } else if (event === 'driver') {
+      this.getDriverTrajectory();
     }
+  }
+  getLocalTime(time: any) {
+    return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss');
+  }
 }

From 8940aec40938ee977ab5fc2742a98069ed14a4a4 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Fri, 11 Mar 2022 17:58:32 +0800
Subject: [PATCH 6/8] fix bug

---
 .../vehicle-detail-change/vehicle-detail-change.component.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 21405058..ad8c312e 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 17:57:24
+ * @LastEditTime : 2022-03-11 17:58:28
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -397,7 +397,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
           }
         });
         // 对装货凭证进行初始化
-        if(res?.loadingLadingBillFilePath || res?.loadingPeopleVehiclesGoodsFilePath || res?.unloadingLadingBillFilePath || res?.unloadingPeopleVehiclesGoodsFilePath) {
           this.formData = {
             loadingLadingBillFilePath: [
               {
@@ -444,8 +443,6 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
               }
             ]
           };
-        }
-    
         // 发车时间到车时间初始化
         this.loadTime = res?.loadTime;
         this.unloadTime = res?.unloadTime;

From dd8f5afaa1aa7102acbbd94e1815d2ad1b34a04a Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Sat, 12 Mar 2022 15:30:07 +0800
Subject: [PATCH 7/8] 666

---
 .../components/bulk-detail/bulk-detail.component.html         | 4 ++--
 .../components/bulk-detail/bulk-detail.component.html         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index e66fda9d..60108072 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@@ -87,12 +87,12 @@
     <sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
     <sv label="承运司机"> {{ i?.driverName }}/{{ i?.driverPhone }}{{ i?.carNo }} </sv>
     <sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
-    <sv label="计划装货时间">
+    <!-- <sv label="计划装货时间">
       {{ i?.loadPlanTime }}
     </sv>
     <sv label="计划卸货时间">
       {{ i?.unloadPlanTime }}
-    </sv>
+    </sv> -->
     <sv label="接单数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 </sv>
     <sv *ngIf="i?.billStatus =='3' || i?.billStatus =='4' || i?.billStatus =='5'" label="装货数量"> {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 </sv>
     <sv *ngIf="i?.billStatus =='4' || i?.billStatus =='5'" label="卸货数量"> {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 </sv>
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index 6ec05cc5..dc62e45c 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -85,12 +85,12 @@
     <sv label="车型车长载重">
       {{i?.carVO?.carModelLabel}},{{i?.carVO?.carLengthLabel}}米,{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}}
     </sv>
-    <sv label="计划装货时间">
+    <!-- <sv label="计划装货时间">
       {{i?.loadPlanTime}}
     </sv>
     <sv label="计划卸货时间">
       {{i?.unloadPlanTime}}
-    </sv>
+    </sv> -->
     <sv label="接单数量">
       {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
     </sv>

From 4883a55ce8245d66f89e80a073e85d43479c072b Mon Sep 17 00:00:00 2001
From: TaricXin <583259872@qq.com>
Date: Mon, 14 Mar 2022 10:30:26 +0800
Subject: [PATCH 8/8] edit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 302ef98a..e39be873 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tms-obc-web",
   "version": "0.0.0",
-  "description": "运营后台－WEB",
+  "description": "运营后台-WEB",
   "author": "cipchk <cipchk@qq.com>",
   "repository": {
     "type": "git",