Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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,6 +621,9 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             this.totalTime = res?.time;
           });
         }
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+      }
     }
     });
   }

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('请重新手动选择地址！')
+      }
       }
     });
   }

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('请重新手动选择地址！')
+      }
       }
     });
   }

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('请重新手动选择地址！')
+      }
       }
     });
   }

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts

@@ -1080,6 +1080,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
+        console.log(item);
+        if(item?.poi) {
           const poi = item.poi;
           const locList = poi.pois;
           switch (type) {
@@ -1112,6 +1114,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
               this.getInsurersPrice(); // 计算保费金额
             });
           }
+        } else {
+          this.service.msgSrv.warning('请重新手动选择地址！')
+        }
       }
     });
   }

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('请重新手动选择地址！')
+      }
       }
     });
   }