edit

2021-12-24 13:18:34 +08:00
parent dc28444d16
commit 336dfd81f5
19 changed files with 886 additions and 217 deletions
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@ -0,0 +1,73 @@
+<page-header-wrapper [title]="'销票处理'">
+</page-header-wrapper>
+
+
+<nz-card class="search-box" nzBordered>
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+            <sf #sf [schema]="searchSchema"
+                [ui]="{ '*': { spanLabelFixed: 110,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:10 } }}"
+                [compact]="true" [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" 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> 导出</button>
+            <button nz-button nzType="link" (click)="expandToggle()">
+                {{ !_$expand ? '展开' : '收起' }}
+                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+            </button>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card class="content-box" nzBordered>
+    <nz-tabset [nzTabBarExtraContent]="extraTemplate">
+        <nz-tab nzTitle="待处理"></nz-tab>
+        <nz-tab nzTitle="待确认"></nz-tab>
+        <nz-tab nzTitle="全部"></nz-tab>
+    </nz-tabset>
+    <ng-template #extraTemplate>
+        <div class="d-flex align-items-center">
+            <div class="mr-md">
+                已选择
+                <strong class="text-red">{{ selectedRows.length }}</strong> 张发票&nbsp;&nbsp; 发票金额总计
+                <strong class="text-red">{{totalCallNo }}</strong>
+                <a *ngIf="totalCallNo > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+            </div>
+            <button nz-button (click)="this.batchPush()">推送开票</button>
+            <button nz-button (click)="this.batchRemove(selectedRows)">移除</button>
+            <button nz-button (click)="this.batchWithdraw(selectedRows)">撤回</button>
+        </div>
+    </ng-template>
+
+
+    <st #st [data]="service.$mock_url" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams, process: beforeReq }"
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+        <ng-template st-row="no" let-item let-index="index" let-column="column">
+            {{ item.no }} <br> <label class="text-primary">待受理</label>
+        </ng-template>
+        <ng-template st-row="description" let-item let-index="index" let-column="column">
+            起运地: 广东省深圳市南山区 <br>
+            目的地: 湖北省武汉市青山区 <br>
+            货物名称: 钢材 <br>
+            车型车牌: 高栏车 粤B36889 <br>
+        </ng-template>
+    </st>
+</nz-card>
+
+<ng-template #requestedModal>
+    <div nz-row nzGutter="8">
+        <div nz-col nzSpan="24" se-container [labelWidth]="100">
+            <se [col]="1" label="开票日期" required>
+                <input nz-input placeholder="请输入" />
+            </se>
+            <se [col]="1" label="开票日期" required>
+                <input nz-input placeholder="请输入" />
+            </se>
+        </div>
+    </div>
+</ng-template>
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.less
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.less
@ -0,0 +1,26 @@
+:host::ng-deep {
+    .search-box {
+        .ant-card-body {
+            padding-bottom: 18px;
+        }
+    }
+
+    .content-box {
+        .ant-card-body {
+            padding-top: 0;
+        }
+    }
+
+    nz-range-picker {
+        width: 100%;
+    }
+
+    .ant-tabs-tab-btn {
+        padding-left : 16px;
+        padding-right: 16px;
+    }
+
+    .text-truncate {
+        white-space: normal;
+    }
+}
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@ -0,0 +1,267 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { Router } from '@angular/router';
+import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
+import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { TicketService } from '../../services/ticket.service';
+import { RequestedInvoiceModalComponent } from '../invoice-requested/requested-invoice-modal/requested-invoice-modal.component';
+import { PushInvoiceComponent } from './push-invoice/push-invoice.component';
+
+@Component({
+  selector: 'app-cancellation-invoice',
+  templateUrl: './cancellation-invoice.component.html',
+  styleUrls: ['./cancellation-invoice.component.less']
+})
+export class CancellationInvoiceComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  @ViewChild('requestedModal', { static: false })
+  requestedModal!: any;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  reqParams = {};
+
+  _$expand = false;
+
+  selectedRows: any[] = [];
+  totalCallNo = 0;
+  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      this.reqParams = { ...this.sf.value };
+    }
+    return requestOptions;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
+        break;
+    }
+  }
+
+  approval(): void {}
+
+  add(): void {}
+
+  /**
+   * 手工开票
+   * @param item
+   */
+  requestedAction(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '发票确认',
+      nzContent: this.requestedModal,
+      nzOnOk: () => {}
+    });
+  }
+
+  /**
+   * 批量推送发票
+   * @param item
+   */
+  batchPush(item?: any) {
+    if (this.selectedRows?.length <= 0 && !item) {
+      this.service.msgSrv.warning('请选择开票申请');
+      return;
+    }
+    this.nzModalService.warning({
+      nzTitle: '确定将所选待处理开票申请推送开票？',
+      nzContent: '推送开票后发票信息不可修改，待系统开票完成后会自动返回开票结果',
+      nzOnOk: () => {}
+    });
+  }
+
+  /**
+   * 撤回
+   * @param item
+   * @returns
+   */
+  batchWithdraw(item?: any) {
+    if (this.selectedRows?.length <= 0 && !item) {
+      this.service.msgSrv.warning('请选择开票申请');
+      return;
+    }
+    this.nzModalService.warning({
+      nzTitle: '确定将所选待确认开票申请撤回？',
+      nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果',
+      nzOnOk: () => {}
+    });
+  }
+
+  /**
+   * 移除
+   * @param item
+   * @returns
+   */
+  batchRemove(item?: any) {
+    if (this.selectedRows?.length <= 0 && !item) {
+      this.service.msgSrv.warning('请选择开票申请');
+      return;
+    }
+    this.nzModalService.warning({
+      nzTitle: '确定将所选待确认开票申请撤回？',
+      nzContent: '提交税控后发票信息不可修改，待税控开票完成后返回开票结果',
+      nzOnOk: () => {}
+    });
+  }
+
+  /**
+   * 推送发票
+   * @param item 
+   */
+  pushInvoiceAction(item: any) {
+    const modal = this.nzModalService.create({
+      nzTitle: '推送开票',
+      nzContent: PushInvoiceComponent,
+      nzWidth: 1200,
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+    this._$expand = false;
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.sf?.setValue('/expand', this._$expand);
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        orderSn: {
+          type: 'string',
+          title: '申请编号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        receiveName2: {
+          type: 'string',
+          title: '购买人',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          }
+        },
+        receiveName3: {
+          type: 'string',
+          title: '网络货运人',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          }
+        },
+        receiveName23: {
+          type: 'string',
+          title: '发票状态',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        or2derSn: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        createTime: {
+          title: '申请时间',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            mode: 'range',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '分票编号', render: 'no', width: 150 },
+      { title: '申请编号', index: 'callNo', width: 120 },
+      { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 },
+      { title: '网络货运人', index: 'callNo', width: 120 },
+      { title: '购买方', index: 'callNo', width: 90 },
+      { title: '订单数', index: 'callNo', width: 90 },
+      { title: '价税合计', index: 'callNo', width: 90 },
+      { title: '金额', index: 'callNo', width: 100 },
+      { title: '税率', index: 'callNo', width: 90 },
+      { title: '税额', index: 'callNo', width: 90 },
+      { title: '服务名称', index: 'callNo', width: 100 },
+      { title: '销货清单', index: 'callNo', width: 90 },
+      { title: '票面备注', render: 'description', width: 250 },
+      { title: '其他要求', index: 'callNo', width: 100 },
+      {
+        title: '操作',
+        width: 150,
+        fixed: 'right',
+        buttons: [
+          {
+            text: '查看明细',
+            click: item => this.router.navigate(['ticket/cancellation-invoice/detail/1'], { queryParams: { type: 1 } })
+          },
+          {
+            text: '手工开票',
+            click: item => this.requestedAction(item)
+          },
+          {
+            text: '推送开票',
+            click: item => this.pushInvoiceAction(item)
+          },
+          {
+            text: '移除',
+            click: item => this.batchRemove(item)
+          },
+          {
+            text: '确认'
+            // click: item => this.rejectAction(item)
+          },
+          {
+            text: '撤回',
+            click: item => this.batchWithdraw(item)
+          }
+        ]
+      }
+    ];
+  }
+}
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.html
@ -0,0 +1,55 @@
+<div nz-row nzGutter="8" class="statistics-box">
+    <div nz-col nzSpan="12" se-container [labelWidth]="100" col="1">
+        <se label="购买方">
+            茅台股份有限公司
+        </se>
+        <se label="纳税号">
+            912301046656930913
+        </se>
+        <se label="地址">
+            贵州省贵阳市
+        </se>
+        <se label="电话">
+            075588393198
+        </se>
+        <se label="开户行">
+            中国工商银行股份有限公司哈贵阳支行
+        </se>
+        <se label="银行账户">
+            3500044119068126788
+        </se>
+        <se label="票面备注">
+            <p style="margin-bottom: 0;margin-top: 5px;">起运地:广东省深圳市南山区</p>
+            <p style="margin-bottom: 0;">目的地:湖北省武汉市青山区</p>
+            <p style="margin-bottom: 0;">货物名称:钢材</p>
+            <p style="margin-bottom: 0;">车型车牌:高栏车 粤B36889</p>
+        </se>
+    </div>
+    <div nz-col nzSpan="12" se-container [labelWidth]="100" col="1">
+        <se label="销售方">
+            天津怡亚通物流科技有限公司
+        </se>
+        <se label="申请编号">
+            VP12301046656
+        </se>
+        <se label="订单数">
+            100笔
+        </se>
+        <se label="价税合计">
+            300,000.00元
+        </se>
+        <se label="服务名称">
+            运输服务费
+        </se>
+        <se label="销货清单">
+            需要
+        </se>
+        <se label="其他要求">
+            单位按吨
+        </se>
+
+    </div>
+</div>
+
+<st #st [data]="data" [columns]="columns" [page]="{ show: false}" [scroll]="{ x:'800px',y: '300px' }" class="mt-md">
+</st>
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.less
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.less
@ -0,0 +1,13 @@
+:host::ng-deep {
+
+    .statistics-box {
+        .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-control-input-content {
+                color: #f5222d;
+            }
+        }
+    }
+
+}
--- a/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/push-invoice/push-invoice.component.ts
@ -0,0 +1,52 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STComponent, STColumn } from '@delon/abc/st';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { TicketService } from '../../../services/ticket.service';
+
+@Component({
+  selector: 'app-push-invoice',
+  templateUrl: './push-invoice.component.html',
+  styleUrls: ['./push-invoice.component.less']
+})
+export class PushInvoiceComponent implements OnInit {
+
+  @ViewChild('st', { static: false })
+  st!: STComponent;
+  columns: STColumn[] = this.initST();
+  data = [
+    {
+      key: 0,
+      disabled: true,
+      href: 'https://ant.design',
+      avatar: 'https://gw.alipayobjects.com/zos/rmsportal/eeHMaZBwmTvLdIwMfBpg.png',
+      no: 'TradeCode 0'
+    },
+    {
+      key: 1,
+      disabled: false,
+      href: 'https://ant.design',
+      avatar: 'https://gw.alipayobjects.com/zos/rmsportal/udxAbMEhpwthVVcjLXik.png',
+      no: 'TradeCode 1'
+    }
+  ];
+
+  info = {};
+
+  constructor(public service: TicketService, private nzModalService: NzModalService) {}
+
+  ngOnInit(): void {}
+
+
+  private initST(): STColumn[] {
+    return [
+      { title: '服务名称', index: 'no', width: 100 },
+      { title: '规格型号', index: 'callNo', width: 100 },
+      { title: '单位', index: 'callNo', width: 90 },
+      { title: '数量', index: 'callNo', width: 90 },
+      { title: '金额', index: 'callNo', width: 90 },
+      { title: '税率', index: 'callNo', width: 90 },
+      { title: '税额', index: 'callNo', width: 90 },
+    ];
+  }
+
+}
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html
@ -0,0 +1,156 @@
+<page-header-wrapper [title]="'开票信息'" [logo]="logo">
+    <ng-template #logo>
+        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+            <i nz-icon nzType="left" nzTheme="outline"></i>
+        </button>
+    </ng-template>
+</page-header-wrapper>
+
+<nz-card class="statistics-box">
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+            <se label="销售方">
+                天津怡亚通物流科技有限公司
+            </se>
+            <se label="申请编号">
+                VP2021012010
+            </se>
+            <se label="发票号码">
+                051010100
+            </se>
+            <se label="发票代码">
+                54364653
+            </se>
+            <se label="开票日期">
+                2021-10-11
+            </se>
+            <se label="价税合计">
+                2205.00
+            </se>
+            <se label="税额">
+                182.06
+            </se>
+            <se label="票面备注">
+                订单号11-12
+            </se>
+        </div>
+        <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
+            <se label="购买方">
+                茅台股份有限公司
+            </se>
+            <se label="纳税号">
+                912301046656930913
+            </se>
+            <se label="地址">
+                贵州省贵阳市
+            </se>
+            <se label="电话">
+                075588393198
+            </se>
+            <se label="开户行">
+                中国工商银行股份有限公司哈贵阳支行
+            </se>
+            <se label="银行账户">
+                3500044119068126788
+            </se>
+            <se label="其他要求">
+                开票单位要吨
+            </se>
+        </div>
+        <div *ngIf="isCanEdit" nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" class="text-right">
+            <ng-container *ngIf="isEdit; else elseTemplate">
+                <button nz-button (click)="isEdit = false;invoiceST?.load(1)">取消</button>
+                <button nz-button nzType="primary" (click)="saveInvoices()">保 存</button>
+            </ng-container>
+            <ng-template #elseTemplate>
+                <button nz-button nzType="primary" (click)="isEdit = true">修改</button>
+            </ng-template>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card class="search-box" nzBordered>
+
+    <nz-tabset>
+        <nz-tab nzTitle="订单明细">
+            <div nz-row nzGutter="8" class="mb-md">
+                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+                    <sf #orderSf [schema]="orderSchema"
+                        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                        [button]="'none'"></sf>
+                </div>
+                <div nz-col [nzXl]=" 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+                    <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+                        (click)="orderST?.load(1)">查询</button>
+                    <button nz-button (click)="resetSF(1)">重置</button>
+                    <button nz-button> 导出</button>
+                </div>
+            </div>
+
+            <st #orderST [data]="service.$mock_url" [columns]="orderColumns" size="small" bordered="true"
+                [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: orderReqParams, process: beforeReq }"
+                [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+                [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '250px' }"></st>
+        </nz-tab>
+        <nz-tab nzTitle="费用明细">
+            <div nz-row nzGutter="8" class="mb-md">
+                <div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+                    <sf #costSf [schema]="costSchema"
+                        [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                        [button]="'none'"></sf>
+                </div>
+                <div nz-col [nzXl]=" 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+                    <button nz-button nzType="primary" [nzLoading]="service.http.loading"
+                        (click)="costST?.load(1)">查询</button>
+                    <button nz-button (click)="resetSF(2)">重置</button>
+                    <button nz-button> 导出</button>
+                </div>
+            </div>
+
+            <st #costST [data]="service.$mock_url" [columns]="costColumns" size="small" bordered="true"
+                [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: orderReqParams, process: beforeReq }"
+                [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+                [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '250px' }"></st>
+        </nz-tab>
+        <nz-tab nzTitle="发票明细">
+            <st #invoiceST [data]="service.$mock_url" [columns]="invoiceColumns" size="small" bordered="true"
+                [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: invoiceReqParams, process: beforeReq }"
+                [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+                [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+                [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '250px' }">
+                <ng-template st-row="owner" let-item let-index="index">
+                    <nz-select *ngIf="isEdit" [ngModel]="item.owner"
+                        (ngModelChange)="invoiceST.setRow(index, { owner: $event })" style="width: 100%;">
+                        <nz-option nzValue="曲丽丽" nzLabel="曲丽丽"></nz-option>
+                        <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+                    </nz-select>
+                    <ng-container *ngIf="!isEdit">{{ item.owner }}</ng-container>
+                </ng-template>
+                <ng-template st-row="callNo" let-item let-index="index">
+                    <input *ngIf="isEdit" nz-input [ngModel]="item.callNo"
+                        (ngModelChange)="invoiceST.setRow(index, { callNo: $event })" />
+                    <ng-container *ngIf="!isEdit">{{ item.callNo }}</ng-container>
+                </ng-template>
+                <ng-template st-row="progress" let-item let-index="index">
+                    <input *ngIf="isEdit" nz-input [ngModel]="item.progress"
+                        (ngModelChange)="invoiceST.setRow(index, { progress: $event })" />
+                    <ng-container *ngIf="!isEdit">{{ item.progress }}</ng-container>
+                </ng-template>
+                <ng-template st-row="status" let-item let-index="index">
+                    <input *ngIf="isEdit" nz-input [ngModel]="item.status"
+                        (ngModelChange)="invoiceST.setRow(index, { status: $event })" />
+                    <ng-container *ngIf="!isEdit">{{ item.status }}</ng-container>
+                </ng-template>
+            </st>
+        </nz-tab>
+        <nz-tab nzTitle="快递轨迹">
+            <p style="font-weight: 600;">顺丰快递: SF123456789 <nz-tag [nzColor]="'#2db7f5'" class="ml-md">已签收</nz-tag>
+            </p>
+            <app-logistics-time-line></app-logistics-time-line>
+        </nz-tab>
+    </nz-tabset>
+
+
+</nz-card>
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.less
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.less
@ -0,0 +1,35 @@
+:host::ng-deep {
+    .search-box {
+        .ant-card-body {
+            padding-bottom: 8px;
+            padding-top   : 8px;
+        }
+    }
+
+
+    .statistics-box {
+        .ant-card-body {
+            padding-bottom: 8px;
+            padding-top   : 8px;
+        }
+
+        .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-control-input-content {
+                color: #f5222d;
+            }
+        }
+    }
+}
+
+.expend-options {
+    margin-top: 0px;
+}
+
+@media (min-width: 990px) {
+    .expend-options {
+        margin-top: -40px;
+    }
+
+}
--- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts
@ -0,0 +1,177 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
+import { SFComponent, SFSchema } from '@delon/form';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { TicketService } from '../../services/ticket.service';
+
+@Component({
+  selector: 'app-invoice-detail',
+  templateUrl: './invoice-detail.component.html',
+  styleUrls: ['./invoice-detail.component.less']
+})
+export class InvoiceDetailComponent implements OnInit {
+  @ViewChild('orderST', { static: true })
+  orderST!: STComponent;
+  @ViewChild('orderSf', { static: false })
+  orderSf!: SFComponent;
+  orderColumns: STColumn[] = this.initOrderST();
+  orderSchema: SFSchema = this.initOrderSF();
+  ordeReqParams = {};
+
+  @ViewChild('costST', { static: true })
+  costST!: STComponent;
+  @ViewChild('costSf', { static: false })
+  costSf!: SFComponent;
+  costColumns: STColumn[] = this.initCostST();
+  costSchema: SFSchema = this.initCostSF();
+  orderReqParams = {};
+
+  @ViewChild('invoiceST', { static: true })
+  invoiceST!: STComponent;
+  invoiceColumns: STColumn[] = this.initInvoiceST();
+  invoiceReqParams = {};
+
+  isCanEdit = false;
+  isEdit = false;
+
+  constructor(public service: TicketService, private route: ActivatedRoute) {
+    this.isCanEdit = !!route.snapshot.queryParams.type;
+  }
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.orderSf) {
+      this.orderReqParams = { ...this.orderSf.value };
+    }
+    if (this.costSf) {
+      this.orderReqParams = { ...this.costSf.value };
+    }
+    return requestOptions;
+  };
+
+  goBack() {
+    history.go(-1);
+  }
+
+  saveInvoices() {
+    console.log(this.invoiceST._data);
+
+    this.isEdit = false;
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF(tab: number) {
+    switch (tab) {
+      case 1:
+        this.orderSf.reset();
+        break;
+      case 2:
+        this.costSf.reset();
+        break;
+
+      default:
+        break;
+    }
+  }
+
+
+  private initOrderSF(): SFSchema {
+    return {
+      properties: {
+        orderSn: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            autocomplete: 'off'
+          }
+        },
+        receiveName: {
+          type: 'string',
+          title: '订单类型',
+          enum: [{ label: '全部', value: '' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        },
+        receiveNa22me: {
+          type: 'string',
+          title: '所属项',
+          enum: [{ label: '全部', value: '' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        }
+      }
+    };
+  }
+
+  private initOrderST(): STColumn[] {
+    return [
+      { title: '订单号', index: 'no' },
+      { title: '订单完成日期', index: 'callNo', type: 'date' },
+      { title: '所属项目', index: 'callNo' },
+      { title: '订单类型', index: 'callNo' },
+      { title: '装货地', index: 'callNo' },
+      { title: '卸货地', index: 'callNo' },
+      { title: '货物信息', index: 'callNo' },
+      { title: '承运司机', index: 'callNo', format: item => `特朗普&#10; 13789040523 &#10;粤GT8419` },
+      { title: '申请金额', index: 'callNo' },
+      { title: '运输费', index: 'callNo' },
+      { title: '附加费', index: 'callNo' },
+      { title: '开票金额', index: 'callNo' }
+    ];
+  }
+
+  private initCostSF(): SFSchema {
+    return {
+      properties: {
+        orderSn: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            autocomplete: 'off'
+          }
+        },
+        orderS2n: {
+          type: 'string',
+          title: '费用号',
+          ui: {
+            autocomplete: 'off'
+          }
+        }
+      }
+    };
+  }
+
+  private initCostST(): STColumn[] {
+    return [
+      { title: '费用号', index: 'no' },
+      { title: '订单号', index: 'callNo' },
+      { title: '订单日期', index: 'callNo', type: 'date' },
+      { title: '计费日期', index: 'callNo', type: 'date' },
+      { title: '税率', index: 'callNo' },
+      { title: '申请金额', index: 'callNo' },
+      { title: '开票金额', index: 'callNo' }
+    ];
+  }
+
+  private initInvoiceST(): STColumn[] {
+    return [
+      { title: '服务名称', render: 'owner' },
+      { title: '规格型号', render: 'callNo' },
+      { title: '单位', render: 'progress' },
+      { title: '数量', render: 'status' },
+      { title: '金额', index: 'callNo' },
+      { title: '税率', index: 'callNo' },
+      { title: '税额', index: 'callNo' }
+    ];
+  }
+}
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
@ -100,7 +100,7 @@
    </div>

    <st #st [data]="service.$mock_url" [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.records', total: 'data.total' } }"
        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }" (change)="stChange($event)"></st>
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFDateWidgetSchema, SFTextWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { TicketService } from '../../../services/ticket.service';
@ -30,6 +30,13 @@ export class InvoiceRequestedDetailComponent implements OnInit {

  ngOnInit(): void {}

+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      this.reqParams = { ...this.sf.value };
+    }
+    return requestOptions;
+  };
+
  stChange(e: STChange): void {
    switch (e.type) {
      case 'checkbox':
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@ -13,7 +13,6 @@ import { RequestedInvoiceModalComponent } from './requested-invoice-modal/reques
  styleUrls: ['./invoice-requested.component.less']
 })
 export class InvoiceRequestedComponent implements OnInit {
-  url = `/rule?_allow_anonymous=true`;
  @ViewChild('st', { static: true })
  st!: STComponent;
  @ViewChild('sf', { static: false })
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.html
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.html
@ -1,61 +0,0 @@
-<page-header-wrapper [title]="'开票订单明细'" [logo]="logo">
-    <ng-template #logo>
-        <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
-            <i nz-icon nzType="left" nzTheme="outline"></i>
-        </button>
-    </ng-template>
-</page-header-wrapper>
-
-<nz-card>
-    <nz-row [nzGutter]="16">
-        <nz-col [nzXl]="4" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="05101010" [nzTitle]="'发票号码'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="4" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="100000.00" [nzTitle]="'开票金额'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="3" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="20" [nzTitle]="'订单数'" [nzValueStyle]="{'font-size':'21px'}"></nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="3" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="2021-10-11" [nzTitle]="'开票日期'" [nzValueStyle]="{'font-size':'21px'}"></nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="12">
-            <nz-statistic nzValue="茅台集团股份有限公司" [nzTitle]="'托运人'" [nzValueStyle]="{'font-size':'21px'}"></nz-statistic>
-        </nz-col>
-        <nz-col [nzXl]="5" [nzLg]="8" [nzSm]="18">
-            <nz-statistic nzValue="天津怡亚通物流科技有限公司" [nzTitle]="'开票方'" [nzValueStyle]="{'font-size':'21px'}">
-            </nz-statistic>
-        </nz-col>
-    </nz-row>
-</nz-card>
-
-<nz-card class="search-box" nzBordered>
-    <div nz-row nzGutter="8">
-        <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-            <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
-                [button]="'none'"></sf>
-        </div>
-        <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
-            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> 导出</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-                {{ !_$expand ? '展开' : '收起' }}
-                <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-        </div>
-    </div>
-</nz-card>
-
-<nz-card class="content-box" nzBordered>
-    <st #st [data]="url" [columns]="columns"
-        [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]="service.http.loading" [scroll]="{ x:'1200px',y: '330px' }" (change)="stChange($event)"></st>
-</nz-card>
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.less
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.less
@ -1,24 +0,0 @@
-:host::ng-deep {
-    .search-box {
-        .ant-card-body {
-            padding-bottom: 18px;
-        }
-    }
-
-    .content-box {
-        .ant-card-body {
-            padding-top: 16px;
-        }
-    }
-}
-
-.expend-options {
-    margin-top: 0px;
-}
-
-@media (min-width: 990px) {
-    .expend-options {
-        margin-top: -40px;
-    }
-
-}
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component.ts
@ -1,121 +0,0 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange } from '@delon/abc/st';
-import { SFComponent, SFSchema } from '@delon/form';
-import { NzModalService } from 'ng-zorro-antd/modal';
-import { TicketService } from '../../../services/ticket.service';
-
-@Component({
-  selector: 'app-invoiced-list-detail',
-  templateUrl: './invoiced-list-detail.component.html',
-  styleUrls: ['./invoiced-list-detail.component.less']
-})
-export class InvoicedListDetailComponent implements OnInit {
-  url = `/rule?_allow_anonymous=true`;
-  @ViewChild('st', { static: true })
-  st!: STComponent;
-  @ViewChild('sf', { static: false })
-  sf!: SFComponent;
-  columns: STColumn[] = [
-    { title: '订单号', index: 'no' },
-    { title: '外部订单号', index: 'callNo' },
-    { title: '装货地', index: 'callNo' },
-    { title: '卸货地', index: 'callNo' },
-    { title: '货物名称', index: 'callNo' },
-    { title: '重量/体积', index: 'callNo' },
-    { title: '开票金额', index: 'callNo' },
-    { title: '总费用', index: 'callNo' },
-    { title: '基础运费', index: 'callNo' },
-    { title: '附加费', index: 'callNo' },
-  ];
-  searchSchema: SFSchema = {
-    properties: {
-      expand: {
-        type: 'boolean',
-        ui: {
-          hidden: true
-        }
-      },
-      orderSn: {
-        type: 'string',
-        title: '订单号',
-        ui: {
-          autocomplete: 'off'
-        }
-      },
-      orderSn2: {
-        type: 'string',
-        title: '外部订单号',
-        ui: {
-          autocomplete: 'off'
-        }
-      },
-      orderSn3: {
-        type: 'string',
-        title: '发票号码',
-        ui: {
-          autocomplete: 'off'
-        }
-      },
-      receiveName: {
-        type: 'string',
-        title: '开票状态',
-        enum: [
-          { label: '全部', value: '' },
-          { label: '待受理', value: '待受理' },
-          { label: '待开票', value: '待开票' },
-          { label: '开票中', value: '开票中' },
-          { label: '已开票', value: '已开票' },
-          { label: '已撤销', value: '已撤销' },
-          { label: '已拒绝', value: '已拒绝' }
-        ],
-        ui: {
-          widget: 'select',
-          placeholder: '请选择',
-          change: (i: any) => {
-            this.sf.value.receiveName = i;
-            this.sf?.setValue('/receiveName', i);
-          },
-          visibleIf: {
-            expand: (value: boolean) => value
-          }
-        },
-        default: ''
-      }
-    }
-  };
-
-  reqParams = {};
-  _$expand = false;
-  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
-
-  ngOnInit(): void {}
-
-  stChange(e: STChange): void {
-    switch (e.type) {
-      case 'filter':
-        this.st.load();
-        break;
-    }
-  }
-
-  goBack() {
-    history.go(-1);
-  }
-
-  /**
-   * 重置表单
-   */
-  resetSF() {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle() {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/expand', this._$expand);
-  }
-}
--- a/src/app/routes/ticket-management/ticket-management-routing.module.ts
+++ b/src/app/routes/ticket-management/ticket-management-routing.module.ts
@ -1,19 +1,22 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
+import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component';
 import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist.component';
 import { ETCInvoicedListComponent } from './components/etc-invoiced-list/etc-invoiced-list.component';
 import { ETCInvoicedLogsComponent } from './components/etc-invoiced-logs/etc-invoiced-logs.component';
 import { ETCInvoicedRequestedComponent } from './components/etc-invoiced-requested/etc-invoiced-requested.component';
+import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component';
 import { InvoiceRequestedDetailComponent } from './components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component';
 import { InvoiceRequestedComponent } from './components/invoice-requested/invoice-requested.component';
-import { InvoicedListDetailComponent } from './components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component';
 import { InvoicedListComponent } from './components/invoiced-list/invoiced-list.component';

 const routes: Routes = [
  { path: 'invoice-requested', component: InvoiceRequestedComponent },
  { path: 'invoice-requested/detail/:id', component: InvoiceRequestedDetailComponent },
  { path: 'invoice-list', component: InvoicedListComponent },
-  { path: 'invoice-list/detail/:id', component: InvoicedListDetailComponent },
+  { path: 'invoice-list/detail/:id', component: InvoiceDetailComponent },
+  { path: 'cancellation-invoice', component: CancellationInvoiceComponent },
+  { path: 'cancellation-invoice/detail/:id', component: InvoiceDetailComponent },
  { path: 'etc-invoice-requested', component: ETCInvoicedRequestedComponent },
  { path: 'etc-invoice-list', component: ETCInvoicedListComponent },
  { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent },
--- a/src/app/routes/ticket-management/ticket-management.module.ts
+++ b/src/app/routes/ticket-management/ticket-management.module.ts
@ -9,10 +9,12 @@ import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist.
 import { InvoicedListComponent } from './components/invoiced-list/invoiced-list.component';
 import { InvoiceRequestedComponent } from './components/invoice-requested/invoice-requested.component';
 import { InvoiceRequestedDetailComponent } from './components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component';
-import { InvoicedListDetailComponent } from './components/invoiced-list/invoiced-list-detail/invoiced-list-detail.component';
 import { TransactionDetailsComponent } from './components/etc-invoiced-list/transaction-details/transaction-details.component';
 import { RequestedInvoiceModalComponent } from './components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component';
 import { RequestedDetailComponent } from './components/invoice-requested/requested-detail/requested-detail.component';
+import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component';
+import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component';
+import { PushInvoiceComponent } from './components/cancellation-invoice/push-invoice/push-invoice.component';

 const COMPONENTS: any = [
  ETCInvoicedListComponent,
@ -22,11 +24,12 @@ const COMPONENTS: any = [
  InvoiceRequestedComponent,
  InvoicedListComponent,
  InvoiceRequestedDetailComponent,
-  InvoicedListDetailComponent
+  InvoiceDetailComponent,
+  CancellationInvoiceComponent
 ];
 const NOTROUTECOMPONENTS: any = [TransactionDetailsComponent, RequestedInvoiceModalComponent, RequestedDetailComponent];
@NgModule({
-  declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
+  declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS, PushInvoiceComponent],
  imports: [CommonModule, TicketManagementRoutingModule, SharedModule]
 })
 export class TicketManagementModule {}
--- a/src/app/shared/components/logistics-time-line/logistics-time-line.component.less
+++ b/src/app/shared/components/logistics-time-line/logistics-time-line.component.less
@ -20,7 +20,7 @@
    .ant-timeline.ant-timeline-alternate .ant-timeline-item-left .ant-timeline-item-content,
    .ant-timeline.ant-timeline-right .ant-timeline-item-left .ant-timeline-item-content,
    .ant-timeline.ant-timeline-label .ant-timeline-item-left .ant-timeline-item-content {
-        left      : calc(50% - 135px);
+        left      : 135px;
        width     : calc(100% - 150px);
        text-align: left;
    }
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@ -317,12 +317,21 @@
                    "link": "/ticket/invoice-requested/detail/:id",
                    "hide": true
                  },
+                  {
+                    "text": "销票处理",
+                    "link": "/ticket/cancellation-invoice"
+                  },
+                  {
+                    "text": "销票订单明细",
+                    "link": "/ticket/cancellation-invoice/detail/:id",
+                    "hide": true
+                  },
                  {
                    "text": "已开发票",
                    "link": "/ticket/invoice-list"
                  },
                  {
-                    "text": "已开发票明细",
+                    "text": "已开订单明细",
                    "link": "/ticket/invoice-list/detail/:id",
                    "hide": true
                  }