From 1f1db511e6b3c06e7acafcf629bc24e6268a34e8 Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Thu, 14 Apr 2022 20:51:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-reporting/order-reporting.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index d8bafb1f..39fda63a 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -277,12 +277,12 @@ export class DatatableOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'billPutStatus', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverPutStatus', className: 'text-center', width: '120px', }, + { title: '订单状态', render: 'billPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '司机状态', render: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '车辆状态', render: 'carPutStatus', className: 'text-center', width: '120px', }, + { title: '车辆状态', render: 'carPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'checkStatusLabel', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billCode', From f7a908f5c8e1432953058070db97718471bec98d Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Thu, 14 Apr 2022 21:10:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-reporting/order-reporting.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index cae73b65..bd7bf8c1 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -281,12 +281,12 @@ export class DatatableOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', render: 'billPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '司机状态', render: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '车辆状态', render: 'carPutStatusLabel', className: 'text-center', width: '120px', }, + { title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'checkStatusLabel', className: 'text-center', width: '120px', }, + { title: '本地校验', index: 'checkStatusLabel', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billCode', From fbc133f96db5d4797dc321ff67e8bce981150716 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 15 Apr 2022 09:39:47 +0800 Subject: [PATCH 3/3] edit --- .../cancellation-invoice.component.html | 43 ++++++++++++------- .../cancellation-invoice.component.ts | 1 - 2 files changed, 27 insertions(+), 17 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 84bf6e93..bd28cc3d 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 @@ -56,37 +56,48 @@
-
- -

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

-

税号： {{openInfo?.artotaxno}}

-

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

-

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

-

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

+
+ + {{openInfo?.artoname}} - + + {{openInfo?.artotaxno}} + + + {{openInfo?.artoadd}} + + + {{openInfo?.artotel}} + + + {{openInfo?.artobank}} + + + {{openInfo?.artoacc}} + + {{openInfo?.vatnameLabel}} - + {{openInfo?.vatremarks}} - + {{openInfo?.otherremarks}} - + {{openInfo?.isdetail?'需要':'不需要'}} - + {{openInfo?.vatmoney | 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 a9d95464..f38bbe2b 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 @@ -89,7 +89,6 @@ export class CancellationInvoiceComponent implements OnInit { this.openInfo = { invoicedate: null, invoiceno: null, invoiceno2: null }; 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: '发票确认',