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 2e5fb6b9..812a4377 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
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-23 14:44:37
+ * @LastEditTime : 2022-04-11 19:03:20
  * @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.
  */
@@ -589,6 +589,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
+        if(item?.poi) {
         const poi = item.poi;
         const locList = poi.pois;
         switch (type) {
@@ -620,7 +621,10 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             this.totalTime = res?.time;
           });
         }
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
       }
+    }
     });
   }
   initSF3() {
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 2132950a..e236a17f 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-04-06 15:12:24
+ * @LastEditTime : 2022-04-11 19:03:47
  * @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.
  */
@@ -560,6 +560,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
+        if(item?.poi) {
         const poi = item.poi;
         const locList = poi.pois;
         switch (type) {
@@ -591,6 +592,9 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             this.totalTime = res?.time;
           });
         }
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+      }
       }
     });
   }
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
index 57f100ae..04ccd7c2 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@@ -838,6 +838,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
+        if(item?.poi) {
         const poi = item.poi;
         const locList = poi.location.toString().split(',');
         switch (type) {
@@ -869,6 +870,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
             this.totalTime = res.time;
           });
         }
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+      }
       }
     });
   }
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
index 78ce97a5..bc6d3798 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
@@ -725,6 +725,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
+        if(item?.poi) {
         const poi = item.poi;
         const locList = poi.pois;
         switch (type) {
@@ -753,6 +754,9 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
             this.totalTime = res.time;
           });
         }
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+      }
       }
     });
   }
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 3c8848cd..def5f8dc 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -1080,37 +1080,42 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
-        const poi = item.poi;
-        const locList = poi.pois;
-        switch (type) {
-          case 'start':
-            this.startInfo[index].detailedAddress = poi.formattedAddress;
-            this.startInfo[index].longitude = locList[0];
-            this.startInfo[index].latitude = locList[1];
-            this.startInfo[index].province = poi.addressComponent.province;
-            this.startInfo[index].city = poi.addressComponent.city;
-            this.startInfo[index].area = poi.addressComponent.district;
-            this.startInfo[index].address = poi.formattedAddress;
-            break;
-          case 'end':
-            this.endInfo[index].detailedAddress = poi.formattedAddress;
-            this.endInfo[index].longitude = locList[0];
-            this.endInfo[index].latitude = locList[1];
-            this.endInfo[index].province = poi.addressComponent.province;
-            this.endInfo[index].city = poi.addressComponent.city;
-            this.endInfo[index].area = poi.addressComponent.district;
-            this.endInfo[index].address = poi.formattedAddress;
-            break;
-          default:
-            break;
-        }
-
-        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.getInsurersPrice(); // 计算保费金额
-          });
+        console.log(item);
+        if(item?.poi) {
+          const poi = item.poi;
+          const locList = poi.pois;
+          switch (type) {
+            case 'start':
+              this.startInfo[index].detailedAddress = poi.formattedAddress;
+              this.startInfo[index].longitude = locList[0];
+              this.startInfo[index].latitude = locList[1];
+              this.startInfo[index].province = poi.addressComponent.province;
+              this.startInfo[index].city = poi.addressComponent.city;
+              this.startInfo[index].area = poi.addressComponent.district;
+              this.startInfo[index].address = poi.formattedAddress;
+              break;
+            case 'end':
+              this.endInfo[index].detailedAddress = poi.formattedAddress;
+              this.endInfo[index].longitude = locList[0];
+              this.endInfo[index].latitude = locList[1];
+              this.endInfo[index].province = poi.addressComponent.province;
+              this.endInfo[index].city = poi.addressComponent.city;
+              this.endInfo[index].area = poi.addressComponent.district;
+              this.endInfo[index].address = poi.formattedAddress;
+              break;
+            default:
+              break;
+          }
+  
+          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.getInsurersPrice(); // 计算保费金额
+            });
+          }
+        } else {
+          this.service.msgSrv.warning('请重新手动选择地址！')
         }
       }
     });
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index 0f607efa..a52ee428 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -999,6 +999,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
+        if(item?.poi) {
         const poi = item.poi;
         const locList = poi.pois;
         switch (type) {
@@ -1029,6 +1030,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             this.getInsurersPrice(); // 计算保费金额
           });
         }
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+      }
       }
     });
   }