From 6009885c097db059330c5c91b680ca1ca7cf045b Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Sat, 18 May 2024 17:32:58 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:=20=E6=9B=BF=E6=8D=A2=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/project-demand/collection/add.vue        | 14 ++++++++++++--
 src/views/project-management/filing/attachment.vue | 13 ++++++++++++-
 src/views/project-management/filing/conclusion.vue | 13 +++++++++++--
 .../implementation/attachment.vue                  | 12 +++++++++++-
 src/views/projectdemand/demandcollection/add.vue   | 13 +++++++++++--
 .../projectdemand/demandcollection/detail.vue      | 14 +++++++++++---
 6 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/views/project-demand/collection/add.vue b/src/views/project-demand/collection/add.vue
index faa33f5..cb43141 100644
--- a/src/views/project-demand/collection/add.vue
+++ b/src/views/project-demand/collection/add.vue
@@ -61,7 +61,7 @@
 <script setup lang="jsx">
 import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile,downloadFile} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage, ElMessageBox} from "element-plus";
@@ -138,7 +138,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <el-button type="primary" size="large" link onClick={() => handleDelete(row)}>删除</el-button>
             </div>
         )
@@ -146,6 +146,16 @@ const tableConfig = reactive({
     }
   ]
 })
+
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const compositeParam = (item) => {
   let tag=''
   if(!formData.value.collectType&&router.currentRoute.value.name==='Collection/add'){
diff --git a/src/views/project-management/filing/attachment.vue b/src/views/project-management/filing/attachment.vue
index cb7a5cc..1ed9890 100644
--- a/src/views/project-management/filing/attachment.vue
+++ b/src/views/project-management/filing/attachment.vue
@@ -12,6 +12,8 @@
 </template>
 
 <script setup lang="jsx">
+import {downloadFile} from "@/api/project-demand";
+
 const searchConfig = reactive([
   {
     label: '关键词',
@@ -53,7 +55,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
             </div>
         )
       }
@@ -64,6 +66,15 @@ const showTable=ref(true)
 const otherFileList = ref([])
 const getOtherFile = () => {
 
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
 }
 </script>
 
diff --git a/src/views/project-management/filing/conclusion.vue b/src/views/project-management/filing/conclusion.vue
index d69bf9b..ad0a318 100644
--- a/src/views/project-management/filing/conclusion.vue
+++ b/src/views/project-management/filing/conclusion.vue
@@ -31,6 +31,7 @@
 
 <script setup lang="jsx">
 import FileUpload from "@/components/FileUpload.vue";
+import {downloadFile} from "@/api/project-demand";
 
 const formData = ref({})
 const rules = reactive({
@@ -72,7 +73,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
             </div>
         )
@@ -80,7 +81,15 @@ const tableConfig = reactive({
     }
   ]
 })
-
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const compositeParam = (item) => {
   return {
     fileId: item.id,
diff --git a/src/views/project-management/implementation/attachment.vue b/src/views/project-management/implementation/attachment.vue
index 3063242..ffa73b0 100644
--- a/src/views/project-management/implementation/attachment.vue
+++ b/src/views/project-management/implementation/attachment.vue
@@ -14,6 +14,7 @@
 <script setup lang="jsx">
 import fvSelect from '@/fvcomponents/fvSelect/index.vue'
 import {shallowRef} from "vue";
+import {downloadFile} from "@/api/project-demand";
 
 const searchConfig = reactive([
   {
@@ -59,7 +60,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
             </div>
         )
@@ -71,6 +72,15 @@ const showTable=ref(true)
 const otherFileList = ref([])
 const getOtherFile = () => {
 
+}
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
 }
 </script>
 
diff --git a/src/views/projectdemand/demandcollection/add.vue b/src/views/projectdemand/demandcollection/add.vue
index f29402c..da5f052 100644
--- a/src/views/projectdemand/demandcollection/add.vue
+++ b/src/views/projectdemand/demandcollection/add.vue
@@ -59,7 +59,7 @@
 <script setup lang="jsx">
 import {useAuthStore} from '@/stores/userstore.js'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile} from "@/api/project-demand/index.js";
+import {getWorkflowInfo, addRequirement, getFormInfo, resubmit, deleteFile,downloadFile} from "@/api/project-demand/index.js";
 import FileUpload from "@/components/FileUpload.vue";
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue';
 import {ElMessage, ElMessageBox} from "element-plus";
@@ -135,7 +135,7 @@ const tableConfig = reactive({
       currentRender: ({row, index}) => {
         return (
             <div>
-              <a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>
+              <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>
               <el-button type="primary" size="large" link onClick={() => beforeRemove(row)}>删除</el-button>
             </div>
         )
@@ -143,6 +143,15 @@ const tableConfig = reactive({
     }
   ]
 })
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const compositeParam=(item)=>{
     return  {
       fileId: item.id,
diff --git a/src/views/projectdemand/demandcollection/detail.vue b/src/views/projectdemand/demandcollection/detail.vue
index 5e1eafc..bae96d1 100644
--- a/src/views/projectdemand/demandcollection/detail.vue
+++ b/src/views/projectdemand/demandcollection/detail.vue
@@ -79,12 +79,11 @@
 import OperationRender from '@/views/workflow/common/OperationRender.vue'
 import ProcessDiagramViewer from '@/views/workflow/common/ProcessDiagramViewer.vue'
 import {useProcessStore} from '@/stores/processStore.js';
-import {getInfo, agreeTask, rejectTask} from "@/api/project-demand/index.js";
+import {getInfo, agreeTask, rejectTask,downloadFile} from "@/api/project-demand/index.js";
 import {getSubCompOpt} from '@/api/user/user.js'
 import {ElMessage} from "element-plus";
 import {useRouter} from "vue-router";
 import {useTagsView} from '@/stores/tagsview.js'
-
 const tagsViewStore = useTagsView()
 const router = useRouter()
 const route = useRoute()
@@ -131,11 +130,20 @@ const tableConfig = reactive({
       label: '操作',
       align: 'center',
       currentRender: ({row, index}) => {
-        return (<a style="cursor: pointer;font-size: 14px;color: #2a99ff;" href={row.url}>下载</a>)
+        return ( <el-button type="primary" link onClick={() => handleDownload(row)}>下载</el-button>)
       }
     }
   ]
 })
+const handleDownload = (row) => {
+  downloadFile(row.fileId).then(res => {
+    const blob = new Blob([res])
+    let a = document.createElement('a')
+    a.href=URL.createObjectURL(blob)
+    a.download = row.originalFileName
+    a.click()
+  })
+}
 const handleSubmit = () => {
   let approve = {
     taskId: processInstanceData.value.taskId,