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

src/app/routes/commom/less/expend-but.less

@@ -5,7 +5,7 @@
 
 @media (min-width: 1200px) {
     .expend-options {
-        max-width: 400px;
+        max-width: 450px;
         position : absolute;
         right    : 0;
         bottom   : 25px;

src/app/routes/financial-management/components/cost-management/cost-management.component.ts

@@ -253,17 +253,17 @@ export class CostManagementComponent implements OnInit {
       { title: '订单号', index: 'billHId', width: 120 },
       { title: '运单号', index: 'waybillHId', width: 120 },
       { title: '费用日期', index: 'feedate', width: 150 },
-      { title: '费用类型', index: 'feetype', width: 100 },
+      { title: '费用类型', index: 'feetypeLabel', width: 100 },
-      { title: '应付核销', index: 'ishrhx', width: 100 },
+      { title: '应付核销', index: 'ishrhx', width: 100, type: 'enum', enum: { 0: '否', 1: '是' } },
       { title: '结算客户', index: 'cno', width: 100 },
       { title: '应收对象', index: 'artoname', width: 100 },
-      { title: '应付对象', render: 'hrtoname', width: 100 },
+      { title: '应付对象', index: 'hrtoname', width: 100 },
-      { title: '应收金额', render: 'armoeny', width: 100 },
+      { title: '应收金额', index: 'armoeny', width: 100 },
-      { title: '应付金额', render: 'hrmoney', width: 100 },
+      { title: '应付金额', index: 'hrmoney', width: 100 },
-      { title: '收/付款金额', render: 'hrpaymoney', width: 120 },
+      { title: '收/付款金额', index: 'hrpaymoney', width: 120 },
-      { title: '开/收票金额', render: 'hrvatmoney', width: 120 },
+      { title: '开/收票金额', index: 'hrvatmoney', width: 120 },
       { title: '创建时间', index: 'auditTime', type: 'date', width: 150 },
-      { title: '状态', render: 'sts', width: 90 },
+      { title: '状态', index: 'stsLabel', width: 90 },
       {
         title: '操作',
         fixed: 'right',
@@ -276,7 +276,8 @@ export class CostManagementComponent implements OnInit {
           },
           {
             text: '审核',
-            click: item => this.auditAction(item)
+            click: item => this.auditAction(item),
+            iif: item => item.sts === 2
           },
           {
             text: '修改',

src/app/routes/financial-management/components/payment-order/payment-order.component.html

@@ -0,0 +1,43 @@
+<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 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <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 (click)="resetSF()">重置</button>
+            <button nz-button> 导出</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>
+
+    <div class="d-flex align-items-center mb-md mt-md">
+        <button nz-button (click)="this.addInvoice()" nzType="primary">添加付款</button>
+        <button nz-button (click)="this.addInvoice()" nzType="primary">导入付款</button>
+        <div class="ml-md">
+            已选择
+            <strong class="text-primary">{{ selectedRows.length }}</strong> 张单
+            <a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
+        </div>
+    </div>
+
+    <st #st [data]="service.$mock_url" [columns]="columns"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, 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)">
+    </st>
+</nz-card>

src/app/routes/financial-management/components/payment-order/payment-order.component.ts

@@ -0,0 +1,257 @@
+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 { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
+import { TicketService } from 'src/app/routes/ticket-management/services/ticket.service';
+
+@Component({
+  selector: 'app-payment-order',
+  templateUrl: './payment-order.component.html',
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+})
+export class PaymentOrderComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  _$expand = false;
+
+  selectedRows: any[] = [];
+  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value
+      });
+    }
+    return requestOptions;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+    }
+  }
+
+  addInvoice() {
+    if (this.selectedRows?.length <= 0) {
+      this.service.msgSrv.warning('请选择付款单');
+      return;
+    }
+    const modal = this.nzModalService.create({
+      nzTitle: '付款单',
+      nzContent: AddCollectionInvoiceModalComponent,
+      nzComponentParams: { i: { userId: 0 } },
+      nzFooter: null
+    });
+  }
+
+  /**
+   * 重置表单
+   */
+  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: {
+            autocomplete: 'off',
+            placeholder: '请输入'
+          }
+        },
+        ltdId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          },
+          default: ''
+        },
+        orderS2n: {
+          type: 'string',
+          title: '付款状态',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择'
+          }
+        },
+        order2S2n: {
+          type: 'string',
+          title: '付款类型',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        order22S2n: {
+          type: 'string',
+          title: '付款方式',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        order221S2n: {
+          type: 'string',
+          title: '收款人',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        orderS12n: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        createTime: {
+          title: '要求付款日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTi1me: {
+          title: '确认日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        orderS1n2: {
+          type: 'string',
+          title: '运单号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        orderS3: {
+          type: 'string',
+          title: '费用号',
+          ui: {
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        createT1i1me: {
+          title: '创建时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        orderSn4: {
+          type: 'string',
+          title: '付款备注',
+          ui: {
+            autocomplete: 'off',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '付款单号', index: 'no', type: 'link' },
+      { title: '网络货运人', index: 'no' },
+      { title: '要求付款日期', index: 'no', type: 'date', width: 140 },
+      { title: '付款金额', index: 'callNo' },
+      { title: '付款类型', index: 'callNo' },
+      { title: '付款方式', index: 'call1No' },
+      { title: '结算客户', index: 'call1N2o' },
+      { title: '收款人', index: 'callNo' },
+      { title: '应付已核销', index: 'callNo' },
+      { title: '确认日期', index: 'updatedAt', type: 'date' },
+      { title: '创建时间', index: 'updatedAt', type: 'date' },
+      { title: '创建人', index: 'callNo' },
+      { title: '付款备注', index: 'callNo' },
+      {
+        title: '操作',
+        buttons: [
+          {
+            text: '浏览',
+            click: item => this.router.navigate(['/ticket/input-invoice/detail/1'])
+          },
+          {
+            text: '修改',
+            click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
+          }
+        ]
+      }
+    ];
+  }
+}

src/app/routes/financial-management/components/receipt-order/receipt-order.component.html

@@ -0,0 +1 @@
+<p>receipt-order works!</p>

src/app/routes/financial-management/components/receipt-order/receipt-order.component.spec.ts

@@ -0,0 +1,25 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ReceiptOrderComponent } from './receipt-order.component';
+
+describe('ReceiptOrderComponent', () => {
+  let component: ReceiptOrderComponent;
+  let fixture: ComponentFixture<ReceiptOrderComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ReceiptOrderComponent ]
+    })
+    .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ReceiptOrderComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-receipt-order',
+  templateUrl: './receipt-order.component.html',
+  styleUrls: ['./receipt-order.component.less']
+})
+export class ReceiptOrderComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

