edit

2022-04-25 11:32:16 +08:00
parent db6231925e
commit c3280283d6
9 changed files with 194 additions and 204 deletions
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@ -10,28 +10,18 @@
 -->

 <!-- 搜索表单 -->
-<nz-card>
+<!-- <nz-card>
  <div nz-row nzGutter="8">
    <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf
-        #sf
-        [schema]="schema"
-        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }"
-        [compact]="true"
-        [button]="'none'"
-      ></sf>
+      <sf #sf [schema]="schema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24, gutter: 4 } } }" [compact]="true"
+        [button]="'none'"></sf>
    </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand" class="text-right">
-      <button
-        nz-button
-        nzType="primary"
-        [nzLoading]="loading"
-        (click)="search()"
-        acl
-        [acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
-        >查询</button
-      >
-      <button nz-button nzType="primary" [disabled]="loading" (click)="exportFire()" >导出</button>
+    <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
+      class="text-right">
+      <button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl
+        [acl-ability]="['SUPPLY-INDEX-vehicleSearch']">查询</button>
+      <button nz-button nzType="primary" [disabled]="loading" (click)="exportFire()">导出</button>
      <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
      <button nz-button nzType="link" (click)="expandToggle()">
        {{ !_$expand ? '展开' : '收起' }}
@ -39,41 +29,32 @@
      </button>
    </div>
  </div>
-</nz-card>
+</nz-card> -->

-<nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
-    <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
-    <nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
-    <nz-tab [nzTitle]="'已接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
-    <nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
-  </nz-tabset>
-  <div style="margin-top: 15px">
+<nz-card class="table-box" style="margin: 0;">
+  <div class="tab_header">
+    <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
+      <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
+      <nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
+      <nz-tab [nzTitle]="'已接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
+      <nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
+    </nz-tabset>
+  </div>
+
+  <div>
    <!-- 选中提示框 -->
-    <div style="position: relative">
-      <nz-alert
-        nzType="info"
-        [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
-        nzShowIcon
-        [ngStyle]="{ margin: '0 0 1rem 0' }"
-      >
+    <div style="position: relative;">
+      <nz-alert nzType="info" [nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'" nzShowIcon
+        style="margin: 0.5rem 16px;display: block;" class="header_box">
      </nz-alert>
    </div>
    <!-- [req]="{ params: reqParams }" -->

-    <st
-      #st
-      [data]="service.$api_get_wholePage_list"
-      [columns]="columns"
-      [req]="{  process: beforeReq }"
-      [res]="{ process: afterRes }"
-      [page]="{ }"
-      [loading]="loading"
-      [scroll]="{ x: '1200px', y: '500px' }"
-    >
-    <ng-template st-row="createUserName" let-item let-index="index">
-      <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
-    </ng-template>
+    <st #st [data]="service.$api_get_wholePage_list" [columns]="columns" [req]="{  process: beforeReq }"
+      [res]="{ process: afterRes }" [page]="{ }" [loading]="loading" [scroll]="{ x: '1200px',y:scrollY  }">
+      <ng-template st-row="createUserName" let-item let-index="index">
+        <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
+      </ng-template>
      <ng-template st-row="resourceCode" let-item let-index="index">
        <a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.resourceCode }}</a>
        <p>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</p>
@ -97,25 +78,41 @@
 </nz-card>
 <ng-template #extraTemplate>
  <div>
-    <button (click)="audit('', 2)" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']">审核</button>
-    <button (click)="releaseGoods()" nz-button nzType="primary" acl [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']"
-      >代发货源</button
-    >
-    <button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
+    <button nz-button nzDanger (click)="openDrawer()" class="mr-sm" acl
+      [acl-ability]="['SUPPLY-INDEX-vehicleSearch']">筛选</button>
+    <button nz-button nzDanger [disabled]="loading" (click)="exportFire()">导出</button>
+    <button nz-button nz-dropdown [nzDropdownMenu]="menu" nzPlacement="bottomLeft">
+      更多<i nz-icon nzType="down" nzTheme="outline"></i></button>
+    <nz-dropdown-menu #menu="nzDropdownMenu">
+      <ul nz-menu>
+        <li nz-menu-item acl [acl-ability]="['SUPPLY-INDEX-vehicleBatchAudit']" (click)="audit('', 2)">
+          审核
+        </li>
+        <li nz-menu-item acl [acl-ability]="['SUPPLY-INDEX-vehicleUndertakesToSupply']" (click)="releaseGoods()">
+          代发货源
+        </li>
+        <li nz-menu-item (click)="importGoodsSource()">
+          导入货源
+        </li>
+      </ul>
+    </nz-dropdown-menu>
  </div>
 </ng-template>

-<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnCancel)="handleCancel('suppliersType')">
+<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核"
+  (nzOnCancel)="handleCancel('suppliersType')">
  <ng-container *nzModalContent>
    <div style="position: relative" *ngIf="auditMany">
-      <nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon [ngStyle]="{ margin: '0 0 1rem 0' }">
+      <nz-alert nzType="info" [nzMessage]="'已选择' + selectedRows?.length + '项'" nzShowIcon
+        [ngStyle]="{ margin: '0 0 1rem 0' }">
      </nz-alert>
    </div>
-    <sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false" [button]="'none'">
+    <sf #sfFre [schema]="freightSchema" [ui]="{ '*': { spanLabelFixed: 120, grid: { span: 16 } } }" [compact]="false"
+      [button]="'none'">
    </sf>
  </ng-container>
  <ng-template #nzModalFooter>
    <button nz-button nzType="primary" (click)="handleOK(1)" [disabled]="">通过</button>
    <button nz-button nzType="default" (click)="handleOK(2)">不通过</button>
  </ng-template>
-</nz-modal>
+</nz-modal>
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@ -9,17 +9,17 @@ import { SupplyManagementService } from '../../services/supply-management.servic
 import { SupplyManagementVehicleAssignedCarComponent } from '../assigned-car/assigned-car.component';
 import { SupplyManagementUpdateExternalSnComponent } from '../update-external-sn/update-external-sn.component';
 import { of } from 'rxjs';
-import { ShipperBaseService } from '@shared';
+import { SearchDrawerService, ShipperBaseService } from '@shared';
 import { SupplyManagementImportSupplyComponent } from '../../model/import-supply/import-supply.component';
+import { BasicTableComponent } from 'src/app/routes/commom';

@Component({
  selector: 'app-supply-management-vehicle',
  templateUrl: './vehicle.component.html',
-  styleUrls: ['./vehicle.component.less']
+  styleUrls: ['../../../commom/less/commom-table.less', './vehicle.component.less']
 })
-export class SupplyManagementVehicleComponent implements OnInit {
+export class SupplyManagementVehicleComponent extends BasicTableComponent implements OnInit {
  @ViewChild('st') private readonly st!: STComponent;
-  @ViewChild('sf', { static: false }) sf!: SFComponent;
  @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
  loading: boolean = true;
  schema: SFSchema = this.initSF();
@ -38,13 +38,18 @@ export class SupplyManagementVehicleComponent implements OnInit {

  resourceStatus: any;
  auditID: any;
+
+  deviationHeight = 10;
  constructor(
    public service: SupplyManagementService,
    private modal: NzModalService,
    private router: Router,
    private ar: ActivatedRoute,
-    public shipperSrv: ShipperBaseService
-  ) { }
+    public shipperSrv: ShipperBaseService,
+    public searchDrawerService: SearchDrawerService
+  ) {
+    super(searchDrawerService);
+  }

  /**
   * 查询参数
@ -150,7 +155,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
  /**
   * 导入货源
   */
-   importGoodsSource() {
+  importGoodsSource() {
    const modalRef = this.modal.create({
      nzTitle: '货源导入',
      nzWidth: 600,
@ -181,25 +186,25 @@ export class SupplyManagementVehicleComponent implements OnInit {
              type: 'primary',
              loading: this.service.http.loading,
              onClick: () => {
-                if(!result?.failNumber) {
+                if (!result?.failNumber) {
                  this.service.msgSrv.error('没有失败数据！');
                  tipsModal.destroy();
                  this.st?.reload();
                  this.getGoodsSourceStatistical();
                  return;
                }
-                this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids)
+                this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids);
                tipsModal.destroy();
                this.st?.reload();
                this.getGoodsSourceStatistical();
              }
-            },
+            }
          ]
-        })
-        tipsModal.afterClose.subscribe(result => { 
+        });
+        tipsModal.afterClose.subscribe(result => {
          this.st?.reload();
-         this.getGoodsSourceStatistical();
-        })
+          this.getGoodsSourceStatistical();
+        });
      } else {
        this.st?.reload();
        this.getGoodsSourceStatistical();
@ -207,7 +212,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
    });
  }

-
  /**
   * 重新指派
   */
@ -396,9 +400,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
            serverSearch: true,
            searchDebounceTime: 300,
            searchLoadingText: '搜索中...',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
            allowClear: true,
            onSearch: (q: any) => {
              let str = q.replace(/^\s+|\s+$/g, '');
@ -434,10 +435,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
          title: '所属项目',
          ui: {
            widget: 'select',
-            placeholder: '请先选择货主',
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
+            placeholder: '请先选择货主'
          } as SFSelectWidgetSchema
        },
        serviceType: {
@ -447,9 +445,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
            widget: 'dict-select',
            containsAllLabel: true,
            params: { dictKey: 'service:type' },
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
            allowClear: true
          } as SFSelectWidgetSchema
        },
@ -460,10 +455,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
            widget: 'dict-select',
            allowClear: true,
            containsAllLabel: true,
-            params: { dictKey: 'goodresource:audit:status' },
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            }
+            params: { dictKey: 'goodresource:audit:status' }
          } as SFSelectWidgetSchema
        },
        enterpriseInfoId: {
@ -473,9 +465,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
            widget: 'select',
            placeholder: '请选择',
            asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
-            visibleIf: {
-              _$expand: (value: boolean) => value
-            },
            allowClear: true
          }
        }