From e68d4cf6cbdaa7632204bfadbcf97a18c3e21468 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 28 Dec 2021 17:36:51 +0800 Subject: [PATCH] edit --- .../invoice-requested-detail.component.html | 41 ++++--- .../invoice-requested-detail.component.ts | 102 +++++++++++----- .../invoice-requested.component.html | 8 +- .../invoice-requested.component.ts | 114 +++++++++--------- .../services/ticket.service.ts | 14 ++- 5 files changed, 167 insertions(+), 112 deletions(-) diff --git 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 index e5b10253..6ec15deb 100644 --- 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 @@ -10,56 +10,57 @@
- 天津怡亚通物流科技有限公司 + {{headerInfo?.ltdidName}} - VP2021012010 + {{headerInfo?.vatappHId}} - 50/100 + {{headerInfo?.vatinvBillNum}} / {{headerInfo?.ordlines}} - 5000.00/10000.00 + {{headerInfo?.vatinvHAmount}} / {{headerInfo?.vatinvHAmount}} - + 2
- 茅台股份有限公司 + {{headerInfo?.projectName}} - 912301046656930913 + {{headerInfo?.taxNumber}} - 贵州省贵阳市 + {{headerInfo?.registerAddr}} - 075588393198 + {{headerInfo?.registerPhone}} - 中国工商银行股份有限公司哈贵阳支行 + {{headerInfo?.bankName}} - 3500044119068126788 + {{headerInfo?.bankAccount}}
- 运输服务费 + {{headerInfo?.vatname}} - 需要 + {{headerInfo?.isdetail}} - 单位按吨 + {{headerInfo?.otherremarks}} -

起运地:广东省深圳市南山区

