fix bug

2022-03-04 16:14:22 +08:00
parent 99d00bafa8
commit 855615d1ff
8 changed files with 43 additions and 39 deletions
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
@ -65,7 +65,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
  get reqParams() {
    return { 
      operateObject: this.i?.resourceCode,
-      operateType: 4,
+      operateTypeList:  [4,7],
     };
  }
  currentStatus = 0;
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@ -464,19 +464,6 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
            }
          }
        },
-        // receiptAddressId: {
-        //   type: 'string',
-        //   title: '选择地址',
-        //   ui: {
-        //     widget: 'custom',
-        //     placeholder: '请点击选择收回单地址',
-        //     // validator: val => (this.sf6?.value?.receiptType === '2' ? [{ keyword: 'required', message: '请点击选择收回单地址' }] : []),
-        //     visibleIf: {
-        //       receiptType: value => value === '2'
-        //     }
-        //   },
-        //   default: ''
-        // },
        receiptUserName: {
          type: 'string',
          title: '联系人',
--- a/src/app/routes/supply-management/components/bulk/bulk.component.html
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-02 18:09:01
+ * @LastEditTime : 2022-03-04 15:45:58
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -32,7 +32,7 @@
      </div>
      <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
        <button nz-button nzType="primary" [nzLoading]="loading" (click)="search()"  acl  [acl-ability]="['SUPPLY-INDEX-bulkSearch']">查询</button>
-        <button nz-button nzType="primary" [disabled]="loading">导入</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 ? '展开' : '收起' }}
--- a/src/app/routes/supply-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts
@ -569,7 +569,12 @@ export class SupplyManagementBulkComponent implements OnInit {
        }
      })
    }
-    userAction() {
-      
-    }
+      // 导出
+   exportFire() {
+    this.service.request(this.service.$api_asyncExportBulkList,  this.reqParams ).subscribe((res: any) => {
+      if(res) {
+        this.service.msgSrv.success('导出成功，请去下载中心下载！')
+      }
+    })
+  }
 }
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@ -53,7 +53,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
  get reqParams() {
    return { 
      operateObject: this.i?.resourceCode,
-      operateType: 4,
+      operateTypeList:  [4,7],
     };
  }
  constructor(
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.html
@ -31,7 +31,7 @@
        [acl-ability]="['SUPPLY-INDEX-vehicleSearch']"
        >查询</button
      >
-      <button nz-button nzType="primary" [disabled]="loading">导出</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 ? '展开' : '收起' }}
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@ -611,4 +611,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
      }
    ];
  }
+   // 导出
+   exportFire() {
+    this.service.request(this.service.$api_asyncExportWholeList,  this.reqParams ).subscribe((res: any) => {
+      if(res) {
+        this.service.msgSrv.success('导出成功，请去下载中心下载！')
+      }
+    })
+  }
 }
--- a/src/app/routes/supply-management/services/supply-management.service.ts
+++ b/src/app/routes/supply-management/services/supply-management.service.ts
@ -54,8 +54,8 @@ export class SupplyManagementService extends BaseService {
  $api_getCalculatedSurcharge = `/api/sdc/expense/getCalculatedSurcharge`;
  // 整车计算附加费率
  $api_getcalculatedServiceRate = `/api/sdc/expense/getAdditionalRate`;
-    // 整车计算附加费率
-    $api_getAdditionalRate = `/api/sdc/expense/getAdditionalRate`;
+  // 整车计算附加费率
+  $api_getAdditionalRate = `/api/sdc/expense/getAdditionalRate`;
  // 代发整车货源
  $api_consignWhole = `/api/sdc/goodsResourceOperate/consignWhole`;
  // 代发大宗货源
@ -139,20 +139,20 @@ export class SupplyManagementService extends BaseService {
    super(injector);
  }
  public limitKeys = {
-    weight:'sys.config.goods.approvalCarMaxWeight', //整车-核载重量上限
-    volume:'sys.config.goods.approvalCarMaxVolume', //整车-核载体积上限
-    piece:'sys.config.goods.approvalCarMaxPiece', //整车-核载件数上限
-    maxDays:'sys.config.goods.wholeLoadingMaxDays', //整车-计划装货时间上限 
-    intervalDays:'sys.config.goods.wholeUnloadingIntervalDays', //计划装、卸货时间间隔
-    maxTimes:'sys.config.goods.wholeLoadingMaxTimes', //整车-多装多卸地点上限
-  }
+    weight: 'sys.config.goods.approvalCarMaxWeight', //整车-核载重量上限
+    volume: 'sys.config.goods.approvalCarMaxVolume', //整车-核载体积上限
+    piece: 'sys.config.goods.approvalCarMaxPiece', //整车-核载件数上限
+    maxDays: 'sys.config.goods.wholeLoadingMaxDays', //整车-计划装货时间上限
+    intervalDays: 'sys.config.goods.wholeUnloadingIntervalDays', //计划装、卸货时间间隔
+    maxTimes: 'sys.config.goods.wholeLoadingMaxTimes' //整车-多装多卸地点上限
+  };
  public limitKeys2 = {
-    month:'sys.config.goods.bulkEndMaxMonth', //大宗-截止时间上限
-    weight:'sys.config.goods.bulkMaxWeight', //大宗-重量上限
-    volume:'sys.config.goods.bulkMaxVolume', //大宗-体积上限
-    trainNumber:'sys.config.goods.bulkMaxTrainNumber', //大宗-车次上限
-    freight:'sys.config.goods.bulkMaxUnitFreight', //大宗-运费单价上限
-  }
+    month: 'sys.config.goods.bulkEndMaxMonth', //大宗-截止时间上限
+    weight: 'sys.config.goods.bulkMaxWeight', //大宗-重量上限
+    volume: 'sys.config.goods.bulkMaxVolume', //大宗-体积上限
+    trainNumber: 'sys.config.goods.bulkMaxTrainNumber', //大宗-车次上限
+    freight: 'sys.config.goods.bulkMaxUnitFreight' //大宗-运费单价上限
+  };
  // 根据ItemKey获取项值
  public $api_findItemValueByItemKeys = '/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys';
  // 获取保价费信息
@ -163,8 +163,12 @@ export class SupplyManagementService extends BaseService {
  public $api_goodsResourceOperateImport = '/api/sdc/uploadGoodsResource/goodsResourceOperateImport';
  // 根据货主ID查询网络货运人信息
  public $api_getNetworkTransporter = '/api/mdc/cuc/enterpriseInfo/operate/getNetworkTransporter';
-  $api_verify_vehicle_status = `/api/sdc/goodsResourceShipper/saveVerify`;// 发布货源校验司机/车队长的状态
+  $api_verify_vehicle_status = `/api/sdc/goodsResourceShipper/saveVerify`; // 发布货源校验司机/车队长的状态
  $api_get_sys_config = `/api/mdc/pbc/sysConfigItem/findConfigValues`; // 根据项key、业务id获取配置信息
-    // 获取指派熟车列表
-    $api_getListCars = '/api/mdc/cuc/enterpriseVehicle/getPracticeCarList';
+  // 获取指派熟车列表
+  $api_getListCars = '/api/mdc/cuc/enterpriseVehicle/getPracticeCarList';
+  // 异步导出运营后台大宗货源列表
+  $api_asyncExportBulkList = '/api/sdc/goodsResourceOperate/asyncExportBulkList';
+  // 异步导出运营后台整车货源列表
+  $api_asyncExportWholeList = '/api/sdc/goodsResourceOperate/asyncExportWholeList';
 }