src/app/routes/financial-management/financial-managemen-routing.module.ts

@@ -14,6 +14,8 @@ import { TransactionFlowComponent } from './components/transaction-flow/transact
 import { CostManagementDetailComponent } from './components/cost-management/cost-management-detail/cost-management-detail.component';
 import { ExpensesReceivableComponent } from './components/cost-management/expenses-receivable/expenses-receivable.component';
 import { ExpensesPayableComponent } from './components/cost-management/expenses-payable/expenses-payable.component';
+import { PaymentOrderComponent } from './components/payment-order/payment-order.component';
+import { ReceiptOrderComponent } from './components/receipt-order/receipt-order.component';
 
 const routes: Routes = [
   { path: 'freight-account', component: FreightAccountComponent },
@@ -32,6 +34,8 @@ const routes: Routes = [
   { path: 'abnormal-gold', component: AbnormalGoldComponent },
   { path: 'payment-record', component: PaymentRecordComponent },
   { path: 'transaction-flow', component: TransactionFlowComponent },
+  { path: 'payment-order', component: PaymentOrderComponent },
+  { path: 'receipt-order', component: ReceiptOrderComponent },
 ];
 
 @NgModule({

src/app/routes/financial-management/financial-management.module.ts

@@ -18,6 +18,8 @@ import { ClearingModalComponent } from './components/abnormal-gold/clearing-moda
 import { CostManagementDetailComponent } from './components/cost-management/cost-management-detail/cost-management-detail.component';
 import { ExpensesReceivableComponent } from './components/cost-management/expenses-receivable/expenses-receivable.component';
 import { ExpensesPayableComponent } from './components/cost-management/expenses-payable/expenses-payable.component';
+import { PaymentOrderComponent } from './components/payment-order/payment-order.component';
+import { ReceiptOrderComponent } from './components/receipt-order/receipt-order.component';
 
 const ROUTESCOMPONENTS = [
   FreightAccountComponent,
@@ -31,7 +33,9 @@ const ROUTESCOMPONENTS = [
   CostManagementComponent,
   CostManagementDetailComponent,
   ExpensesReceivableComponent,
-  ExpensesPayableComponent
+  ExpensesPayableComponent,
+  PaymentOrderComponent,
+  ReceiptOrderComponent
 ];
 
 const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, SettingFinancialComponent, ClearingModalComponent];

src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.html

@@ -0,0 +1,7 @@
+<div>
+    <sf #sf [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 22 } } }" [schema]="schema" [button]="'none'"></sf>
+</div>
+<div class="modal-footer">
+    <button nz-button type="button" (click)="close()">取消</button>
+    <button nz-button type="button" nzType="primary" (click)="sure()" [disabled]="!sf.valid">保存</button>
+</div>

src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.less

@@ -0,0 +1,5 @@
+:host::ng-deep {
+    nz-date-picker {
+        width: 100%;
+    }
+}

src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.ts

@@ -0,0 +1,102 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { map } from 'rxjs/operators';
+import { SystemService } from 'src/app/routes/sys-setting/services/system.service';
+import { TicketService } from '../../../services/ticket.service';
+
+@Component({
+  selector: 'app-add-collection-invoice-modal',
+  templateUrl: './add-collection-invoice-modal.component.html',
+  styleUrls: ['./add-collection-invoice-modal.component.less']
+})
+export class AddCollectionInvoiceModalComponent implements OnInit {
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  i: any;
+  schema!: SFSchema;
+  constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public service: TicketService) {}
+
+  ngOnInit(): void {
+    this.initSF();
+  }
+  initSF() {
+    this.schema = {
+      properties: {
+        ltdId: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          },
+          default: ''
+        },
+        ltd2Id: {
+          type: 'string',
+          title: '销售方',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        },
+        ltd2I1d: {
+          type: 'string',
+          title: '收票类型',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        },
+        createTime: {
+          title: '发票日期',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true
+          } as SFDateWidgetSchema
+        },
+        vatinvcode: {
+          type: 'string',
+          title: '发票号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        vatinvc2ode: {
+          type: 'string',
+          title: '收票备注',
+          ui: {
+            placeholder: '请输入'
+          }
+        }
+      },
+      required: ['ltdId', 'ltd2Id', 'createTime', 'ltd2I1d', 'vatinvcode']
+    };
+  }
+
+  sure() {
+    const params: any = {
+      ...this.sf.value
+    };
+    // this.service.request(this.service.$api_add_staff, params).subscribe(res => {
+    //   if (res) {
+    //     this.service.msgSrv.success('保存成功！');
+    //     this.modal.close(true);
+    //   }
+    // });
+  }
+
+  close() {
+    this.modal.destroy();
+  }
+}

