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

src/app/routes/order-management/components/complaint/complaint.component.html

@@ -10,59 +10,67 @@
 -->
 
 <!-- 搜索表单 -->
-<page-header-wrapper title="" [tab]="tpTab">
+<!-- <page-header-wrapper title="" [tab]="tpTab">
   <ng-template #tpTab>
-    <nz-tabset [nzSelectedIndex]="selectedIndex">
+    <nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate">
       <nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
       </nz-tab>
     </nz-tabset>
   </ng-template>
-</page-header-wrapper>
-<nz-card>
+</page-header-wrapper> -->
+<!-- <nz-card>
   <div nz-row nzGutter="12">
-    <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-      <div nz-col [nzSpan]="24">
-        <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
-      </div>
-      <div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
-        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
-          (click)="st?.load(1)"  acl  [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
-        <button nz-button nzType="primary" acl  [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()"
-         >导出</button>
-        <button nz-button (click)="resetSF()">重置</button>
-      </div>
+    <div nz-col [nzSpan]="24">
+      <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
+    </div>
+    <div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;">
+      <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
+        (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
+      <button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button>
+      <button nz-button (click)="resetSF()">重置</button>
+    </div>
   </div>
-</nz-card>
+</nz-card> -->
 
-<nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
-    <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name" (nzClick)="tabChange(i)">
+<nz-card class="table-box">
+  <div class="tab_header">
+    <label class="page_title"> <label class="driver">|</label> 投诉管理</label>
+    <nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate">
+      <nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
+      </nz-tab>
+    </nz-tabset>
+  </div>
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)">
+    <nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name" (nzClick)="tabChange(i)">
     </nz-tab>
   </nz-tabset>
-  <div style="margin-top: 15px;">
-    <st
-    #st
-    [bordered]="true"
-    [scroll]="{ x: '2000px' }"
-    [data]="service.$api_get_operate_listPage"
-    [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]="false"
-    >
-    <ng-template st-row="complaintCode" let-item let-index="index">
-      <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
-    </ng-template>
-    <ng-template st-row="complaintCauseLabel" let-item let-index="index">
-     <div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
-     <div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
-    </ng-template>
+  <div>
+    <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY  }" [data]="service.$api_get_operate_listPage"
+      [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]="false">
+      <ng-template st-row="complaintCode" let-item let-index="index">
+        <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
+      </ng-template>
+      <ng-template st-row="complaintCauseLabel" let-item let-index="index">
+        <div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
+        <div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
+      </ng-template>
     </st>
   </div>
 </nz-card>
 
-<nz-modal [(nzVisible)]="isVisibleRE"  [nzWidth]="600" [nzFooter]="nzModalFooterview2"  (nzOnOk)="handleOK()" nzTitle="处理" (nzOnCancel)="Cancel()">
+<ng-template #extraTemplate>
+  <div class="mr-sm">
+    <button nz-button nzDanger [nzLoading]="isLoading && st.loading" (click)="openDrawer()" acl
+      [acl-ability]="['ORDER-COMPLAINT-search']">筛选</button>
+    <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button>
+  </div>
+</ng-template>
+
+<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="处理"
+  (nzOnCancel)="Cancel()">
   <ng-container *nzModalContent>
     <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
     </sf>
@@ -72,6 +80,4 @@
     <button nz-button nzType="primary" (click)="handleOK()">通过</button>
     <button nz-button nzType="primary" (click)="handleCancel2()">强制取消</button>
   </ng-template>
-</nz-modal>
-
-
+</nz-modal>

src/app/routes/order-management/components/complaint/complaint.component.ts

@@ -6,20 +6,19 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
 import { OrderManagementService } from '../../services/order-management.service';
+import { SearchDrawerService } from '@shared';
+import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
 
 @Component({
   selector: 'app-supply-management-complaint',
   templateUrl: './complaint.component.html',
-  styleUrls: ['./complaint.component.less']
+  styleUrls: ['../../../commom/less/commom-table.less', './complaint.component.less']
 })
-export class OrderManagementComplaintComponent implements OnInit {
-  ui: SFUISchema = {};
+export class OrderManagementComplaintComponent extends BasicTableComponent implements OnInit {
   uiView: SFUISchema = {};
-  schema: SFSchema = {};
   schemaView: SFSchema = {};
   auditMany = false;
   isVisibleRE = false;
-  _$expand = false;
   channelId: any;
   resourceStatus: any;
   selectedMainTabStatus = '2';
@@ -51,7 +50,13 @@ export class OrderManagementComplaintComponent implements OnInit {
       type: 3
     }
   ];
-  constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) {
+  constructor(
+    public service: OrderManagementService,
+    private modal: NzModalService,
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
     //    console.log(this.selectedIndex);
     //   if (this.selectedIndex === 0) {
     //   this.selectedMainTabStatus = '2';
@@ -101,8 +106,7 @@ export class OrderManagementComplaintComponent implements OnInit {
         wayBillCode: {
           type: 'string',
           title: '运单号',
-          ui: {
-          }
+          ui: {}
         },
         drvComplaintCause: {
           title: '投诉原因',
@@ -110,7 +114,7 @@ export class OrderManagementComplaintComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'drvcomplaint:cause' },
-            hidden:  this.selectedMainTabStatus == '1',
+            hidden: this.selectedMainTabStatus == '1',
             containsAllLabel: true
           } as SFSelectWidgetSchema
         },
@@ -120,7 +124,7 @@ export class OrderManagementComplaintComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'drvcomplaint:cause' },
-            hidden:  this.selectedMainTabStatus == '2',
+            hidden: this.selectedMainTabStatus == '2',
             containsAllLabel: true
           } as SFSelectWidgetSchema
         },
@@ -132,16 +136,10 @@ export class OrderManagementComplaintComponent implements OnInit {
             widget: 'sl-from-to',
             type: 'date',
             format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
           } as SFDateWidgetSchema
         }
       }
     };
-    this.ui = {
-      '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } }
-    };
   }
 
   /**
@@ -270,21 +268,7 @@ export class OrderManagementComplaintComponent implements OnInit {
   get queryFieldCount(): number {
     return Object.keys(this.schema?.properties || {}).length;
   }
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle(): void {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/_$expand', this._$expand);
-  }
   tabChange(item: any) {}
-  /**
-   * 重置表单
-   */
-  resetSF(): void {
-    this.sf.reset();
-    this.isLoading = true;
-  }
   selectChange(e: number) {
     this.resourceStatus = e;
     this.initST();