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

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,14 +127,14 @@ 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;
     }
+  }
   handleCancel() {
     this.isVisible = 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();
+  }
 }

src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts

@@ -38,7 +38,7 @@ export class ETCInvoicedListComponent implements OnInit {
       nzTitle: '运单交易明细',
       nzContent: TransactionDetailsComponent,
       nzWidth: 900,
-      nzComponentParams: { data: [] },
+      nzComponentParams: { data: item },
       nzOnOk: com => {
         console.log(com.selectedData);
       },
@@ -147,8 +147,8 @@ export class ETCInvoicedListComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '运单号', index: 'wayBillCode' },
+      { title: '运单号', index: 'wayBillCode',width: 200 },
-      { title: '订单号', index: 'billCode' },
+      { title: '订单号', index: 'billCode',width: 200 },
       {
         title: '开票状态',
         index: 'invoicingStatus',
@@ -157,12 +157,12 @@ export class ETCInvoicedListComponent implements OnInit {
         width: 120
       },
       { title: '订单类型', index: 'billTypeLabel', width: 120 },
-      { title: '装货地', index: 'loadingPlace' },
+      { title: '装货地', index: 'loadingPlace',width: 200 },
-      { title: '卸货地', index: 'dischargePlace' },
+      { title: '卸货地', index: 'dischargePlace' ,width: 200},
-      { title: '司机信息', render: 'call1No' },
+      { title: '司机信息', render: 'call1No' ,width: 200},
-      { title: '车辆信息', render: 'call12No' },
+      { title: '车辆信息', render: 'call12No',width: 200 },
-      { title: '托运人', index: 'shipperAppUserName' },
+      { title: '托运人', index: 'shipperAppUserName',width: 200 },
-      { title: '网络货运人', index: 'enterpriseInfoName' },
+      { title: '网络货运人', index: 'enterpriseInfoName' ,width: 200},
       {
         title: '开票金额',
         index: 'invoicingAmount',
@@ -179,10 +179,11 @@ export class ETCInvoicedListComponent implements OnInit {
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicingNumber }) }
       },
-      { title: '申请时间', index: 'orderReceivingTime', type: 'date' },
+      { title: '申请时间', index: 'orderReceivingTime', type: 'date',width: 200 },
       {
         title: '操作',
         className: 'text-center',
+        width: 120,
         buttons: [
           {
             text: '交易明细',

src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.html

@@ -1,16 +1,32 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-06 10:57:56
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-04-11 21:18:15
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-list\\transaction-details\\transaction-details.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <div nz-row nzGutter="8">
   <div nz-col nzSpan="19">
-        <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 12 } }}" [compact]="true"
+    <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 12 } } }" [compact]="true" [button]="'none'"></sf>
-            [button]="'none'"></sf>
   </div>
   <div nz-col [nzSpan]="5" class="text-right mb-md">
     <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
     <button nz-button (click)="resetSF()">重置</button>
   </div>
 
-    <st #st [data]="url" [columns]="columns" bordered size="small"
+  <st
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    #st
+    [data]="url"
+    [columns]="columns"
+    bordered
+    size="small"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
     [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="false" [scroll]="{ x:'860px',y: '400px' }"></st>
+    [loading]="false"
+    [scroll]="{ x: '860px', y: '400px' }"
+  ></st>
 </div>

src/app/routes/ticket-management/components/etc-invoiced-list/transaction-details/transaction-details.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-14 14:17:38
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-11 20:56:20
+ * @LastEditTime : 2022-04-11 21:33:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\etc-invoiced-list\\transaction-details\\transaction-details.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -20,7 +20,7 @@ import { TicketService } from '../../../services/ticket.service';
   templateUrl: './transaction-details.component.html'
 })
 export class TransactionDetailsComponent implements OnInit {
-  data = [];
+  data :any= [];
   selectedData = [];
   url = `/api/fcc/ficoEtcInvoiceH/list/page`;
   @ViewChild('st', { static: true })
@@ -31,7 +31,7 @@ export class TransactionDetailsComponent implements OnInit {
     { title: '交易id', index: 'id' },
     { title: '交易流水号', index: 'tradeFlowNo' },
     { title: '交易金额', index: 'fee' },
-    { title: '开票状态', index: 'state', type: 'enum', enum: { '0': '待开具', '1': '开具中', '2': '已开具', '3': '开票失败' } },
+    { title: '开票状态', index: 'stateLabel' },
     { title: '交易时间', index: 'exTime', type: 'date' }
   ];
   searchSchema: SFSchema = {
@@ -63,24 +63,29 @@ export class TransactionDetailsComponent implements OnInit {
     }
   };
 
-  reqParams = {};
 
   constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
 
-  ngOnInit(): void {}
+  ngOnInit(): void {
+    console.log(this.data);
     
-  beforeReq = (requestOptions: STRequestOptions) => {
+  }
-    if (this.sf) {
+  get reqParams() {
-      Object.assign(requestOptions.body, {
+    const a: any = {};
-        ...this.sf.value,
+    if (this.data?.id) {
+      a.wayBillId = this.data?.wayBillId;
+    }
+    const params: any = Object.assign({}, this.sf?.value || {});
+    delete params._$expand;
+    return {
+      ...a,
+      ...params,
       exTime: {
-          start: this.sf.value.exTime?.[0] || '',
+        start: this.sf?.value?.exTime?.[0] || '',
-          end: this.sf.value.exTime?.[1] || ''
+        end: this.sf?.value?.exTime?.[1] || ''
       }
-      });
-    }
-    return requestOptions;
     };
+  }
 
   /**
    * 重置表单