src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.html

@@ -0,0 +1,22 @@
+<div nz-row nzGutter="8">
+    <div nz-col nzSpan="24">
+        <sf #sf [schema]="searchSchema" [ui]="{ '*': {grid: { span: 12 } }}" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="24" class="text-right mb-md expend-options">
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button (click)="resetSF()">重置</button>
+    </div>
+</div>
+
+<st #st [data]="service.$mock_url" [columns]="columns" bordered size="small"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }" [loading]="service.http.loading"
+    [scroll]="{ x:'810px',y: '400px' }" (change)="stChange($event)" class="mt-sm">
+    <ng-template st-row="no" let-item let-index="index" let-column="column">
+        {{index+1}}
+    </ng-template>
+    <ng-template st-row="mo1bile" let-item let-index="index" let-column="column">
+        <input nz-input placeholder="请输入" [(ngModel)]="item.mo1bile" />
+    </ng-template>
+</st>

src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.less

@@ -0,0 +1,6 @@
+.expend-options {
+    max-width: 400px;
+    position : absolute;
+    right    : 20px;
+    top      : 160px;
+}

src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts

@@ -0,0 +1,110 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
+import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { TicketService } from '../../../services/ticket.service';
+
+@Component({
+  selector: 'app-add-cost-detail',
+  templateUrl: './add-cost-detail.component.html',
+  styleUrls: ['./add-cost-detail.component.less']
+})
+export class AddCostDetailComponent implements OnInit {
+  selectedData: any[] = [];
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('sf', { static: false })
+  sf!: SFComponent;
+  columns: STColumn[] = this.initST();
+  searchSchema: SFSchema = this.initSF();
+
+  constructor(public service: TicketService) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.sf) {
+      Object.assign(requestOptions.body, {
+        ...this.sf.value
+      });
+    }
+    return requestOptions;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedData = e.checkbox!;
+        break;
+    }
+  }
+
+  /**
+   * 重置表单
+   */
+  resetSF() {
+    this.sf.reset();
+  }
+
+  private initSF(): SFSchema {
+    return {
+      properties: {
+        enterpriseName: {
+          title: '费用单号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        enterprise2Name: {
+          title: '订单号',
+          type: 'string',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        contactName: {
+          title: '费用日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd'
+          } as SFDateWidgetSchema
+        },
+        contac2tName: {
+          title: '订单日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd'
+          } as SFDateWidgetSchema
+        },
+        mobile: {
+          type: 'string',
+          title: '结算客户',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择'
+          }
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox', width: 60 },
+      { title: '序号', render: 'no', width: 60 },
+      { title: '费用号', index: 'enterpriseName', width: 120 },
+      { title: '费用日期', index: 'contacter', width: 120 },
+      { title: '订单号', index: 'mobile', width: 120 },
+      { title: '订单日期', index: 'mobile', width: 120 },
+      { title: '结算客户', index: 'mobile', width: 120 },
+      { title: '费用科目', index: 'mobile', width: 120 },
+      { title: '费用金额', index: 'mobile', width: 120 },
+      { title: '已收金额', index: 'mobile', width: 120 },
+      { title: '未收金额', index: 'mobile', width: 120 },
+      { title: '收票金额', render: 'mo1bile', width: 150, fixed: 'right' }
+    ];
+  }
+}

