From 9c21cabd45798a3d6575b6e0bb475e1934a23efc Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:49:48 +0800 Subject: [PATCH 1/6] fix bug --- .../network-freight.component.ts | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index 1ff042b0..5456947b 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -466,8 +466,26 @@ export class NetworkFreightComponent implements OnInit { } }); } + if(this.NCStatus) { + this.getNcSetData() + } this.isVisibleTicket = true; } + getNcSetData() { + const List: any = []; + console.log(99999); + this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => { + console.log(res); + if (res) { + List.push({ label: res.customerName, value: res.id }); + console.log(List); + + this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List; + this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List); + this.sfNC.setValue('/crmCustomerId', res?.id); + } + }); + } getProvinceData(value: any) { this.service.http.post(this.service.$api_getRegionDetailByCode, { regionCode: value }).subscribe(res => { let enterpriseAddressCode: any = []; @@ -661,10 +679,10 @@ export class NetworkFreightComponent implements OnInit { this.NCStatus = false; this.taxStatus = false; } else if (value.name === 'NC设置'){ + this.getNcSetData() this.NCStatus = true; this.TicketStatus = false; this.taxStatus = false; - } } // 新增 From ef7fce7468842ac68144f99c2423896df449b7f8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 14:54:11 +0800 Subject: [PATCH 2/6] fix bug --- .../components/compliance-audit/compliance-audit.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 3ea3d747..f4477ef8 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -375,13 +375,13 @@ export class OrderManagementComplianceAuditComponent implements OnInit { title: '审核人', width: '180px', className: 'text-left', - index: 'loadingLadingBillFilePath' + index: 'complianceName' }, { title: '审核时间', width: '180px', className: 'text-left', - index: 'loadingLadingBillFilePath' + index: 'complianceTime' }, { title: '状态', From ae743ee0203ddbc70d1e183a4859a8f00811375b Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 15:17:24 +0800 Subject: [PATCH 3/6] edit --- .../cancellation-invoice.component.html | 14 ++++++++++---- .../invoice-requested.component.html | 2 +- .../requested-invoice-modal.component.ts | 16 +++++++++++++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git 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 index 5670e063..42bc22e2 100644 --- 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 @@ -45,12 +45,11 @@ - + {{ item.vatinvcode }}
- + @@ -58,6 +57,13 @@
+ 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 091af5f8..3790504f 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 @@ -45,7 +45,7 @@ {{ totalCallNo }} 清空
- + diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 802103d3..ed1d8ae9 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -7,6 +7,7 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\ticket-management\\components\\invoice-requested\\requested-invoice-modal\\requested-invoice-modal.component.ts */ import { Component, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; import { STChange, STColumn, STComponent, STRequestOptions } from '@delon/abc/st'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; @@ -23,7 +24,7 @@ export class RequestedInvoiceModalComponent { columns: STColumn[] = this.initST(); id: any; selectedRows: any[] = []; - constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef) {} + constructor(public service: TicketService, private nzModalService: NzModalService, private modal: NzModalRef, private router: Router) {} beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { vatappHId: this.id }); @@ -127,8 +128,17 @@ export class RequestedInvoiceModalComponent { }; this.service.request(this.service.$api_get_applyFicoVatinv, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('开票成功'); - this.modal.destroy(true); + this.nzModalService.confirm({ + nzTitle: '是否进入销票处理页面完成开票', + nzOnOk: () => { + this.service.msgSrv.success('开票成功'); + this.modal.destroy(true); + this.router.navigate(['/ticket/cancellation-invoice']); + }, + nzOnCancel: () => { + this.modal.destroy(true); + } + }); } }); } From 23e0a83c565f8e63284084f8836e642fe48f0a37 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 16:01:19 +0800 Subject: [PATCH 4/6] fix bug --- .../complaint-detail.component.ts | 12 +++++++ .../abnormal-appear.component.html | 8 ++--- .../abnormal-appear.component.ts | 32 ++++++++++++++++--- .../components/vehicle/vehicle.component.html | 6 ++-- .../services/waybill-management.service.ts | 12 ++++--- 5 files changed, 54 insertions(+), 16 deletions(-) diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 7851a2a6..1c0a7051 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -172,6 +172,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { 查看评价： 3 */ handleCancel(type: string) { + if(!this.sfView.valid) { + this.service.msgSrv.error('请填写处理结果！') + return + } const paramsa = { ...this.sfView.value, handleStatus: 0, @@ -193,6 +197,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { this.isVisibleRE = false } handleCancel2() { + if(!this.sfView.valid) { + this.service.msgSrv.error('请填写处理结果！') + return + } const paramsa = { id: this.channelId } @@ -212,6 +220,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit { * 审核通过按钮 */ handleOK() { + if(!this.sfView.valid) { + this.service.msgSrv.error('请填写处理结果！') + return + } const paramsa = { ...this.sfView.value, handleStatus: 1, diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index 13df6295..a3cf1647 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@ + +

公司名： {{openInfo?.artoname}}

+

税号： {{openInfo?.artotaxno}}

+

注册地址： {{openInfo?.artoadd}}

+

注册电话： {{openInfo?.artotel}}

+

开户行： {{openInfo?.artobank}}

+ + + {{openInfo?.vatname}} + + + {{openInfo?.vatremarks}} + + + {{openInfo?.otherremarks}} + + + {{openInfo?.isdetail?'需要':'不需要'}} + + + {{openInfo?.vatnotax | currency}} + diff --git 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 index b394a349..e2e9009e 100644 --- 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 @@ -79,34 +79,40 @@ export class CancellationInvoiceComponent implements OnInit { */ requestedAction(item: any) { this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null }; - const modal = this.nzModalService.create({ - nzTitle: '发票确认', - nzContent: this.requestedModal, - nzOnOk: () => { - if (!this.openInfo?.invoicedate || !this.openInfo?.invoiceno) { - this.service.msgSrv.warning('请填开票信息'); - return false; - } - const params = { - invoiceno: this.openInfo.invoiceno, - invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate), - invoiceno2: this.openInfo.invoiceno2 - }; - this.service - .request(this.service.$api_apply_fico_invoic, { - id: item.id, - vatinvcode: item.vatinvcode, - ...params - }) - .subscribe(res => { - if (res) { - this.service.msgSrv.success('开票成功'); - this.st.load(1); - modal.destroy(); + this.service.request(this.service.$api_get_apply_fico_info, { id: item.vatappHId }).subscribe(info => { + if (info) { + console.log(info); + Object.assign(this.openInfo, { ...info }); + const modal = this.nzModalService.create({ + nzTitle: '发票确认', + nzContent: this.requestedModal, + nzOnOk: () => { + if (!this.openInfo?.invoicedate || !this.openInfo?.invoiceno) { + this.service.msgSrv.warning('请填开票信息'); + return false; } - }); + const params = { + invoiceno: this.openInfo.invoiceno, + invoicedate: dateTimePickerUtil.format(this.openInfo.invoicedate), + invoiceno2: this.openInfo.invoiceno2 + }; + this.service + .request(this.service.$api_apply_fico_invoic, { + id: item.id, + vatinvcode: item.vatinvcode, + ...params + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('开票成功'); + this.st.load(1); + modal.destroy(); + } + }); - return false; + return false; + } + }); } }); } diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html index acde105a..9fa49838 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html @@ -32,5 +32,5 @@
- +
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index d2d66aa4..68508f5a 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -32,6 +32,8 @@ export class TicketService extends ShipperBaseService { $api_ficoVatinv_Detail = '/api/fcc/ficoVatinvL/getDetailByVatinvHId'; // 运营端订单明细开票处理 $api_apply_fico = '/api/fcc/ficoVatinvH/crmPushInvo'; + // 手工开票获取开票申请信息展示 + $api_get_apply_fico_info = '/api/fcc/ficoVatappH/get'; // 运营端手工开票/确认/E税云开票成功后的回调 $api_apply_fico_invoic = '/api/fcc/ficoVatinvH/operateAffirmVatinv'; // 运营端推送开票-E税云开票 From a16cff8d9bb290fa3734a302035d3cca5776e6ea Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 24 Mar 2022 17:33:40 +0800 Subject: [PATCH 6/6] fix bug --- .../components/vehicle/vehicle.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 4d7056af..7140b04e 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@