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/waybill-management/components/abnormal-appear/abnormal-appear.component.html
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
@ -6,17 +6,10 @@
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
 -->
-<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)="search()" (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>
@ -32,57 +25,62 @@
      </div>
    </ng-container>
  </div>
+</nz-card> -->
+
+<nz-card class="table-box">
+  <div class="tab_header">
+    <label class="page_title"> <label class="driver">|</label> 异常上报</label>
+    <nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)"
+      [nzTabBarExtraContent]="extraTemplate">
+      <nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'"></nz-tab>
+      <nz-tab [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'"> </nz-tab>
+    </nz-tabset>
+  </div>
+  <div>
+    <st #st [data]="service.$api_get_listOperatePage" [columns]="columns" [req]="{  params: reqParams }" [page]="{  }"
+      [loading]="false" [scroll]="{ x: '2000px' ,y:scrollY }">
+      <ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
+        <div class="imgBox">
+          <div *ngIf="item?.exceptionCertificateFirstFilePath">
+            <app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateFirstFilePath]">
+            </app-imagelist>
+          </div>
+          <div *ngIf="item?.exceptionCertificateSecondFilePath">
+            <app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateSecondFilePath]">
+            </app-imagelist>
+          </div>
+          <div *ngIf="item?.exceptionCertificateThirdFilePath">
+            <app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateThirdFilePath]">
+            </app-imagelist>
+          </div>
+        </div>
+      </ng-template>
+    </st>
+    <!-- <st #st2 *ngIf="selectedIndex===1" [data]="service.$api_get_listOperatePage" [columns]="columns2"
+      [req]="{ params: reqParams2 }" [page]="{ }" [loading]="false" [scroll]="{ x: '2000px',y:scrollY  }">
+      <ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
+        <div class="imgBox">
+          <div *ngIf="item?.exceptionCertificateFirstFilePath">
+            <app-imagelist [imgList]="[item?.exceptionCertificateFirstFilePath]"> </app-imagelist>
+          </div>
+          <div *ngIf="item?.exceptionCertificateSecondFilePath">
+            <app-imagelist [imgList]="[item?.exceptionCertificateSecondFilePath]"> </app-imagelist>
+          </div>
+          <div *ngIf="item?.exceptionCertificateThirdFilePath">
+            <app-imagelist [imgList]="[item?.exceptionCertificateThirdFilePath]"> </app-imagelist>
+          </div>
+        </div>
+      </ng-template>
+    </st> -->
+  </div>
 </nz-card>

