From abdc899a29839e963721815b6dbe91083f4bf437 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 30 Dec 2021 14:41:52 +0800 Subject: [PATCH] edit --- .../transaction-flow.component.ts | 2 +- .../invoice-detail.component.html | 68 ++++++++------- .../invoice-detail.component.ts | 84 +++++++++++-------- .../invoiced-list.component.html | 9 +- .../invoiced-list.component.less | 3 +- .../invoiced-list/invoiced-list.component.ts | 60 +++++++------ .../services/ticket.service.ts | 11 +++ 7 files changed, 137 insertions(+), 100 deletions(-) diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index b40e2924..5285cd21 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -211,7 +211,7 @@ export class TransactionFlowComponent implements OnInit { { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, { title: '关联单号', index: 'businessNumber', width: 150 }, { title: '账户类型', index: 'accountTypeLabel', width: 100 }, - { title: '账户名称', index: 'enterpriseName', width: 100 }, + { title: '账户名称', index: 'roleName', width: 100 }, { title: '所属项目', index: 'projectName', width: 100 }, { title: '收支类型', index: 'incomeTypeLabel', width: 100 }, { title: '交易金额', index: 'amount', width: 100 }, diff --git 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 index b4e5f878..fa07cb26 100644 --- 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 @@ -10,51 +10,51 @@
- 天津怡亚通物流科技有限公司 + {{headerInfo?.ltdId}} - VP2021012010 + {{headerInfo?.vatappHCode}} - 051010100 + {{headerInfo?.invoiceno}} - 54364653 + {{headerInfo?.invoiceno2}} - 2021-10-11 + {{headerInfo?.invoicedate}} - 2205.00 + {{headerInfo?.disvatnotax}} - 182.06 + {{headerInfo?.disvattax}} - 订单号11-12 + {{headerInfo?.remarks}}
- 茅台股份有限公司 + {{headerInfo?.artoname}} - 912301046656930913 + {{headerInfo?.artotaxno}} - 贵州省贵阳市 + {{headerInfo?.artoadd}} - 075588393198 + {{headerInfo?.artotel}} - 中国工商银行股份有限公司哈贵阳支行 + {{headerInfo?.artobank}} - 3500044119068126788 + {{headerInfo?.artoacc}} - 开票单位要吨 + {{headerInfo?.remarks}}
@@ -87,7 +87,7 @@
- - - - + - - + (ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%;"> - {{ item.owner }} + {{ item.vatname }} - - - {{ item.callNo }} + + + {{ item.vatmodel }} - - - {{ item.progress }} + + + {{ item.vatunit }} - - - {{ item.status }} + + + {{ item.vatqty }} diff --git 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 index 74d55d62..f4f016af 100644 --- 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 @@ -32,8 +32,12 @@ export class InvoiceDetailComponent implements OnInit { isCanEdit = false; isEdit = false; + headerInfo: any = {}; + constructor(public service: TicketService, private route: ActivatedRoute) { this.isCanEdit = !!route.snapshot.queryParams.type; + const id = route.snapshot.params.id; + this.loadInvoiceHeader(id); } ngOnInit(): void {} @@ -48,6 +52,15 @@ export class InvoiceDetailComponent implements OnInit { return requestOptions; }; + loadInvoiceHeader(id: string) { + this.service.request(this.service.$api_get_invoice_header_detail, { id }).subscribe(res => { + console.log(res); + if (res) { + this.headerInfo = res; + } + }); + } + goBack() { history.go(-1); } @@ -78,30 +91,35 @@ export class InvoiceDetailComponent implements OnInit { private initOrderSF(): SFSchema { return { properties: { - orderSn: { + billHId: { type: 'string', title: '订单号', ui: { autocomplete: 'off' } }, - receiveName: { + billType: { type: 'string', title: '订单类型', - enum: [{ label: '全部', value: '' }], + enum: [ + { label: '全部', value: '' }, + { label: '整车', value: 1 }, + { label: '大宗', value: 2 } + ], ui: { widget: 'select', placeholder: '请选择' }, default: '' }, - receiveNa22me: { + projectId: { type: 'string', - title: '所属项', - enum: [{ label: '全部', value: '' }], + title: '所属项目', ui: { widget: 'select', - placeholder: '请选择' + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getEnterpriseProject() }, default: '' } @@ -111,32 +129,32 @@ export class InvoiceDetailComponent implements OnInit { 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 => `特朗普 13789040523 粤GT8419` }, - { title: '申请金额', index: 'callNo' }, - { title: '运输费', index: 'callNo' }, - { title: '附加费', index: 'callNo' }, - { title: '开票金额', index: 'callNo' } + { title: '订单号', index: 'billHId' }, + { title: '订单完成日期', index: 'billTime', type: 'date' }, + { title: '所属项目', index: 'projectId' }, + { title: '订单类型', index: 'billType' }, + { title: '装货地', index: 'loadingfrom' }, + { title: '卸货地', index: 'loadingto' }, + { title: '货物信息', index: 'goodsinfo' }, + { title: '承运司机', index: 'driverinfo' }, + { title: '申请金额', index: 'billkpnotax' }, + { title: '运输费', index: 'fjfmoney2' }, + { title: '附加费', index: 'fjfmoney' }, + { title: '开票金额', index: 'billkpmoney' } ]; } private initCostSF(): SFSchema { return { properties: { - orderSn: { + billHId: { type: 'string', title: '订单号', ui: { autocomplete: 'off' } }, - orderS2n: { + feeHId: { type: 'string', title: '费用号', ui: { @@ -149,25 +167,25 @@ export class InvoiceDetailComponent implements OnInit { private initCostST(): STColumn[] { return [ - { title: '费用号', index: 'no' }, - { title: '订单号', index: 'callNo' }, - { title: '订单日期', index: 'callNo', type: 'date' }, + { title: '费用号', index: 'feeHId' }, + { title: '订单号', index: 'billHId' }, + { title: '订单日期', index: 'createTime', type: 'date' }, { title: '计费日期', index: 'callNo', type: 'date' }, - { title: '税率', index: 'callNo' }, - { title: '申请金额', index: 'callNo' }, - { title: '开票金额', index: 'callNo' } + { title: '税率', index: 'vatrate' }, + { title: '申请金额', index: 'vatmoney' }, + { title: '开票金额', index: 'vatnotax' } ]; } private initInvoiceST(): STColumn[] { return [ - { title: '服务名称', render: 'owner' }, - { title: '规格型号', render: 'callNo' }, - { title: '单位', render: 'progress' }, - { title: '数量', render: 'status' }, - { title: '金额', index: 'callNo' }, + { title: '服务名称', render: 'vatname' }, + { title: '规格型号', render: 'vatmodel' }, + { title: '单位', render: 'vatunit' }, + { title: '数量', render: 'vatqty' }, + { title: '金额', index: 'vatnotax' }, { title: '税率', index: 'callNo' }, - { title: '税额', index: 'callNo' } + { title: '税额', index: 'vattax' } ]; } } diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html index 68175e6f..c709217a 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html @@ -28,13 +28,14 @@
已选择 - {{ selectedRows.length }} 条数据   开票金额总计 {{ + {{ selectedRows.length }} 条数据   开票金额总计 {{ totalCallNo }} 清空
- 预览发票 - + + {{ item.expresscompany }}
{{ item.expressno }} + diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less index c71e2dfd..0fed18b6 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less @@ -27,11 +27,10 @@ @media (min-width: 1200px) { .expend-options { - margin-top: -40px; max-width : 400px; position : absolute; right : 0; - bottom : 30px; + bottom : 25px; } } \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 4fe25cc5..76a07da2 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -32,7 +32,13 @@ export class InvoicedListComponent 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] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); } return requestOptions; }; @@ -108,14 +114,14 @@ export class InvoicedListComponent implements OnInit { hidden: true } }, - orderSn: { + invoiceno: { type: 'string', title: '发票号码', ui: { autocomplete: 'off' } }, - orderSn2: { + vatinvcode: { type: 'string', title: '申请编号', ui: { @@ -126,12 +132,13 @@ export class InvoicedListComponent implements OnInit { title: '开票日期', type: 'string', ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd' + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true } as SFDateWidgetSchema }, - receiveName: { + arto: { type: 'string', title: '购买人', enum: [{ label: '全部', value: '全部' }], @@ -143,17 +150,19 @@ export class InvoicedListComponent implements OnInit { } } }, - receiveName2: { + ltdId: { type: 'string', title: '网络货运人', - enum: [{ label: '全部', value: '全部' }], ui: { widget: 'select', placeholder: '请选择', + allowClear: true, visibleIf: { expand: (value: boolean) => value - } - } + }, + asyncData: () => this.service.getNetworkFreightForwarder() + }, + default: '' } } }; @@ -162,25 +171,24 @@ export class InvoicedListComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox' }, - { title: '发票号码', index: 'no', width: 150 }, - { title: '申请编号', index: 'callNo', width: 150 }, - { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 }, - { title: '发票类型', index: 'callNo', width: 100 }, - { title: '网络货运人', index: 'callNo', width: 120 }, - { title: '购买人', index: 'callNo', width: 90 }, - { title: '订单数', index: 'callNo', width: 90 }, + { title: '发票号码', index: 'invoiceno', width: 150 }, + { title: '申请编号', index: 'vatinvcode', width: 150 }, + { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, + { title: '发票类型', index: 'invoicetype', width: 100 }, + { title: '网络货运人', index: 'ltdId', width: 120 }, + { title: '购买人', index: 'artoname', width: 90 }, + { title: '订单数', index: 'ordlines', width: 90 }, { title: '价税合计', index: 'callNo', width: 100 }, - { title: '金额', index: 'callNo', width: 90 }, + { title: '金额', index: 'disvatnotax', width: 90 }, { title: '税率', index: 'callNo', width: 90 }, - { title: '税额', index: 'callNo', width: 90 }, - { title: '开票日期', index: 'updatedAt', type: 'date', width: 150 }, + { title: '税额', index: 'disvattax', width: 90 }, + { title: '开票日期', index: 'invoicedate', type: 'date', width: 150 }, { title: '快递信息', - render: 'logostics', - width: 120, - format: item => `顺丰快递
6202110012313` + render: 'expresscompany', + width: 120 }, - { title: '状态', render: 'logostics', width: 90 }, + { title: '状态', index: 'sts', width: 90 }, { title: '操作', fixed: 'right', @@ -189,7 +197,7 @@ export class InvoicedListComponent implements OnInit { buttons: [ { text: '查看明细', - click: item => this.router.navigate(['/ticket/invoice-list/detail/1']) + click: item => this.router.navigate(['/ticket/invoice-list/detail/' + item.id]) }, { text: '查看物流', diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index fd4a5c53..6c9c4740 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -24,6 +24,17 @@ export class TicketService extends ShipperBaseService { // 删除开票申请订单明细 $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; + // 已开发票查询 + $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page'; + // 获取销项发票抬头 + $api_get_invoice_header_detail = '/api/fcc/ficoVatinvH/get'; + // 获取分票发票抬头开票申请订单明细 + $api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId'; + // 获取分票发票抬头开票申请费用明细 + $api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId'; + // 获取分票发票明细 + $api_get_invoice_details = '/api/fcc/ficoVatinvL/getDetailByVatinvHId'; + constructor(public injector: Injector) { super(injector); }