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

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:26:19
  * @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,12 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
             this.totalTime = res?.time;
           });
         }
+        return true
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+        return false
       }
+    }
     });
   }
   initSF3() {

src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-29 14:30:11
+ * @LastEditTime : 2022-04-11 22:31:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -127,13 +127,13 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   agreement(value: any) {
     if(value  ==='1'){
       this.modalTitle = '附件信息';
-      this.modalcontent = this.i?.contractContent?.contractContent;
-      
+      // this.modalcontent = this.i?.contractContent?.contractContent;
+      this.service.reviewPDF(this.i?.contractContent?.contractFilePath)
     }else if(value === '2'){
       this.modalTitle = '补充协议';
       this.modalcontent = this.i?.supplementContent?.contractContent;
+      this.isVisible = true;
     }
-    this.isVisible = true;
   }
   handleCancel() {
     this.isVisible = false;

src/app/routes/order-management/components/risk-detail/risk-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-16 10:19:08
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-24 14:12:14
+ * @LastEditTime : 2022-04-11 20:43:59
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -22,7 +22,7 @@
       <span >{{i?.representationsStatusLabel}}</span>
     </sv>
     <sv label="承运司机">{{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhone ?i?.driverPhone + '/': '' }}  {{i?.carNo}}</sv>
-    <sv label="车队长"> {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} </sv>
+    <sv label="车队长"  *ngIf="i?.payeeId !== i?.driverId"> {{i?.carCaptainName ? i?.carCaptainName+ '/' : ''}}{{i?.carCaptainPhone}} </sv>
     <sv label="装货时间">{{i?.loadTime}}</sv>
     <sv label="卸货时间">{{i?.unloadTime}}</sv>
     <sv label="装货地">{{i?.loadingPlace}}</sv>

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:26:34
  * @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,11 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
             this.totalTime = res?.time;
           });
         }
+        return true
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+        return false
+      }
       }
     });
   }

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-11 14:35:08
+ * @LastEditTime : 2022-04-11 22:29:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -244,4 +244,25 @@ export class OrderManagementService extends ShipperBaseService {
   constructor(public injector: Injector) {
     super(injector);
   }
+  public reviewPDF(url: string) {
+    if (!url) {
+      return;
+    }
+    const uA = window.navigator.userAgent; // 判断浏览器内核
+    const isIE =
+      /msie\s|trident\/|edge\//i.test(uA) &&
+      !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window);
+    const objectUrl = url;
+    const a = document.createElement('a');
+    document.body.appendChild(a);
+    a.href = objectUrl;
+    a.download = '附件.pdf';
+    if (isIE) {
+      // 兼容IE11无法触发下载的问题
+      (navigator as any).msSaveBlob(url, a.download);
+    } else {
+      a.click();
+    }
+    a.remove();
+  }
 }