From 206ffaa9b9e477f4f247becc548b0dd135c5499f Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 9 Mar 2022 16:12:37 +0800
Subject: [PATCH] edit

---
 .../invoiced-list/invoiced-list.component.html   |  2 +-
 .../invoiced-list/invoiced-list.component.ts     | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

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 a0b80dae..a917295f 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
@@ -13,7 +13,7 @@
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
         [compact]="true" [button]="'none'"></sf>
     </div>
     <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
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 9d4c337e..34c6d849 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
@@ -38,9 +38,9 @@ export class InvoicedListComponent implements OnInit {
     if (this.sf) {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
-        createTime: {
-          start: this.sf.value.createTime?.[0] || '',
-          end: this.sf.value.createTime?.[1] || ''
+        invoicedate: {
+          start: this.sf.value.invoicedate?.[0] || '',
+          end: this.sf.value.invoicedate?.[1] || ''
         }
       });
     }
@@ -135,7 +135,7 @@ export class InvoicedListComponent implements OnInit {
             autocomplete: 'off'
           }
         },
-        createTime: {
+        invoicedate: {
           title: '开票日期',
           type: 'string',
           ui: {
@@ -145,13 +145,11 @@ export class InvoicedListComponent implements OnInit {
             nzShowTime: true
           } as SFDateWidgetSchema
         },
-        arto: {
+        artoname: {
           type: 'string',
           title: '购买人',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请输入',
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -167,7 +165,7 @@ export class InvoicedListComponent implements OnInit {
             visibleIf: {
               expand: (value: boolean) => value
             },
-            asyncData: () => this.service.getNetworkFreightForwarder()
+            asyncData: () => this.service.getNetworkFreightForwarder({}, true)
           },
           default: ''
         }