+ {{headerInfo?.vatremarks}} +
@@ -99,9 +100,13 @@ - + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }" (change)="stChange($event)"> + + {{ item.billHCode }} + + \ No newline at end of file diff --git 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 index 1c4c9798..78fd70bb 100644 --- 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,5 +1,5 @@ import { Component, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; -import { Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFSchema, SFDateWidgetSchema, SFTextWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -25,10 +25,30 @@ export class InvoiceRequestedDetailComponent implements OnInit { selectedRows: any[] = []; totalCallNo = 0; _$expand = false; - constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {} + + vatappHId = null; + headerInfo: any = {}; + constructor( + public service: TicketService, + private nzModalService: NzModalService, + private route: ActivatedRoute, + private router: Router + ) { + this.vatappHId = route.snapshot.params.id; + this.loadHeadInfo(); + } ngOnInit(): void {} + loadHeadInfo() { + this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => { + console.log(res); + if (res) { + this.headerInfo = res; + } + }); + } + beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); @@ -85,7 +105,14 @@ export class InvoiceRequestedDetailComponent implements OnInit { nzTitle: '确定从当前批次中移除所选订单？', nzContent: '移除后相关订单可以重新提交开票申请', nzOnOk: () => { - console.log(this.selectedRows); + const ids = this.selectedRows.map(order => order.billHId); + this.service.request(this.service.$api_remove_bill, ids).subscribe(res => { + if (res) { + this.service.msgSrv.success('移除成功'); + this.loadHeadInfo(); + this.st.reload(); + } + }); } }); } @@ -94,6 +121,14 @@ export class InvoiceRequestedDetailComponent implements OnInit { history.go(-1); } + routeToOrder(item: any) { + if (item.billType === 1) { + this.router.navigate(['/order-management/vehicle-detail/' + item.billHCode]); + } else { + this.router.navigate(['/order-management/bulk-detail/' + item.billHCode]); + } + } + /** * 重置表单 */ @@ -118,14 +153,14 @@ export class InvoiceRequestedDetailComponent implements OnInit { hidden: true } }, - orderSn: { + billHCode: { type: 'string', title: '订单号', ui: { placeholder: '请输入' } }, - receiveName: { + vatappSts: { type: 'string', title: '开票状态', enum: [ @@ -143,17 +178,21 @@ export class InvoiceRequestedDetailComponent implements OnInit { }, default: '' }, - orderSn2: { + vatinvcode: { type: 'string', title: '发票号码', ui: { placeholder: '请输入' } }, - receiveName2: { + billType: { type: 'string', title: '订单类型', - enum: [{ label: '全部', value: '' }], + enum: [ + { label: '全部', value: '' }, + { label: '整车', value: '1' }, + { label: '大宗', value: '2' } + ], ui: { widget: 'select', placeholder: '请选择', @@ -163,7 +202,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { }, default: '' }, - orderS2n2: { + driverinfo: { type: 'string', title: '运司机', ui: { @@ -183,18 +222,17 @@ export class InvoiceRequestedDetailComponent implements OnInit { } } }, - receiveN2ame2: { + projectId: { + title: '项目', type: 'string', - title: '所属项目', - enum: [{ label: '全部', value: '' }], + default: '', ui: { widget: 'select', - placeholder: '请选择', visibleIf: { expand: (value: boolean) => value - } - }, - default: '' + }, + asyncData: () => this.service.getEnterpriseProject() + } } } }; @@ -203,22 +241,22 @@ export class InvoiceRequestedDetailComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '订单号', index: 'no', width: 150 }, - { title: '订单完成日期', index: 'updatedAt', type: 'date', width: 150 }, - { title: '开票状态', index: 'callNo', width: 100 }, - { title: '所属项目', index: 'callNo', width: 100 }, - { title: '订单类型', index: 'callNo', width: 100 }, - { title: '装货地', index: 'callNo', width: 90 }, - { title: '卸货地', index: 'callNo', width: 90 }, - { title: '货物信息', index: 'callNo', width: 100 }, - { title: '承运司机', index: 'callNo', width: 140, format: item => `特朗普
13789040523
粤GT8419` }, - { 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: '发票号码', index: 'callNo', width: 100 }, - { title: '开票日期', index: 'updatedAt', type: 'date', width: 150 } + { title: '订单号', render: 'billHCode', width: 150 }, + { title: '订单完成日期', index: 'billTime', type: 'date', width: 150 }, + { title: '开票状态', index: 'vatappSts', width: 100 }, + { title: '所属项目', index: 'projectId', width: 100 }, + { title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } }, + { title: '装货地', index: 'loadingfrom', width: 90 }, + { title: '卸货地', index: 'loadingto', width: 90 }, + { title: '货物信息', index: 'goodsinfo', width: 100 }, + { title: '承运司机', index: 'driverinfo', width: 140 }, + { title: '申请金额', index: 'billkpmoney', width: 100 }, + { title: '运输费', index: 'fjfmoney2', width: 90 }, + { title: '附加费', index: 'fjfmoney', width: 90 }, + { title: '开票金额', index: 'billkpmoney', width: 100 }, + { title: '税率', index: 'billvatrate', width: 90 }, + { title: '发票号码', index: 'vatinvcode', width: 100 }, + { title: '开票日期', index: 'vatinvtime', type: 'date', width: 150 } ]; } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 230fcf3e..61add36b 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -43,11 +43,15 @@ - + [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"> + + {{ item.vatappcode }}
+ + diff --git 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 index b1273170..678fa10e 100644 --- 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 @@ -32,7 +32,13 @@ export class InvoiceRequestedComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { + ...this.sf.value, + createTime: { + start: this.sf.value.createTime?.[0] || null, + end: this.sf.value.createTime?.[1] || null + } + }); } return requestOptions; }; @@ -46,10 +52,6 @@ export class InvoiceRequestedComponent implements OnInit { } } - approval(): void {} - - add(): void {} - rejectAction(item: any[]) { const modal = this.nzModalService.create({ nzTitle: '驳回', @@ -128,8 +130,8 @@ export class InvoiceRequestedComponent implements OnInit { { type: 'default', label: '移除', - onClick: (com) => { - com?.removeOrder(com.data) + onClick: com => { + com?.removeOrder(com.data); } }, { @@ -175,14 +177,14 @@ export class InvoiceRequestedComponent implements OnInit { hidden: true } }, - orderSn: { + vatappcode: { type: 'string', title: '申请编号', ui: { placeholder: '请输入' } }, - orderSn2: { + billHCode: { type: 'string', title: '订单号', ui: { @@ -196,55 +198,50 @@ export class InvoiceRequestedComponent implements OnInit { placeholder: '请输入' } }, - receiveName2: { + projectId: { + title: '项目', type: 'string', - title: '购买方', - enum: [ - { label: '全部', value: '全部' }, - { label: '企业认证审核', value: '企业认证审核' }, - { label: '企业管理员审核', value: '企业管理员审核' } - ], + default: '', ui: { widget: 'select', - placeholder: '请选择', visibleIf: { expand: (value: boolean) => value - } + }, + asyncData: () => this.service.getEnterpriseProject() } }, - receiveName3: { + ltd: { type: 'string', title: '网络货运人', - enum: [{ label: '全部', value: '全部' }], ui: { widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value - } - } + }, + allowClear: true, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' }, - receiveName23: { + otherReq: { type: 'string', title: '其他需求', - enum: [ - { label: '全部', value: '全部' }, - { label: '有', value: '有' }, - { label: '无', value: '无' } - ], + enum: [{ label: '全部', value: '' }], ui: { widget: 'select', placeholder: '请选择', visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, - receiveName: { + sts: { type: 'string', title: '处理进度', enum: [ - { label: '全部', value: '全部' }, + { label: '全部', value: '' }, { label: '待审核', value: '待审核' }, { label: '处理中', value: '处理中' }, { label: '已完成', value: '已完成' }, @@ -257,27 +254,29 @@ export class InvoiceRequestedComponent implements OnInit { visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' }, createTime: { title: '申请时间', type: 'string', ui: { - widget: 'date', - mode: 'range', + widget: 'sl-from-to-search', format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true, visibleIf: { expand: (value: boolean) => value } } as SFDateWidgetSchema }, - re2ceiveName: { + isdetail: { type: 'string', title: '销货清单', enum: [ - { label: '全部', value: '全部' }, - { label: '需要', value: '需要' }, - { label: '不需要', value: '不需要' } + { label: '全部', value: '' }, + { label: '需要', value: 1 }, + { label: '不需要', value: 0 } ], ui: { widget: 'select', @@ -285,7 +284,8 @@ export class InvoiceRequestedComponent implements OnInit { visibleIf: { expand: (value: boolean) => value } - } + }, + default: '' } } }; @@ -294,23 +294,23 @@ export class InvoiceRequestedComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '申请编号', index: 'no', width: 150, format: item => `VP202110012313
` }, - { title: '网络货运人', index: 'callNo', width: 120 }, - { 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: 120 }, - { title: '开户行', index: 'callNo', width: 90 }, - { title: '银行账户', index: 'callNo', width: 100 }, - { title: '注册地址', index: 'callNo', width: 100 }, - { title: '注册电话', index: 'callNo', width: 100 }, - { title: '服务名称', index: 'callNo', width: 100 }, - { title: '销货清单', index: 'callNo', width: 100 }, - { title: '其他要求', index: 'callNo', width: 100 }, - { title: '申请人', index: 'callNo', width: 90 }, - { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 }, + { title: '申请编号', render: 'vatappcode', width: 150 }, + { title: '网络货运人', index: 'ltdName', width: 120 }, + { title: '购买方', index: 'projectName', width: 90 }, + { title: '订单数', index: 'ordlines', width: 90 }, + { title: '申请金额', index: 'applyAmount', width: 100 }, + { title: '运输费', index: 'fjfmoney2', width: 90 }, + { title: '附加费', index: 'fjfmoney', width: 90 }, + { title: '已开票金额', index: 'invoicedMoney', width: 120 }, + { title: '开户行', index: 'bankName', width: 90 }, + { title: '银行账户', index: 'bankAccount', width: 100 }, + { title: '注册地址', index: 'registerAddr', width: 100 }, + { title: '注册电话', index: 'registerPhone', width: 100 }, + { title: '服务名称', index: 'vatname', width: 100 }, + { title: '销货清单', index: 'isdetail', width: 100 }, + { title: '其他要求', index: 'otherremarks', width: 100 }, + { title: '申请人', index: 'applyName', width: 90 }, + { title: '申请时间', index: 'applyTime', type: 'date', width: 150 }, { title: '操作', width: 150, @@ -330,7 +330,7 @@ export class InvoiceRequestedComponent implements OnInit { }, { text: '订单明细', - click: item => this.router.navigate(['/ticket/invoice-requested/detail/1']) + click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item.vatappcode]) }, { text: '下载对账单' diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index 17bb2cfe..ddf55291 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -1,13 +1,21 @@ import { Injectable, Injector } from '@angular/core'; -import { BaseService } from 'src/app/shared/services'; +import { ShipperBaseService } from '@shared'; @Injectable({ providedIn: 'root' }) -export class TicketService extends BaseService { - +export class TicketService extends ShipperBaseService { $mock_url = '/rule?_allow_anonymous=true'; + // 运营端查询发票申请记录 + $api_get_invoice_requested_page = '/api/fcc/ficoVatappH/queryOperateVatappHList'; + // 获取开票申请订单明细头部信息 + $api_get_invoice_requested_header_detail = '/api/fcc/ficoVatappBill/getDetailHeadByVatappHId'; + // 货主/运营端获取开票申请订单明细 + $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp'; + // 删除开票申请订单明细 + $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; + constructor(public injector: Injector) { super(injector); }