From 3bdceea4314cdbe9d05ec02b4d6880f174f5433a Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 10:13:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../billing-order/billing-order.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 6c755377..8ea8540e 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -235,23 +235,23 @@ export class BillingOrderComponent implements OnInit { { title: '服务类型', index: 'serviceTypeLabel', - width: '180px', + width: '120px', className: 'text-center' }, { title: '装货地', index: 'consignor', width: '180px', className: 'text-center' }, { title: '卸货地', index: 'consignee', width: '180px', className: 'text-center' }, - { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' }, - { title: '车牌号', index: 'carNo', className: 'text-center', width: '180px' }, + { title: '货物信息', index: 'goodsName', className: 'text-center', width: '140px' }, + { title: '车牌号', index: 'carNo', className: 'text-center', width: '120px' }, { title: '承运司机', index:'driverName', className: 'text-center', - width: '180px', + width: '120px', }, { title: '车队长', className: 'text-center', - width: '180px', + width: '120px', index: 'carCaptainName', }, { title: '业务员', width: '100px', index: 'salesmanName', className: 'text-center', }, @@ -260,9 +260,9 @@ export class BillingOrderComponent implements OnInit { { title: '卸货时间', index: 'unloadTime', type: 'date', width: '150px', className: 'text-center', }, { title: '订单完成时间', index: 'orderReceivingTime', type: 'date', width: 150, className: 'text-center', }, { title: '支付完成时间', index: 'overallPaymentTime', type: 'date', width: 150, className: 'text-center', }, - { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 180 }, + { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, - { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 180 }, + { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', }, { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', }, { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' }, From bfa1eba6f5063d36048a1702f881116514910d07 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 14:34:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/billing-order/billing-order.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 8ea8540e..08e37c74 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -263,13 +263,13 @@ export class BillingOrderComponent implements OnInit { { title: '开票状态', index: 'sts', render: 'sts', className: 'text-center', width: 120 }, { title: '申请开票时间', index: 'vatappdate', type: 'date', className: 'text-center', width: 180 }, { title: '申请开票编号', index: 'vatappcode', className: 'text-center', width: 190 }, - { title: '分票编号', index: 'vatinvcode', width: '180px', className: 'text-center', }, + { title: '分票编号', index: 'vatinvcode', width: '200px', className: 'text-center', }, { title: '发票号码', index: 'invoiceno', width: 130, className: 'text-center', }, { title: '发票代码', index: 'invoiceno2', width: 130, className: 'text-center' }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' }, // { title: '作废日期', index: 'invalidTime', type: 'date', width: 150 }, // TODO { - title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 200, type: 'widget', + title: 'ETC开票金额', index: 'etcInvoiceMoney', className: 'text-center', width: 120, type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.etcInvoiceMoney }) } } ]; From ad5be2d8449816f19494dedd676c0b9b4dd3d2a2 Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 14:45:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice-reporting.component.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts index cb2c9e06..9ec54f1a 100644 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts +++ b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts @@ -209,12 +209,12 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, { title: '上传状态', render: 'uploadSts', className: 'text-center', width: '120px', }, - { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '120px', }, + { title: '发票类型', render: 'invoiceType', className: 'text-center', width: '180px', }, { title: '发票号码', index: 'invoiceno', className: 'text-center', - width: '150px', + width: '120px', type: 'link', click: item => { window.open(`/#/ticket/invoice-list/detail/${item.vatinvHId}?type=${item.invoiceType}`, '_blank', 'noopener') @@ -235,17 +235,17 @@ export class TaxManagementInvoiceReportingComponent implements OnInit { }, { title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' }, { - title: '订单号', index: 'billHCode', className: 'text-center', width: '120px', type: 'link', + title: '订单号', index: 'billHCode', className: 'text-center', width: '180px', type: 'link', click: item => { window.open(`/#/order-management/vehicle/vehicle-detail/${item.ltdId}`, '_blank', 'noopener') } }, - { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '180px' }, - { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '180px' }, + { title: '货物名称', index: 'goodsinfo', className: 'text-center', width: '120px' }, + { title: '价税合计', index: 'vatmoney', className: 'text-center', width: '120px' }, { title: '开票日期', index: 'invoicedate', className: 'text-center', width: '180px' }, - { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '250px' }, - { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '200px' }, - { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '200px' }, + { title: '发票所属月份', index: 'invoicemonth', className: 'text-center', width: '140px' }, + { title: '发票状态', index: 'sts', render: 'sts', className: 'text-center', width: '120px' }, + { title: '上传日期', index: 'uoloadDate', className: 'text-center', width: '180px' }, ]; } From 6cb9c468dedb99ed4d96f79c8be99882b609234c Mon Sep 17 00:00:00 2001 From: weiyu Date: Wed, 27 Apr 2022 15:35:22 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0&=E9=9A=90=E8=97=8F=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/order-reporting/order-reporting.component.ts | 2 +- .../routes/tax-management/services/tax-management.service.ts | 2 +- .../cancellation-invoice/cancellation-invoice.component.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 4477e8e8..fc07ab75 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -33,7 +33,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { { name: '异常', value: '2' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 + selectedIndex = '0'; //选择的项目 serviceTel = ''; constructor( public service: TaxManagementService, diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index ee087615..08bd087e 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -42,7 +42,7 @@ export class TaxManagementService extends ShipperBaseService { // 撤回税务订单 $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`; // 上传税务订单 - $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`; + $api_get_uploadingTaxOrder = `/api/sdc/taxOrder/orderUploadDJtax`; // 上传税务订单 $api_get_getTaxFieldCheckList = `/api/sdc/taxFieldCheck/getTaxFieldCheckList`; 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 bd28cc3d..e8a60d09 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 @@ -36,7 +36,7 @@ {{totalCallNo }} 清空 - +