diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts index 0bb7ef77..37d0090e 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts @@ -29,12 +29,12 @@ export class ETCInvoicedLogsComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf.value, exTime: { - start: this.sf.value.exTime?.[0] || null, - end: this.sf.value.exTime?.[1] || null + start: this.sf.value.exTime?.[0] || '', + end: this.sf.value.exTime?.[1] || '' }, invoiceMakeTime: { - start: this.sf.value.invoiceMakeTime?.[0] || null, - end: this.sf.value.invoiceMakeTime?.[1] || null + start: this.sf.value.invoiceMakeTime?.[0] || '', + end: this.sf.value.invoiceMakeTime?.[1] || '' } }); } 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 1a0169ca..616f487a 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 @@ -1,59 +1,69 @@ - - - + -
-
- -
-
- - - - -
+
+
+
+
+ + + + +
+
-
- - -
- 已选择 - {{ selectedRows.length }} 条数据   开票金额总计 {{ - totalCallNo }} - 清空 -
+
+ + +
+ 已选择 + {{ selectedRows.length }} 条数据   开票金额总计 + {{ totalCallNo }} + 清空
+
- - - {{item.no}} - 预览发票 - - - {{ item.expresscompany }}
{{ item.expressno }} -
-
+ + + {{ item.no }} + 预览发票 + + + 0.09 + + + {{ item.expresscompany }}
+ {{ item.expressno }} +
+
-

- 顺丰快递: {{routesInfo?.mailNo}} - 已签收 -

- -
\ No newline at end of file +

+ 顺丰快递: {{ routesInfo?.mailNo }} + 已签收 +

+ + 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 8d9a21ac..d01da241 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 @@ -210,14 +210,14 @@ export class InvoicedListComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } }, - { title: '税率', index: 'vatrate', className: 'text-right', width: 90 }, + { title: '税率', render: 'vatrate', className: 'text-right', width: 90 }, { title: '税额', - index: 'disvattax', + index: 'vattax', width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.disvattax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150 }, {