src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.html

@@ -0,0 +1,55 @@
+<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="search-box" nzBordered nzTitle="基本信息">
+    <div nz-row nzGutter="8">
+        <div nz-col [nzXl]="24" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+            <sf #infoSf [schema]="infoSchema"
+                [ui]="{ '*': { spanLabelFixed: 100,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                [button]="'none'"></sf>
+        </div>
+        <div nz-col [nzXl]="24" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
+            <button nz-button nzType="primary" [nzLoading]="service.http.loading">保 存</button>
+            <button nz-button nzType="primary" [nzLoading]="service.http.loading">提 交</button>
+        </div>
+    </div>
+</nz-card>
+
+<nz-card class="search-box" nzBordered nzTitle="费用信息">
+    <nz-card class="search-box">
+        <div nz-row nzGutter="8">
+            <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
+                <sf #searchSf [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 nzType="link" (click)="expandToggle()">
+                    {{ !_$expand ? '展开' : '收起' }}
+                    <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+                </button>
+            </div>
+        </div>
+    </nz-card>
+
+    <nz-card class="content-box">
+        <div class="d-flex align-items-center mb-md mt-sm">
+            <button nz-button nzType="primary" (click)="addCostDetailAction()">添 加</button>
+            <button nz-button nzType="primary">删 除</button>
+        </div>
+
+        <st #st [data]="service.$api_get_invoice_requested_order_detail" [columns]="columns" size="small" bordered
+            [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, 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>
+    </nz-card>
+</nz-card>

src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.less

@@ -0,0 +1,5 @@
+:host::ng-deep {
+    nz-date-picker {
+        width: 100%;
+    }
+}

src/app/routes/ticket-management/components/input-invoice/edit-collection-invoice/edit-collection-invoice.component.ts

@@ -0,0 +1,209 @@
+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 { AddCostDetailComponent } from '../add-cost-detail/add-cost-detail.component';
+
+@Component({
+  selector: 'app-edit-collection-invoice',
+  templateUrl: './edit-collection-invoice.component.html',
+  styleUrls: ['./edit-collection-invoice.component.less', '../../../../commom/less/box.less', '../../../../commom/less/expend-but.less']
+})
+export class EditCollectionInvoiceComponent implements OnInit {
+  @ViewChild('st', { static: true })
+  st!: STComponent;
+  @ViewChild('infoSf', { static: false })
+  infoSf!: SFComponent;
+  infoSchema: SFSchema = this.initInfoSF();
+  @ViewChild('searchSf', { static: false })
+  searchSf!: SFComponent;
+  searchSchema: SFSchema = this.initSearchSF();
+  columns: STColumn[] = this.initST();
+
+  selectedRows: any[] = [];
+  _$expand = false;
+
+  constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+
+  ngOnInit(): void {}
+
+  beforeReq = (requestOptions: STRequestOptions) => {
+    if (this.searchSf) {
+      Object.assign(requestOptions.body, { ...this.searchSf.value });
+    }
+    return requestOptions;
+  };
+
+  stChange(e: STChange): void {
+    switch (e.type) {
+      case 'checkbox':
+        this.selectedRows = e.checkbox!;
+        break;
+    }
+  }
+
+  addCostDetailAction() {
+    const modal = this.nzModalService.create({
+      nzTitle: '添加核销明细',
+      nzContent: AddCostDetailComponent,
+      nzWidth: 850,
+      nzOkText: '保存',
+      nzOnOk: com => {
+        return false;
+      }
+    });
+    modal.afterClose.subscribe(res => {
+      if (res) {
+        this.st.load();
+      }
+    });
+  }
+
+  goBack() {
+    history.go(-1);
+  }
+
+  /**
+   * 伸缩查询条件
+   */
+  expandToggle() {
+    this._$expand = !this._$expand;
+    this.searchSf?.setValue('/expand', this._$expand);
+  }
+
+  private initInfoSF(): SFSchema {
+    return {
+      properties: {
+        orderSn: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'text'
+          },
+          default: '天津怡亚通物流科技有限公司'
+        },
+        orde1rSn: {
+          type: 'string',
+          title: '销售方',
+          ui: {
+            widget: 'text'
+          },
+          default: '天津怡亚通物流科技有限公司'
+        },
+        ord0erSn1: {
+          type: 'string',
+          title: '收票类型',
+          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择'
+          },
+          default: ''
+        },
+        orderSn2: {
+          title: '发票日期',
+          type: 'string',
+          ui: {
+            widget: 'date',
+            format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true
+          } as SFDateWidgetSchema
+        },
+        orderS3: {
+          type: 'string',
+          title: '发票号',
+          ui: {
+            placeholder: '请输入'
+          }
+        },
+        orderSn4: {
+          type: 'string',
+          title: '收票备注',
+          ui: {
+            placeholder: '请输入'
+          }
+        }
+      },
+      required: ['']
+    };
+  }
+
+  private initSearchSF(): SFSchema {
+    return {
+      properties: {
+        expand: {
+          type: 'boolean',
+          ui: {
+            hidden: true
+          }
+        },
+        orderSn: {
+          type: 'string',
+          title: '费用单号',
+          ui: {
+            autocomplete: 'off',
+            placeholder: '请输入'
+          }
+        },
+        orderS2n: {
+          type: 'string',
+          title: '订单号',
+          ui: {
+            autocomplete: 'off',
+            placeholder: '请输入'
+          }
+        },
+        order2S2n: {
+          type: 'string',
+          title: '结算客户',
+          ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
+            placeholder: '请选择'
+          }
+        },
+        createTime: {
+          title: '费用日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        createTi2me: {
+          title: '订单日期',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        }
+      }
+    };
+  }
+
+  private initST(): STColumn[] {
+    return [
+      { title: '', index: 'key', type: 'checkbox' },
+      { title: '序号', index: 'no', type: 'link' },
+      { title: '费用号', index: 'no' },
+      { title: '费用日期', index: 'no', type: 'date' },
+      { title: '订单号', index: 'callNo' },
+      { title: '订单日期', index: 'callNo' },
+      { title: '结算客户', render: 'call1No' },
+      { title: '费用科目', render: 'call1N2o' },
+      { title: '费用金额', index: 'callNo' },
+      { title: '收票金额', index: 'updatedAt', type: 'date' },
+      { title: '收票税额', index: 'updatedAt' }
+    ];
+  }
+}

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

