From de858331a08d11ee45bf744b8501423d83d52f96 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 30 Oct 2024 11:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E5=8E=82=E5=AE=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/download.js                    | 26 +++++++++++++-------
 src/views/material/ma/supplier/index.vue | 30 ++++++++++++++++--------
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/utils/download.js b/src/utils/download.js
index e908d482..2aa8796b 100644
--- a/src/utils/download.js
+++ b/src/utils/download.js
@@ -15,13 +15,23 @@ export const downloadFile = ({ fileData, fileType, fileName }) => {
 
 // 通用a链接下载
 export const downloadFileByUrl = (url) => {
-  const link = document.createElement('a')
-  link.href = url
-  link.setAttribute('download', '')
-  link.style.display = 'none'
-  document.body.appendChild(link)
-  link.click()
-  URL.revokeObjectURL(link.href)
-  document.body.removeChild(link)
+  const link = document.createElement('a');
+  link.href = url; // 设置文件 URL
+  link.download = ''; // 提供下载提示
+  document.body.appendChild(link); // 将链接添加到 DOM
+  link.click(); // 模拟点击下载
+  document.body.removeChild(link); // 下载后移除链接
 }
 
+// pdf、doc、docx等文件下载
+export const downloadFileData = ({ fileName, fileUrl }) => {
+  const link = document.createElement('a')
+  link.setAttribute('download', '')
+  link.style.display = 'none'
+  link.href = fileUrl
+  link.download = fileName
+  document.body.appendChild(link)
+  link.click(); 
+  // URL.revokeObjectURL(link.href)
+  document.body.removeChild(link)
+}
\ No newline at end of file
diff --git a/src/views/material/ma/supplier/index.vue b/src/views/material/ma/supplier/index.vue
index 91f35f2b..0260515c 100644
--- a/src/views/material/ma/supplier/index.vue
+++ b/src/views/material/ma/supplier/index.vue
@@ -232,7 +232,7 @@
   <script>
   import { getListFacturer,getFacturerDetail,editFacturer,addFacturer,delFacturer } from "@/api/ma/supplier";
   import { imgUpLoadThree, fileUpLoad } from '@/api/system/upload'
-  import { downloadFile,downloadFileByUrl } from '@/utils/download'
+  import { downloadFile,downloadFileData } from '@/utils/download'
   import { getToken } from '@/utils/auth'
   export default {
     name: "supplier",
@@ -423,7 +423,7 @@
               downloadFile({ fileName: file.name, fileData: file.raw, fileType: 'application/vnd.ms-excel;charset=utf-8' })
       }else if(file.status === 'success'){
               
-              downloadFileByUrl(  file.url )
+              downloadFileData(  { fileName: file.name, fileUrl: file.url } )
               // downloadFileData({ fileName: file.name,fileUrl:file.url })
       }
     },
@@ -529,14 +529,13 @@
           if (valid) {           
               if (this.form.supplierId != undefined) {
                  const reqData = new FormData();
+                if(this.businessLicenseListTemp.length!=0){
+                  await  this.getImaUpload(),
+                  await this.editFacturerTemp(this.form);
+                }else{
+                   await this.editFacturerTemp(this.form);
+                }
 
-              editFacturer(this.form).then(response => {
-                  this.$modal.msgSuccess("修改成功");
-                  this.showHouse = false;
-                  this.getList();
-                  this.businessLicenseListTemp=[];
-                  this.delBusinessFileIdList=[];
-                });
               } else {
                 if(this.businessLicenseListTemp.length!=0){
                   await  this.getImaUpload(),
@@ -573,7 +572,18 @@
                 this.getList();
                 this.businessLicenseListTemp=[];
                 this.businessLicenseFileList=[];
-                this.delBusinessFileIdList=[];
+
+              });
+        },
+
+        async editFacturerTemp(form){
+                this.form.bmFileInfos=this.businessLicenseFileList
+                editFacturer(form).then(response => {
+                this.$modal.msgSuccess("修改成功");
+                this.showHouse = false;
+                this.getList();
+                this.businessLicenseListTemp=[];
+                this.businessLicenseFileList=[];
               });
         },