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

src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html

@@ -6,7 +6,7 @@
   </div>
   <div style="width: 90%;">
     <st #st [scroll]="{x:'1000px',y:'600px'}" [data]="service.$api_get_order_valid_result" [columns]="columns"
-      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams ,process: beforeReq }"
       [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}"
       [bordered]="true">
       <ng-template st-row="checkStatus" let-item>

src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
-import { STColumn, STComponent } from '@delon/abc/st';
+import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
 import { NzModalRef } from 'ng-zorro-antd/modal';
 import { ReportingService } from '../../services/reporting.service';
 
@@ -23,13 +23,21 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
   get reqParams() {
     return {
       subjectType: this.subjectType,
-      subjectId: this.record?.orderId
+      subjectId: this.record?.orderId,
+
     };
   }
+
   constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) {
 
   }
 
+  beforeReq(requestOptions: STRequestOptions) {
+    delete requestOptions?.body?.pageSize;
+    delete requestOptions?.body?.pageIndex;
+    return requestOptions;
+  }
+
   ngOnInit(): void {
     this.initST();
   }
@@ -76,8 +84,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
   }
 
   selectTab(e: any) {
+    this.subjectType = e?.value;
     setTimeout(() => {
-      this.subjectType = e?.value;
       this.st.load(1);
     })
   }

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html

@@ -13,12 +13,13 @@
 
 <nz-card class="search-box" nzBordered>
     <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 16" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
             <sf #sf [schema]="searchSchema"
                 [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
                 [button]="'none'"></sf>
         </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+            [class.expend-options]="_$expand">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
             <!-- <button nz-button nzType="primary" [disabled]="false"> 导出</button>

src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts

@@ -11,7 +11,7 @@ import { FreightAccountService } from '../../services/freight-account.service';
 @Component({
   selector: 'app-voucher-summary',
   templateUrl: './voucher-summary.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class VoucherSummaryComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -39,12 +39,12 @@ export class VoucherSummaryComponent implements OnInit {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         createtime: {
-          start: this.sf.value.createtime?.[0] || null,
+          start: this.sf.value.createtime?.[0] || '',
-          end: this.sf.value.createtime?.[1] || null
+          end: this.sf.value.createtime?.[1] || ''
         },
         vctime: {
-          start: this.sf.value.vctime?.[0] || null,
+          start: this.sf.value.vctime?.[0] || '',
-          end: this.sf.value.vctime?.[1] || null
+          end: this.sf.value.vctime?.[1] || ''
         }
       });
     }
@@ -286,8 +286,8 @@ export class VoucherSummaryComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
-      { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 140 },
+      { title: '汇总凭证号', index: 'vc2code', type: 'link', width: 180 },
-      { title: '帐套', index: 'vcltdcode', width: 120 },
+      { title: '帐套', index: 'vcltdcode', width: 180 },
       { title: '凭证时间', index: 'createTime', type: 'date', width: 150 },
       {
         title: '统计区间',
@@ -307,7 +307,7 @@ export class VoucherSummaryComponent implements OnInit {
       {
         title: '借方金额',
         index: 'drmoney',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.drmoney }) }
@@ -315,7 +315,7 @@ export class VoucherSummaryComponent implements OnInit {
       {
         title: '贷方金额',
         index: 'crmoney',
-        width: 120,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.crmoney }) }

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();
+  }
 }

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

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

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

@@ -1080,37 +1080,44 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       nzContent: AmapPoiPickerComponent,
       nzWidth: 900,
       nzOnOk: item => {
-        const poi = item.poi;
+        console.log(item);
-        const locList = poi.pois;
+        if(item?.poi) {
-        switch (type) {
+          const poi = item.poi;
-          case 'start':
+          const locList = poi.pois;
-            this.startInfo[index].detailedAddress = poi.formattedAddress;
+          switch (type) {
-            this.startInfo[index].longitude = locList[0];
+            case 'start':
-            this.startInfo[index].latitude = locList[1];
+              this.startInfo[index].detailedAddress = poi.formattedAddress;
-            this.startInfo[index].province = poi.addressComponent.province;
+              this.startInfo[index].longitude = locList[0];
-            this.startInfo[index].city = poi.addressComponent.city;
+              this.startInfo[index].latitude = locList[1];
-            this.startInfo[index].area = poi.addressComponent.district;
+              this.startInfo[index].province = poi.addressComponent.province;
-            this.startInfo[index].address = poi.formattedAddress;
+              this.startInfo[index].city = poi.addressComponent.city;
-            break;
+              this.startInfo[index].area = poi.addressComponent.district;
-          case 'end':
+              this.startInfo[index].address = poi.formattedAddress;
-            this.endInfo[index].detailedAddress = poi.formattedAddress;
+              break;
-            this.endInfo[index].longitude = locList[0];
+            case 'end':
-            this.endInfo[index].latitude = locList[1];
+              this.endInfo[index].detailedAddress = poi.formattedAddress;
-            this.endInfo[index].province = poi.addressComponent.province;
+              this.endInfo[index].longitude = locList[0];
-            this.endInfo[index].city = poi.addressComponent.city;
+              this.endInfo[index].latitude = locList[1];
-            this.endInfo[index].area = poi.addressComponent.district;
+              this.endInfo[index].province = poi.addressComponent.province;
-            this.endInfo[index].address = poi.formattedAddress;
+              this.endInfo[index].city = poi.addressComponent.city;
-            break;
+              this.endInfo[index].area = poi.addressComponent.district;
-          default:
+              this.endInfo[index].address = poi.formattedAddress;
-            break;
+              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;
+          if (this.startInfo[0]?.area && this.endInfo[0]?.area) {
-            this.totalTime = res.time;
+            this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => {
-            this.getInsurersPrice(); // 计算保费金额
+              this.totalDistance = res.distance;
-          });
+              this.totalTime = res.time;
+              this.getInsurersPrice(); // 计算保费金额
+            });
+          }
+        return true
+        } else {
+          this.service.msgSrv.warning('请重新手动选择地址！')
+        return false
         }
       }
     });

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,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
             this.getInsurersPrice(); // 计算保费金额
           });
         }