@@ -10,26 +10,26 @@
     <div nz-row nzGutter="8">
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
             <se label="网络货运人" required>
-                {{headerInfo?.ltdidName}}
+                {{headerInfo?.ltdid}}
             </se>
             <se label="发票日期" required>
-                2021-12-11
+                {{headerInfo?.invdate}}
             </se>
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
             <se label="销售方" required>
-                {{headerInfo?.projectName}}
+                {{headerInfo?.hrto}}
             </se>
             <se label="发票号" required>
-                {{headerInfo?.taxNumber}}
+                {{headerInfo?.invoiceno}}
             </se>
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
             <se label="收票类型" required>
-                {{headerInfo?.vatname}}
+                {{headerInfo?.invtype}}
             </se>
             <se label="收票备注">
-                {{headerInfo?.isdetail}}
+                {{headerInfo?.remarks}}
             </se>
         </div>
     </div>
@@ -55,7 +55,7 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_invoice_requested_order_detail" [columns]="columns" size="small"
+    <st #st [data]="service.$api_get_input_invoice_detail_page" [columns]="columns" size="small"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, 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] }"

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

@@ -31,7 +31,7 @@ export class InputInvoiceDetailComponent implements OnInit {
   ngOnInit(): void {}
 
   loadHeadInfo() {
-    this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
+    this.service.request(this.service.$api_get_input_invoice_header, { id: this.id }).subscribe(res => {
       console.log(res);
       if (res) {
         this.headerInfo = res;
@@ -41,7 +41,17 @@ export class InputInvoiceDetailComponent implements OnInit {
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      Object.assign(requestOptions.body, { ...this.sf.value });
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        billTime: {
+          start: this.sf.value.billTime?.[0] || null,
+          end: this.sf.value.billTime?.[1] || null
+        },
+        feedate: {
+          start: this.sf.value.feedate?.[0] || null,
+          end: this.sf.value.feedate?.[1] || null
+        }
+      });
     }
     return requestOptions;
   };
@@ -74,21 +84,21 @@ export class InputInvoiceDetailComponent implements OnInit {
             hidden: true
           }
         },
-        billHCode: {
+        feecode: {
           type: 'string',
           title: '费用单',
           ui: {
             placeholder: '请输入'
           }
         },
-        billHC2ode: {
+        billHCode: {
           type: 'string',
           title: '订单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        vatappSts: {
+        cno: {
           type: 'string',
           title: '结算客户',
           enum: [{ label: '全部', value: '' }],
@@ -98,7 +108,7 @@ export class InputInvoiceDetailComponent implements OnInit {
           },
           default: ''
         },
-        createTime: {
+        feedate: {
           title: '费用日期',
           type: 'string',
           ui: {
@@ -109,7 +119,7 @@ export class InputInvoiceDetailComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        create2Time: {
+        billTime: {
           title: '订单日期',
           type: 'string',
           ui: {
@@ -127,14 +137,14 @@ export class InputInvoiceDetailComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '序号', render: 'billHCode', width: 80 },
-      { title: '费用号', index: 'vatappSts', width: 100 },
+      { title: '费用号', index: 'feecode', width: 100 },
-      { title: '费用日期', index: 'billTime', type: 'date', width: 150 },
+      { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
-      { title: '订单号', index: 'projectId', width: 100 },
+      { title: '订单号', index: 'billHCode', width: 100 },
-      { title: '订单日期', index: 'loadingfrom', width: 150 },
+      { title: '订单日期', index: 'billTime', width: 150 },
-      { title: '结算客户', index: 'loadingto', width: 90 },
+      { title: '结算客户', index: 'cnoName', width: 90 },
-      { title: '费用科目', index: 'goodsinfo', width: 100 },
+      { title: '费用科目', index: 'feesubname', width: 100 },
-      { title: '收票金额', index: 'driverinfo', width: 140 },
+      { title: '收票金额', index: 'invmoney', width: 140 },
-      { title: '收票税额', index: 'billkpmoney', width: 100 }
+      { title: '收票税额', index: 'invtax', width: 100 }
     ];
   }
 }

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

@@ -8,7 +8,7 @@
                 [ui]="{ '*': { spanLabelFixed: 100,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="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 (click)="resetSF()">重置</button>
             <button nz-button> 导出</button>
@@ -23,7 +23,7 @@
 <nz-card class="content-box" nzBordered>
 
     <div class="d-flex align-items-center mb-md mt-md">
-        <button nz-button (click)="this.auditAction()" nzType="primary">添加发票</button>
+        <button nz-button (click)="this.addInvoice()" nzType="primary">添加发票</button>
         <div class="ml-md">
             已选择
             <strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
@@ -31,7 +31,7 @@
         </div>
     </div>
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_input_invoice_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, 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] }"

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

@@ -4,11 +4,12 @@ import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st
 import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { TicketService } from '../../services/ticket.service';
+import { AddCollectionInvoiceModalComponent } from './add-collection-invoice-modal/add-collection-invoice-modal.component';
 
 @Component({
   selector: 'app-input-invoice',
   templateUrl: './input-invoice.component.html',
-  styleUrls: ['../../../commom/less/box.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class InputInvoiceComponent implements OnInit {
   @ViewChild('st', { static: true })
@@ -30,7 +31,15 @@ export class InputInvoiceComponent implements OnInit {
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
-        ...this.sf.value
+        ...this.sf.value,
+        createtime: {
+          start: this.sf.value.createtime?.[0] || null,
+          end: this.sf.value.createtime?.[1] || null
+        },
+        invdate: {
+          start: this.sf.value.invdate?.[0] || null,
+          end: this.sf.value.invdate?.[1] || null
+        }
       });
     }
     return requestOptions;
@@ -44,14 +53,16 @@ export class InputInvoiceComponent implements OnInit {
     }
   }
 
-  auditAction() {
+  addInvoice() {
     if (this.selectedRows?.length <= 0) {
       this.service.msgSrv.warning('请选择申请记录');
       return;
     }
-    const modal = this.nzModalService.warning({
+    const modal = this.nzModalService.create({
-      nzTitle: '确定对已选运单批量申请开票？',
+      nzTitle: '收票信息',
-      nzOnOk: () => {}
+      nzContent: AddCollectionInvoiceModalComponent,
+      nzComponentParams: { i: { userId: 0 } },
+      nzFooter: null
     });
   }
 
@@ -80,7 +91,7 @@ export class InputInvoiceComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn: {
+        inpinvcode: {
           type: 'string',
           title: '收票单号',
           ui: {
@@ -88,7 +99,7 @@ export class InputInvoiceComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        ltdId: {
+        ltdid: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -99,7 +110,7 @@ export class InputInvoiceComponent implements OnInit {
           },
           default: ''
         },
-        orderS2n: {
+        invoiceno: {
           type: 'string',
           title: '发票号码',
           ui: {
@@ -107,7 +118,7 @@ export class InputInvoiceComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        order2S2n: {
+        invtype: {
           type: 'string',
           title: '发票类型',
           ui: {
@@ -119,7 +130,7 @@ export class InputInvoiceComponent implements OnInit {
             }
           }
         },
-        orderSn1: {
+        hrto: {
           type: 'string',
           title: '销售方',
           ui: {
@@ -129,7 +140,7 @@ export class InputInvoiceComponent implements OnInit {
             }
           }
         },
-        createTime: {
+        createtime: {
           title: '创建时间',
           type: 'string',
           ui: {
@@ -140,7 +151,7 @@ export class InputInvoiceComponent implements OnInit {
             }
           } as SFDateWidgetSchema
         },
-        ord0erSn1: {
+        sts: {
           type: 'string',
           title: '收票状态',
           ui: {
@@ -152,7 +163,7 @@ export class InputInvoiceComponent implements OnInit {
             }
           }
         },
-        orderSn2: {
+        invdate: {
           type: 'string',
           title: '发票日期',
           ui: {
@@ -163,7 +174,7 @@ export class InputInvoiceComponent implements OnInit {
             }
           }
         },
-        orderS1n2: {
+        remarks: {
           type: 'string',
           title: '收票备注',
           ui: {
@@ -173,23 +184,21 @@ export class InputInvoiceComponent implements OnInit {
             }
           }
         },
-        orderS3: {
+        billCode: {
           type: 'string',
           title: '订单号',
           ui: {
-            autocomplete: 'off',
+            placeholder: '请输入',
-            placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        orderSn4: {
+        feecode: {
           type: 'string',
           title: '费用号',
           ui: {
-            autocomplete: 'off',
+            placeholder: '请输入',
-            placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -202,27 +211,27 @@ export class InputInvoiceComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox' },
-      { title: '收票单号', index: 'no', type: 'link' },
+      { title: '收票单号', index: 'inpinvcode', type: 'link' },
-      { title: '网络货运人', index: 'no' },
+      { title: '网络货运人', index: 'ltdid' },
-      { title: '发票日期', index: 'no', type: 'date' },
+      { title: '发票日期', index: 'invdate', type: 'date' },
-      { title: '发票号', index: 'callNo' },
+      { title: '发票号', index: 'invoiceno' },
-      { title: '发票金额', index: 'callNo' },
+      { title: '发票金额', index: 'invmoney' },
-      { title: '税额', render: 'call1No' },
+      { title: '税额', index: 'invtax' },
-      { title: '发票类型', render: 'call1N2o' },
+      { title: '发票类型', index: 'invtype' },
-      { title: '销售方', index: 'callNo' },
+      { title: '销售方', index: 'hrto' },
-      { title: '创建时间', index: 'updatedAt', type: 'date' },
+      { title: '创建时间', index: 'createtime', type: 'date' },
-      { title: '创建人', index: 'updatedAt' },
+      { title: '创建人', index: 'createbyname' },
-      { title: '收票状态', index: 'updatedAt' },
+      { title: '收票状态', index: 'sts' },
       {
         title: '操作',
         buttons: [
           {
             text: '浏览',
-            click: item => this.router.navigate(['/ticket/input-invoice/detail/1'])
+            click: item => this.router.navigate(['/ticket/input-invoice/detail/' + item.id])
           },
           {
             text: '修改',
-            // click: item => this.router.navigate([''])
+            click: item => this.router.navigate(['/ticket/input-invoice/edit/1'])
           }
         ]
       }

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

@@ -38,9 +38,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
     this.loadHeadInfo();
   }
 
-  ngOnInit(): void {
+  ngOnInit(): void {}
-    console.log(this.route.snapshot)
-  }
 
   loadHeadInfo() {
     this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
@@ -71,11 +69,11 @@ export class InvoiceRequestedDetailComponent implements OnInit {
   }
 
   openRequestedModal(status: any) {
-    if(status === '2' && this.selectedRows.length == 0) {
+    if (status === '2' && this.selectedRows.length == 0) {
-      this.service.msgSrv.warning('请选择订单！')
+      this.service.msgSrv.warning('请选择订单！');
-      return
+      return;
     }
-    console.log(this.selectedRows)
+    console.log(this.selectedRows);
     const modal = this.nzModalService.create({
       nzTitle: '开票',
       nzContent: RequestedDetailComponent,
@@ -84,20 +82,20 @@ export class InvoiceRequestedDetailComponent implements OnInit {
         i: this.selectedRows,
         status: status,
         Id: this.id
-       },
+      },
       nzFooter: [
         {
           type: 'default',
           label: '手工处理',
           onClick: () => {
-            console.log('11111')
+            console.log('11111');
             const params = {
               ficoVatappBillVOList: this.selectedRows,
               id: this.id
-            }
+            };
             this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => {
-              console.log(res)
+              console.log(res);
-            })
+            });
             modal.destroy();
           }
         },

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

@@ -47,7 +47,6 @@ export class TicketService extends ShipperBaseService {
   // 保存开票申请费用明细
   $api_ficoVatappFee_save = '/api/fcc/ficoVatappFee/save';
 
-
   // 查询ETC白名单（货主）
   $api_get_etc_shipper_list = '/api/fcc/ficoShipperWhiteList/list/page';
   // 删除ETC白名单（货主）
@@ -57,7 +56,14 @@ export class TicketService extends ShipperBaseService {
   // 查询ETC企业列表
   $api_get_etc_list = '/api/mdc/cuc/enterpriseInfo/operate/etcList';
 
-  constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
+  // 进项发票查询
+  $api_get_input_invoice_page = '/api/fcc/ficoInpinvH/getListPage';
+  // 根据ID获取进项发票详情
+  $api_get_input_invoice_header = '/api/fcc/ficoInpinvH/get';
+  // 查询进项发票明细
+  $api_get_input_invoice_detail_page = '/api/fcc/ficoInpinvL/list/page';
+
+  constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
     super(injector, eaCacheSrv);
   }
 }

src/app/routes/ticket-management/ticket-management-routing.module.ts

@@ -5,6 +5,7 @@ import { ETCBlacklistComponent } from './components/etc-blacklist/etc-blacklist.
 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 { EditCollectionInvoiceComponent } from './components/input-invoice/edit-collection-invoice/edit-collection-invoice.component';
 import { InputInvoiceDetailComponent } from './components/input-invoice/input-invoice-detail/input-invoice-detail.component';
 import { InputInvoiceComponent } from './components/input-invoice/input-invoice.component';
 import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component';
@@ -24,7 +25,8 @@ const routes: Routes = [
   { path: 'etc-invoiced-logs', component: ETCInvoicedLogsComponent },
   { path: 'etc-blacklist', component: ETCBlacklistComponent },
   { path: 'input-invoice', component: InputInvoiceComponent },
-  { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent }
+  { path: 'input-invoice/detail/:id', component: InputInvoiceDetailComponent },
+  { path: 'input-invoice/edit/:id', component: EditCollectionInvoiceComponent }
 ];
 
 @NgModule({

src/app/routes/ticket-management/ticket-management.module.ts

@@ -19,6 +19,9 @@ import { AddOwnerComponent } from './components/etc-blacklist/add-owner/add-owne
 import { AddCartComponent } from './components/etc-blacklist/add-cart/add-cart.component';
 import { InputInvoiceComponent } from './components/input-invoice/input-invoice.component';
 import { InputInvoiceDetailComponent } from './components/input-invoice/input-invoice-detail/input-invoice-detail.component';
+import { AddCollectionInvoiceModalComponent } from './components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component';
+import { EditCollectionInvoiceComponent } from './components/input-invoice/edit-collection-invoice/edit-collection-invoice.component';
+import { AddCostDetailComponent } from './components/input-invoice/add-cost-detail/add-cost-detail.component';
 
 const COMPONENTS: any = [
   ETCInvoicedListComponent,
@@ -32,14 +35,17 @@ const COMPONENTS: any = [
   CancellationInvoiceComponent,
   PushInvoiceComponent,
   InputInvoiceComponent,
-  InputInvoiceDetailComponent
+  InputInvoiceDetailComponent,
+  EditCollectionInvoiceComponent
 ];
 const NOTROUTECOMPONENTS: any = [
   TransactionDetailsComponent,
   RequestedInvoiceModalComponent,
   RequestedDetailComponent,
   AddOwnerComponent,
-  AddCartComponent
+  AddCartComponent,
+  AddCollectionInvoiceModalComponent,
+  AddCostDetailComponent
 ];
 @NgModule({
   declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],

src/assets/mocks/menu-data.json

@@ -243,6 +243,14 @@
                 "hide": true,
                 "link": "/financial-management/cost-management/expenses-payable/:id"
               },
+              {
+                "text": "付款单",
+                "link": "/financial-management/payment-order"
+              },
+              {
+                "text": "收款单",
+                "link": "/financial-management/receipt-order"
+              },
               {
                 "text": "货主账户",
                 "link": "/financial-management/freight-account"
@@ -351,9 +359,14 @@
                 "link": "/ticket/input-invoice"
               },
               {
-                "text": "进项发票",
+                "text": "修改收票信息",
                 "link": "/ticket/input-invoice/detail/:id",
                 "hide": true
+              },
+              {
+                "text": "进项发票",
+                "link": "/ticket/input-invoice/edit/:id",
+                "hide": true
               }
             ]
           },