Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/sys-setting/components/close-account/close-account.component.html

@@ -9,12 +9,12 @@
 <page-header-wrapper title="结算客户管理">
 </page-header-wrapper>
 
-<nz-card >
+<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"
+      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="service.http.loading" (formSubmit)="st?.load(1)"
-            (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+        (formReset)="resetSF()"></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -22,12 +22,10 @@
       <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">
+      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
-            <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
-              (click)="st?.load(1)">查询</button>
+        <button nz-button [disabled]="service.http.loading" nzType="primary">导出</button>
-            <button nz-button nzType="primary" 
+        <button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
-             >导出</button>
-            <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@@ -39,9 +37,9 @@
 
 <nz-card class="content-box">
 
-    <div class="d-flex justify-content-end mb-sm">
+  <div class="d-flex justify-content-end mb-sm mt-sm">
     <div>
-            <button nz-button nzType="primary" (click)="roleAction('',1)" >新增结算客户</button>
+      <button nz-button nzType="primary" (click)="roleAction('',1)">新增结算客户</button>
     </div>
   </div>
   <st #st [data]="service.$api_settlementCustomer_page" [columns]="columns"
@@ -58,7 +56,8 @@
   </st>
 </nz-card>
 
-<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" [nzTitle]="editText" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+<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>

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 })