From 03dbc7fce6b43d25449813d0b3e12d5e5eb99d41 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 12 Jan 2022 10:53:52 +0800
Subject: [PATCH] edit

---
 .../close-account.component.html              | 101 +++++++++---------
 .../close-account/close-account.component.ts  |   2 +-
 2 files changed, 51 insertions(+), 52 deletions(-)

diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.html b/src/app/routes/sys-setting/components/close-account/close-account.component.html
index ead06e4b..72a057aa 100644
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.html
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.html
@@ -9,62 +9,61 @@
 <page-header-wrapper title="结算客户管理">
 </page-header-wrapper>
 
-<nz-card >
-    <div nz-row nzGutter="8">
-        <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-        <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-          <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
-            (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
-        </div>
-    
-        <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-        <ng-container *ngIf="queryFieldCount > 4">
-          <div nz-col [nzSpan]="_$expand ? 24 : 18">
-            <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]="service.http.loading"
-              (click)="st?.load(1)">查询</button>
-            <button nz-button nzType="primary" 
-             >导出</button>
-            <button nz-button (click)="resetSF()">重置</button>
-            <button nz-button nzType="link" (click)="expandToggle()">
-              {{ !_$expand ? '展开' : '收起' }}
-              <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-            </button>
-          </div>
-        </ng-container>
+<nz-card>
+  <div nz-row nzGutter="8">
+    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
+    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
+      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="service.http.loading" (formSubmit)="st?.load(1)"
+        (formReset)="resetSF()"></sf>
+    </div>
+
+    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
+    <ng-container *ngIf="queryFieldCount > 4">
+      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
+        <button nz-button [disabled]="service.http.loading" nzType="primary">导出</button>
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
+        <button nz-button nzType="link" (click)="expandToggle()">
+          {{ !_$expand ? '展开' : '收起' }}
+          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
+        </button>
+      </div>
+    </ng-container>
+  </div>
 </nz-card>
 
 <nz-card class="content-box">
 
-    <div class="d-flex justify-content-end mb-sm">
-        <div>
-            <button nz-button nzType="primary" (click)="roleAction('',1)" >新增结算客户</button>
-        </div>
+  <div class="d-flex justify-content-end mb-sm mt-sm">
+    <div>
+      <button nz-button nzType="primary" (click)="roleAction('',1)">新增结算客户</button>
     </div>
-    <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
-        <ng-template st-row="customerType" let-item let-index="index">
-            <div>
-              <span *ngIf="item?.customerType == 1">客户</span>
-              <span *ngIf="item?.customerType == 2">供应商</span>
-            </div>
-          </ng-template>
-    </st>
+  </div>
+  <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
+    [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
+    <ng-template st-row="customerType" let-item let-index="index">
+      <div>
+        <span *ngIf="item?.customerType == 1">客户</span>
+        <span *ngIf="item?.customerType == 2">供应商</span>
+      </div>
+    </ng-template>
+  </st>
 </nz-card>
 
-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="editText" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
-    <ng-container *nzModalContent>
-      <sf #sfFre [schema]="addSchema" [ui]="ui2" [formData]="formData" [compact]="false" [button]="'none'">
-      </sf>
-    </ng-container>
-    <ng-template #nzModalFooter>
-      <button nz-button nzType="primary" (click)="handleCancel()" [disabled]="">取消</button>
-      <button nz-button nzType="default" (click)="handleOK()">确 定</button>
-    </ng-template>
-</nz-modal>
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" [nzTitle]="editText" (nzOnOk)="handleOK()"
+  (nzOnCancel)="handleCancel()">
+  <ng-container *nzModalContent>
+    <sf #sfFre [schema]="addSchema" [ui]="ui2" [formData]="formData" [compact]="false" [button]="'none'">
+    </sf>
+  </ng-container>
+  <ng-template #nzModalFooter>
+    <button nz-button nzType="primary" (click)="handleCancel()" [disabled]="">取消</button>
+    <button nz-button nzType="default" (click)="handleOK()">确 定</button>
+  </ng-template>
+</nz-modal>
\ No newline at end of file
diff --git a/src/app/routes/sys-setting/components/close-account/close-account.component.ts b/src/app/routes/sys-setting/components/close-account/close-account.component.ts
index ea6b7fc0..081892fe 100644
--- a/src/app/routes/sys-setting/components/close-account/close-account.component.ts
+++ b/src/app/routes/sys-setting/components/close-account/close-account.component.ts
@@ -10,7 +10,7 @@ import { SystemService } from '../../services/system.service';
 @Component({
   selector: 'app-close-account',
   templateUrl: './close-account.component.html',
-  styleUrls: ['./close-account.component.less']
+  styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
 })
 export class CloseAccountComponent implements OnInit {
   @ViewChild('st', { static: true })