From 0b99448629da6795f560478d9a06eb3642c7f686 Mon Sep 17 00:00:00 2001
From: weiyu <weiyu.wei@eascs.com>
Date: Tue, 26 Apr 2022 20:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E5=BC=80=E7=A5=A8=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../billing-order.component.html              |  4 +-
 .../billing-order/billing-order.component.ts  | 64 +++++++++----------
 .../services/ticket.service.ts                |  4 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
index 85530e83..3f494035 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.html
@@ -13,7 +13,7 @@
             class="text-right">
             <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
             <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button (click)="exportList()"> 导出</button>
+            <button nz-button (click)="export()"> 导出</button>
             <button nz-button nzType="link" (click)="expandToggle()">
                 {{ !_$expand ? '展开' : '收起' }}
                 <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -25,7 +25,7 @@
 <nz-card class="content-box" nzBordered>
     <st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
         [loading]="false" [scroll]="{ x:'1200px' }">
-        <ng-template st-row="sts" let-item let-index="index" let-column="column">
+        <ng-template st-row="sts" let-item let-index="index">
             <span *ngIf="item.sts === '1'">待受理</span>
             <span *ngIf="item.sts === '2'">处理中</span>
             <span *ngIf="item.sts === '3'">已完成</span>
diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
index ced2c73d..39a4ba95 100644
--- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
+++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema, SFSelectWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
@@ -20,7 +20,7 @@ export class BillingOrderComponent implements OnInit {
 
   _$expand = false;
 
-  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) { }
+  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router, private ar: ActivatedRoute) { }
 
   ngOnInit(): void { }
 
@@ -34,8 +34,8 @@ export class BillingOrderComponent implements OnInit {
   };
 
   routeTo(item: any) {
-    return;
-    this.router.navigate(['/ticket/invoice-requested-detail/1']);
+    // return;
+    this.router.navigateByUrl(`/order-management/vehicle/vehicle-detail/${item.billId}`);
   }
 
   /**
@@ -54,14 +54,8 @@ export class BillingOrderComponent implements OnInit {
     this.sf?.setValue('/expand', this._$expand);
   }
 
-  exportList() {
-    const params = { listSource: 1, pageSize: -1 };
-    if (this.sf) {
-      Object.assign(params, {
-        ...this.sf.value
-      });
-    }
-    this.service.downloadFile(this.service.$api_export_invoice_logs_page, params);
+  export() {
+    this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_InvoicedBillInfoPage);
   }
 
   private initSF(): SFSchema {
@@ -125,7 +119,7 @@ export class BillingOrderComponent implements OnInit {
           ui: {
             widget: 'sl-from-to',
             type: 'date',
-            format: 'yyyy-MM-dd',
+            format: 'yyyy-MM-dd HH:mm:ss',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -185,17 +179,17 @@ export class BillingOrderComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '订单号', index: 'billCode', className: 'text-center', width: 180 },
-      { title: '运单号', index: 'wayBillCode', width: 180,className: 'text-center'},
-      { title: '银行类型', index: 'bankType', width: 100,className: 'text-center' },
-      { title: '网络货运人', index: 'enterpriseInfoName', width: 220,className: 'text-center' },
+      { title: '订单号', index: 'billCode', type:'link', className: 'text-center', width: 180, click: _record => this.routeTo(_record) },
+      { title: '运单号', index: 'wayBillCode', width: 180, className: 'text-center' },
+      { title: '银行类型', index: 'bankTypeLabel', render: 'bankType', width: 100, className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: 220, className: 'text-center' },
       {
         title: '开票金额', // TODO
         index: 'vatmoney',
         width: 120,
         type: 'widget',
         className: 'text-center',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) }
       },
       {
         title: '总费用',
@@ -211,7 +205,7 @@ export class BillingOrderComponent implements OnInit {
         width: 120,
         type: 'widget',
         className: 'text-center',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.shippingFee }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.price }) }
       },
       {
         title: '技术服务费',
@@ -219,7 +213,7 @@ export class BillingOrderComponent implements OnInit {
         width: 120,
         type: 'widget',
         className: 'text-center',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.insurancePremium }) }
       },
       {
         title: '附加费',
@@ -227,7 +221,7 @@ export class BillingOrderComponent implements OnInit {
         width: 120,
         type: 'widget',
         className: 'text-center',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.aliasFee }) }
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.surcharge }) }
       },
       {
         title: '附加费率',
@@ -236,20 +230,21 @@ export class BillingOrderComponent implements OnInit {
         width: 130,
         format: record => `${record.paymentMethodRate}%`
       },
-      { title: '货主名称', index: 'shipperAppUserName',width: '180px', className: 'text-center' },
-      { title: '所属项目', index: 'enterpriseProjectName',width: '180px', className: 'text-center', },
+      { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
+      { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center', },
       {
         title: '服务类型',
-        index: 'serviceType',
+        index: 'serviceTypeLabel',
         width: '180px',
         className: 'text-center'
       },
-      { title: '装货地', index: 'consignor',width: '180px', className: 'text-center' },
-      { title: '卸货地', index: 'consignee',width: '180px', className: 'text-center' },
-      { title: '货物信息', index: 'goodsName', className: 'text-center',width: '180px' },
-      { title: '车牌号', index: 'carNo',className: 'text-center',width: '180px' },
+      { title: '装货地', index: 'consignor', width: '180px', className: 'text-center' },
+      { title: '卸货地', index: 'consignee', width: '180px', className: 'text-center' },
+      { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' },
+      { title: '车牌号', index: 'carNo', className: 'text-center', width: '180px' },
       {
         title: '承运司机',
+        index:'driverName',
         className: 'text-center',
         width: '180px',
       },
@@ -268,12 +263,15 @@ export class BillingOrderComponent implements OnInit {
       { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 180 },
       { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 },
       { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 180 },
-      { title: '分票编号', index: 'vatinvcode',width: '180px', className: 'text-center', },
-      { title: '发票号码', index: 'invoiceno', width: 100, className: 'text-center', },
-      { title: '发票代码', index: 'invoiceno2', width: 130,className: 'text-center' },
-      { title: '开票日期', index: 'invoicedate', type: 'date', width: 150,className: 'text-center' },
+      { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', },
+      { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', },
+      { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' },
+      { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' },
       // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO
-      { title: 'ETC开票金额', render: 'vatmoney', className: 'text-center', width: 200 }
+      {
+        title: 'ETC开票金额', render: 'vatmoney', className: 'text-center', width: 200, type: 'widget',
+        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.surcharge }) }
+      }
     ];
   }
 }
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts
index 29b0ca2d..504c8d84 100644
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@@ -147,7 +147,9 @@ export class TicketService extends ShipperBaseService {
   $api_get_ficoCarWhiteList_asyncExport = '/api/fcc/ficoEtcInvoiceL/asyncExportCarWhiteList';
 
   // 可开票订单list查询
-  $api_invoicedBillInfo_page = '/api/fcc/invoicedBillInfo/findInvoicedBillInfoPage';
+  $api_invoicedBillInfo_page = '/api/fcc/invoicedBillInfo/getInvoicedBillInfoPage';
+  // 可开票订单导出
+  $api_export_InvoicedBillInfoPage = '/api/fcc/invoicedBillInfo/exportInvoicedBillInfoPage'
 
   constructor(public injector: Injector) {
     super(injector);