From db46e5c093b07feff8116d0e79aa7100fab340a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 14 Apr 2022 18:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order-reporting.component.html            | 22 +++++++++----------
 .../order-reporting.component.ts              | 10 ++++++---
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
index be7285cc..b1d74f18 100644
--- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html
@@ -3,19 +3,19 @@
 <nz-card>
   <!-- 搜索表单 -->
   <div nz-row nzGutter="8">
-    <div nz-col [nzSpan]="_$expand ? 24 : 18">
+    <div nz-col [nzSpan]=" 24 ">
       <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
     </div>
-    <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
-        acl [acl-ability]="['RiskOrder-Search']">查询</button>
-      <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button (click)="export()">导出</button>
-      <button nz-button nzType="link" (click)="expandToggle()">
-        {{ !_$expand ? '展开' : '收起' }}
-        <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-      </button>
-    </div>
+  </div>
+  <div [class.text-right]="true">
+    <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="search()"
+      acl [acl-ability]="['RiskOrder-Search']">查询</button>
+    <button nz-button (click)="resetSF()">重置</button>
+    <button nz-button (click)="export()">导出</button>
+    <button nz-button nzType="link" (click)="expandToggle()">
+      {{ !_$expand ? '展开' : '收起' }}
+      <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+    </button>
   </div>
 </nz-card>
 <nz-card>
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..0f7a87d1 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
@@ -112,7 +112,6 @@ export class DatatableOrderReportingComponent implements OnInit {
             placeholder: '请选择',
             widget: 'select',
             asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false),
-
             allowClear: true
           }
         },
@@ -266,8 +265,13 @@ export class DatatableOrderReportingComponent implements OnInit {
       },
     };
     this.ui = {
-      '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() },
-      $time: { grid: { span: 24 } },
+      '*': {
+        spanLabelFixed: 120,
+        grid: {
+          lg: 12,
+          xl: 8
+        }, enter: () => this.search()
+      },
     };
   }