edit

2022-04-25 10:29:41 +08:00
parent b8415bbac5
commit ca11cf85f4
18 changed files with 507 additions and 889 deletions
--- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
+++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
@ -9,41 +9,18 @@
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <!-- 搜索表单 -->
-<page-header-wrapper [title]="''"> </page-header-wrapper>
+<!-- <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]="false"
-        (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"
-          [nzLoading]="service.http.loading"
-          (click)="search()"
-          acl
-          [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
-          >查询</button
-        >
-        <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
-          >导出</button
-        >
+        <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
+          [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button>
+        <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
+          (click)="exprot()">导出</button>
        <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
        <button nz-button nzType="link" (click)="expandToggle()">
          {{ !_$expand ? '展开' : '收起' }}
@ -52,23 +29,25 @@
      </div>
    </ng-container>
  </div>
-</nz-card>
+</nz-card> -->

-<nz-card>
-  <div style="margin-top: 15px">
-    <st
-      #st
-      [bordered]="true"
-      [scroll]="{ x: '2000px' }"
-      [data]="service.$api_get_abnormalWarning"
+<nz-card class="table-box">
+  <div class="header_box">
+    <label class="page_title"> <label class="driver">|</label> 异常预警</label>
+    <div class="mr-sm">
+      <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+        [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
+      <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
+    </div>
+  </div>
+  <div>
+    <st #st [bordered]="true" [scroll]="{ x: '2000px' ,y:scrollY }" [data]="service.$api_get_abnormalWarning"
      [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"
-    >
-    
-   
+      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
+
+
      <ng-template st-row="driverName" let-item let-index="index">
        <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }} </div>
      </ng-template>
@ -84,11 +63,14 @@
          <span>{{ item?.billStatusLabel }}</span>
        </div>
        <div>
-          <span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span>
+          <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ?
+            '':item?.serviceTypeLabel}}</span>
        </div>
      </ng-template>
    </st>
  </div>
 </nz-card>

+<ng-template #extraTemplate>

+</ng-template>
--- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
+++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
@ -1,29 +1,24 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
-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 { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
-import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
 import { of } from 'rxjs';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { Router } from '@angular/router';
-import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component';
+import { BasicTableComponent } from 'src/app/routes/commom';

@Component({
  selector: 'app-order-management-abnormal-warning',
  templateUrl: './abnormal-warning.component.html',
-  styleUrls: ['./abnormal-warning.component.less']
+  styleUrls: ['../../../commom/less/commom-table.less', './abnormal-warning.component.less']
 })
-export class OrderManagementAbnormalWarningComponent implements OnInit {
-  ui: SFUISchema = {};
+export class OrderManagementAbnormalWarningComponent extends BasicTableComponent implements OnInit {
  uiView: SFUISchema = {};
-  schema: SFSchema = {};
  schemaView: SFSchema = {};
-  changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
-  changeViewId: any;  // 查看运费变更记录id - 用于查看
+  changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
+  changeViewId: any; // 查看运费变更记录id - 用于查看
  auditId: any;
  auditIdR: any;
  auditMany = false;
@ -31,22 +26,23 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
  isVisibleEvaluate = false;
  isVisible = false;
  isVisibleRE = false;
-  _$expand = false;
  @ViewChild('st') private readonly st!: STComponent;
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
  @ViewChild('sfView', { static: false }) sfView!: SFComponent;
  @ViewChild('stFloat') private readonly stFloat!: STComponent;
  @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
  columns: STColumn[] = [];
  columnsFloat: STColumn[] = [];
  columnsFloatView: STColumn[] = [];
-  ViewCause: any;  // 变更运费查看数据
+  ViewCause: any; // 变更运费查看数据
  constructor(
    public service: OrderManagementService,
    private modal: NzModalService,
    public shipperservice: ShipperBaseService,
-    private router: Router
-  ) { }
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }

  /**
   * 查询参数
@ -96,14 +92,12 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
        billCode: {
          type: 'string',
          title: '订单号',
-          ui: {
-          }
+          ui: {}
        },
        wayBillCode: {
          type: 'string',
          title: '运单号',
-          ui: {
-          }
+          ui: {}
        },
        serviceType: {
          title: '服务类型',
@ -112,7 +106,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
          ui: {
            widget: 'dict-select',
            params: { dictKey: 'service:type' },
-            containsAllLabel: true,
+            containsAllLabel: true
          } as SFSelectWidgetSchema
        },
        resourceType: {
@ -120,12 +114,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
          type: 'string',
          default: '',
          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
            widget: 'dict-select',
            params: { dictKey: 'goodresource:type' },
-            containsAllLabel: true,
+            containsAllLabel: true
          } as SFSelectWidgetSchema
        },
        shipperId: {
@ -137,11 +128,8 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
            searchDebounceTime: 300,
            searchLoadingText: '搜索中...',
            allowClear: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
            onSearch: (q: any) => {
-              let str =q.replace(/^\s+|\s+$/g,"");
+              let str = q.replace(/^\s+|\s+$/g, '');
              if (str) {
                return this.service
                  .request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -150,44 +138,24 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
              } else {
                return of([]);
              }
-            },
+            }
          } as SFSelectWidgetSchema
        },
        loadingPlace: {
          type: 'string',
          title: '装货地',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
        },
        dischargePlace: {
          type: 'string',
          title: '卸货地',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
        },
        driverName: {
          title: '承运司机',
          type: 'string',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
        },
        carNo: {
          title: '车牌号',
          type: 'string',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
        },
        warningTime: {
          title: '预警时间',
@ -197,15 +165,11 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
            mode: 'range',
            format: 'yyyy-MM-dd',
            allowClear: true,
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
          } as SFDateWidgetSchema
-        },
+        }
      },
      type: 'object'
    };
-    this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
  }

  /**
@ -227,13 +191,19 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
        className: 'text-left',
        index: 'wayCode'
      },
-      { title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => {
-        return item?.resourceTypeLabel + item?.serviceTypeLabel
-      } },
+      {
+        title: '服务类型',
+        index: 'serviceTypeLabel',
+        width: '220px',
+        className: 'text-left',
+        format: item => {
+          return item?.resourceTypeLabel + item?.serviceTypeLabel;
+        }
+      },
      { title: '货主', index: 'shipperName', width: '220px', className: 'text-left' },
      { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' },
      { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' },
-      { title: '司机',  render: 'driverName', width: '180px', className: 'text-left' },
+      { title: '司机', render: 'driverName', width: '180px', className: 'text-left' },
      { title: '车牌号', index: 'carNo', width: '180px', className: 'text-left' },
      { title: '预警类型', index: 'warningTypeLabel', width: '180px', className: 'text-left' },
      {
@ -252,39 +222,15 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
        title: '提醒内容',
        className: 'text-left',
        width: '250px',
-        index: 'warningContent',
-      },
-    
+        index: 'warningContent'
+      }
    ];
  }

-  /**
-   * 查询字段个数
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
-  }
+  tabChange(item: any) {}

- 
-  /**
-   * 伸缩查询条件
-   */
-  expandToggle(): void {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/_$expand', this._$expand);
+  // 导出
+  exprot() {
+    this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
  }
-  tabChange(item: any) { }
-  /**
-   * 重置表单
-   */
-  resetSF(): void {
-    this.sf.reset();
-    this._$expand = false;
-  }
-
-
-    // 导出
-    exprot() {
-      this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
-    }
 }