+        return true
+      } else {
+        this.service.msgSrv.warning('请重新手动选择地址！')
+        return false
+      }
       }
     });
   }

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">
+  <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>
+  <div nz-col [nzSpan]="5" class="text-right mb-md">
-    <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 nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+    <button nz-button (click)="resetSF()">重置</button>
-        <button nz-button (click)="resetSF()">重置</button>
+  </div>
-    </div>
 
-    <st #st [data]="url" [columns]="columns" bordered size="small"
+  <st
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    #st
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [data]="url"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [columns]="columns"
-        [loading]="false" [scroll]="{ x:'860px',y: '400px' }"></st>
+    bordered
-</div>
+    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>
+</div>

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

@@ -1,3 +1,13 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-03-14 14:17:38
+ * @LastEditors  : Shiming
+ * @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.
+ */
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
@@ -10,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 })
@@ -21,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 = {
@@ -53,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) {
+  }
-      Object.assign(requestOptions.body, {
+  get reqParams() {
-        ...this.sf.value,
+    const a: any = {};
-        exTime: {
+    if (this.data?.id) {
-          start: this.sf.value.exTime?.[0] || null,
+      a.wayBillId = this.data?.wayBillId;
-          end: this.sf.value.exTime?.[1] || null
-        }
-      });
     }
-    return requestOptions;
+    const params: any = Object.assign({}, this.sf?.value || {});
-  };
+    delete params._$expand;
+    return {
+      ...a,
+      ...params,
+      exTime: {
+        start: this.sf?.value?.exTime?.[0] || '',
+        end: this.sf?.value?.exTime?.[1] || ''
+      }
+    };
+  }
 
   /**
    * 重置表单

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html

@@ -52,7 +52,7 @@
         (click)="this.rejectAction(selectedRows)">驳回</button>
       <button nz-button *ngIf="resourceStatus !=='4' && resourceStatus !=='5'"
         (click)="changeAddress(selectedRows)">修改地址</button>
-      <button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">打印面单</button>
+      <button nz-button *ngIf="resourceStatus==='3' || !resourceStatus" (click)="printOrder(selectedRows)">快递下单</button>
     </div>
   </ng-template>
 

src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts

@@ -165,7 +165,7 @@ export class InvoiceRequestedComponent {
       return;
     }
     const modal = this.nzModalService.create({
-      nzTitle: '打印面单',
+      nzTitle: '快递下单',
       nzContent: PrintOrderModalComponent,
       nzWidth: 650,
       nzComponentParams: { vatappcodes: this.selectedRows.map(item => item.vatappcode) },

src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.ts

@@ -39,12 +39,14 @@ export class PrintOrderModalComponent implements OnInit {
 
   sure() {
     if (this.type === 1) {
-      this.service.request(this.service.$api_create_express, this.vatappcodes).subscribe(res => {
+      this.service.request(this.service.$api_create_express + '?_allow_badcode=true', this.vatappcodes).subscribe(res => {
-        if (res?.length > 0) {
+        if (res.status === 200) {
-          this.getPDF(res);
+          if (res?.data?.length > 0) {
-        } else {
+            this.getPDF(res.data);
-          this.service.msgSrv.warning('请到快递信息页面打印');
+          } else {
-          this.modal.destroy(true);
+            this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
+            this.modal.destroy(true);
+          }
         }
       });
     } else {
@@ -62,12 +64,14 @@ export class PrintOrderModalComponent implements OnInit {
       delete this.data.scontactInfo.ltdId;
       delete this.data.scontactInfo.shipperId;
       delete this.data.scontactInfo.id;
-      this.service.request(this.service.$api_get_order_summary, params).subscribe(res => {
+      this.service.request(this.service.$api_get_order_summary + '?_allow_badcode=true', params).subscribe(res => {
-        if (res?.length > 0) {
+        if (res.status === 200) {
-          this.service.reviewPDF(res);
+          if (res?.data?.length > 0) {
-        } else {
+            this.service.reviewPDF(res?.data);
-          this.service.msgSrv.warning('请到快递信息页面打印');
+          } else {
-          this.modal.destroy(true);
+            this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
+            this.modal.destroy(true);
+          }
         }
       });
     }
@@ -80,14 +84,12 @@ export class PrintOrderModalComponent implements OnInit {
         this.modal.destroy(true);
         this.service.reviewPDF(res.pdfUrl);
       } else {
-        this.service.msgSrv.warning('下载失败');
+        this.service.msgSrv.success('快递下单成功，请到快递信息页面打印');
         this.modal.destroy(true);
       }
     });
   }
 
-  
-
   close() {
     this.modal.destroy();
   }