-<nz-card class="content-box">
-  <nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)">
-    <nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'">
-      <st #st [data]="service.$api_get_listOperatePage" [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"
-        [scroll]="{ x: '2000px' }">
-        <ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
-          <div class="imgBox">
-            <div *ngIf="item?.exceptionCertificateFirstFilePath">
-              <app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateFirstFilePath]">
-              </app-imagelist>
-            </div>
-            <div *ngIf="item?.exceptionCertificateSecondFilePath">
-              <app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateSecondFilePath]">
-              </app-imagelist>
-            </div>
-            <div *ngIf="item?.exceptionCertificateThirdFilePath">
-              <app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateThirdFilePath]">
-              </app-imagelist>
-            </div>
-          </div>
-        </ng-template>
-      </st>
-    </nz-tab>
-    <nz-tab [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'">
-      <st #st2 [data]="service.$api_get_listOperatePage" [columns]="columns2"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams2 }"
-        [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"
-        [scroll]="{ x: '2000px' }">
-        <ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
-          <div class="imgBox">
-            <div *ngIf="item?.exceptionCertificateFirstFilePath">
-              <app-imagelist [imgList]="[item?.exceptionCertificateFirstFilePath]"> </app-imagelist>
-            </div>
-            <div *ngIf="item?.exceptionCertificateSecondFilePath">
-              <app-imagelist [imgList]="[item?.exceptionCertificateSecondFilePath]"> </app-imagelist>
-            </div>
-            <div *ngIf="item?.exceptionCertificateThirdFilePath">
-              <app-imagelist [imgList]="[item?.exceptionCertificateThirdFilePath]"> </app-imagelist>
-            </div>
-          </div>
-        </ng-template>
-      </st>
-    </nz-tab>
-  </nz-tabset>
-</nz-card>
+<ng-template #extraTemplate>
+  <div class="mr-sm">
+    <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
+      [acl-ability]="['WAYBILL-ABNORMAL-search']">筛选</button>
+  </div>
+</ng-template>

 <ng-template #detailModal>
  <div nz-row nzGutter="8">
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@ -10,32 +10,28 @@ import {
  SFSelectWidgetSchema,
  SFUISchema
 } from '@delon/form';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
 import { WaybillManagementServe } from '../../services/waybill-management.service';

@Component({
  selector: 'app-abnormal-appear',
  templateUrl: './abnormal-appear.component.html',
-  styleUrls: ['./abnormal-appear.component.less']
+  styleUrls: ['../../../commom/less/commom-table.less', './abnormal-appear.component.less']
 })
-export class WaybillManagementAbnormalAppearComponent implements OnInit {
+export class WaybillManagementAbnormalAppearComponent extends BasicTableComponent implements OnInit {
  @ViewChild('detailModal', { static: true })
  detailModal!: any;
  @ViewChild('replyModal', { static: true })
  replyModal!: any;
  @ViewChild('st', { static: true })
  st!: STComponent;
-  @ViewChild('st2', { static: true })
-  st2!: STComponent;
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
  ui: SFUISchema = {};
  ui2: SFUISchema = {};
-  schema: SFSchema = {};
  addSchema: SFSchema = {};
-  _$expand = false;
  editText = '';
  formData: any;
  isVisible = false;
@ -74,44 +70,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
    { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
    { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '300px', className: 'text-left' },
    { title: '上报时间', index: 'createTime', width: '180px', className: 'text-center' },
+    { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
+    { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
    {
      title: '操作',
      fixed: 'right',
      width: '100px',
+      iif: _ => this.selectedIndex === 0,
      className: 'text-center',
      buttons: [{ text: '回复', click: item => this.replyAction(item) }]
    }
  ];
-  columns2: STColumn[] = [
-    {
-      title: '异常编号',
-      index: 'exceptionCode',
-      width: '180px',
-      className: 'text-left',
-      type: 'link',
-      click: item => this.reviewDetailAction(item)
-    },
-    { title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' },
-    {
-      title: '关联运单号',
-      index: 'wayBillCode',
-      width: '180px',
-      className: 'text-left',
-      type: 'link',
-      click: item => this.routeToBill(item)
-    },
-    { title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
-    { title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
-    { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
-    { title: '卸货地', index: 'unloadingAddressArr', width: '180px', className: 'text-left' },
-    { title: '承运司机', index: 'driver', width: '200px', className: 'text-left' },
-    { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
-    { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
-    { title: '上报时间', index: 'createTime', width: '180px', className: 'text-left' },
-    { title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
-    { title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
-    { title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
-  ];
  resourceStatus: number | undefined;

  get reqParams() {
@ -140,28 +109,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
    public service: WaybillManagementServe,
    private nzModalService: NzModalService,
    public shipperSrv: ShipperBaseService,
-    private router: Router
-  ) {}
+    private router: Router,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }

  ngOnInit(): void {
    this.initSF();
    this.getGoodsSourceStatistical();
  }

-  /**
-   * 伸缩查询条件
-   */
-  expandToggle(): void {
-    this._$expand = !this._$expand;
-    this.sf?.setValue('/_$expand', this._$expand);
-  }
-  /**
-   * 查询字段个数
-   */
-  get queryFieldCount(): number {
-    return Object.keys(this.schema?.properties || {}).length;
-  }
-
  reviewDetailAction(item: any) {
    this.itemInfo = {};
    this.service.request(`${this.service.$api_get_listOperate_detail}${item.id}`, {}, 'GET').subscribe(res => {
@ -217,7 +175,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
  initSF() {
    this.schema = {
      properties: {
-        _$expand: { type: 'boolean', ui: { hidden: true } },
        exceptionCode: {
          type: 'string',
          title: '异常编号',
@ -259,9 +216,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
            },
            change: (q: any) => {
              this.getRegionCode(q);
-            },
-            visibleIf: {
-              _$expand: (value: boolean) => value
            }
          } as SFSelectWidgetSchema
        },
@ -270,29 +224,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
          title: '所属项目',
          ui: {
            widget: 'select',
-            placeholder: '请先选择货主',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
+            placeholder: '请先选择货主'
          } as SFSelectWidgetSchema
        },
        driverName: {
          title: '承运司机',
-          type: 'string',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
+          type: 'string'
        },
        carNo: {
          title: '车牌号',
-          type: 'string',
-          ui: {
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
-          }
+          type: 'string'
        },
        reportingTime: {
          title: '上报时间',
@ -300,10 +241,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
          ui: {
            widget: 'date',
            mode: 'range',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
+            format: 'yyyy-MM-dd'
          } as SFDateWidgetSchema
        },
        enterpriseInfoId: {
@ -312,9 +250,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
          ui: {
            widget: 'select',
            placeholder: '请选择',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
            allowClear: true,
            asyncData: () => this.shipperSrv.getNetworkFreightForwarder()
          }
@ -328,7 +263,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
    this.resourceStatus = e;
    setTimeout(() => {
      this?.st?.load(1);
-      this?.st2?.load(1);
+      this.st.resetColumns();
    }, 0);
  }
  getGoodsSourceStatistical() {
@ -351,11 +286,9 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
    });
  }
  search() {
-    if (this.selectedIndex === 0) {
-      this.st?.load(1);
-    } else {
-      this.st2?.load(1);
-    }
+    console.log(this.st);
+
+    this.st?.load(1);
    this.getGoodsSourceStatistical();
  }
  /**