From a59df85c64eda4ad4ee0e186a4093f2efca75a72 Mon Sep 17 00:00:00 2001
From: 1107302052 <1107302052@qq.com>
Date: Thu, 17 Mar 2022 17:01:37 +0800
Subject: [PATCH] 'fixbug'

---
 .../components/vehicle/vehicle.component.ts           | 11 ++++++-----
 .../model/import-supply/import-supply.component.ts    |  9 ++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index aac4fc47..0c284b32 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -179,11 +179,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
               label: '下载失败数据',
               type: 'primary',
               onClick: () => {
-                this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => {
-                  if (res) {
-                    console.log(res);
-                  }
-                });
+                this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids);
+                // this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => {
+                //   if (res) {
+                //     console.log(res);
+                //   }
+                // });
                 console.log(111);
               }
             }
diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts
index 2fba6e5b..3f3a4613 100644
--- a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts
+++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts
@@ -154,13 +154,20 @@ export class SupplyManagementImportSupplyComponent implements OnInit {
       });
   }
   save(): void {
+    console.log(this?.networkTransporter)
+    console.log(this.sf.value)
+    if(!this.sf.value?.shipperAppUserId || !this?.networkTransporter || !this.sf.value?.enterpriseProjectId || !this.sf.value?.fileName) {
+      this.service.msgSrv.error('请填写必填项并上传文件！')
+      return
+    }
     const formData : any= new FormData();
-    this.files.forEach((file: any) => {
+    this.files?.forEach((file: any) => {
       formData.append('file', file);
       formData.append('shipperAppUserId', this.sf.value?.shipperAppUserId);
       formData.append('enterpriseInfoId', this?.networkTransporter);
       formData.append('enterpriseProjectId', this.sf.value?.enterpriseProjectId);
     });
+  
     console.log(formData)
     this.service.request(this.service.$api_goodsResourceOperateImport, formData).subscribe(res => {
       if (res) {