档案下载有问题

src/components/Table2/index.vue

@@ -552,7 +552,6 @@ const parsingJSON = (row) => {
     return []
   }else {
     let json = JSON.parse(row)
-    console.log("JSON",json)
     return json
   }
 
@@ -567,14 +566,23 @@ const handleSelectable = (row) => {
 
 
 const handleDownload = (row: FileItem) => {
-  const a = document.createElement('a')
-  a.href = row.fileUrl
-  a.download = row.fileName
-  a.target = '_blank'
-  a.rel = 'noopener noreferrer'
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a)
+  console.log(row)
+  fetch(row.fileUrl)
+    .then((response) => {
+      if (!response.ok) throw new Error('下载失败')
+      return response.blob()
+    })
+    .then((blob) => {
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      a.href = url
+      a.download = row.fileName
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+      URL.revokeObjectURL(url)
+    })
+    .catch((error) => console.error('下载失败:', error))
 }
 
 const getDictLabelArr = (dictArr, field) => {

src/components/UploadFile/src/SelectUpload.vue

@@ -307,25 +307,21 @@ const handlePreview = (item) => {
 
 const handleDownLoad = (item) => {
   fetch(item.fileUrl)
-    .then((response) => response.blob())
+    .then((response) => {
+      if (!response.ok) throw new Error('下载失败')
+      return response.blob()
+    })
     .then((blob) => {
-      // 创建一个指向Blob的URL
       const url = URL.createObjectURL(blob)
-
-      // 创建一个a标签用于下载
       const a = document.createElement('a')
       a.href = url
-      // 尝试设置下载文件名
       a.download = item.fileName
-      // 触发下载
       document.body.appendChild(a)
       a.click()
-
-      // 清理
       document.body.removeChild(a)
       URL.revokeObjectURL(url)
     })
-    .catch((error) => console.error('Error downloading the file:', error))
+    .catch((error) => console.error('下载失败:', error))
 }
 
 const showFile = (item) => {

src/components/UploadFile/src/TableUpload.vue

@@ -158,14 +158,25 @@ const handleRemove = (index: number, row: FileItem) => {
 }
 
 const handleDownload = (row: FileItem) => {
-  const a = document.createElement('a')
-  a.href = row.fileUrl
-  a.download = row.fileName
-  a.target = '_blank'
-  a.rel = 'noopener noreferrer'
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a)
+  fetch(row.fileUrl)
+    .then((response) => {
+      if (!response.ok) throw new Error('下载失败')
+      return response.blob()
+    })
+    .then((blob) => {
+      const url = URL.createObjectURL(blob)
+      const a = document.createElement('a')
+      a.href = url
+      a.download = row.fileName
+      document.body.appendChild(a)
+      a.click()
+      document.body.removeChild(a)
+      URL.revokeObjectURL(url)
+    })
+    .catch((error) => {
+      console.error('下载失败:', error)
+      message.error('下载失败，请重试')
+    })
 }
 
 watch(

src/components/UploadFile/src/useUpload.ts

@@ -70,6 +70,23 @@ export const isImageFile = (url: string): boolean => {
   return /\.(jpg|jpeg|png|gif|bmp|webp|ico)(\?.*)?$/i.test(url)
 }
 
+/**
+ * 构建带下载文件名的 URL
+ * 利用阿里云 OSS 的 response-content-disposition 参数，
+ * 解决跨域下载时 download 属性不生效、文件名错乱的问题
+ */
+export const buildDownloadUrl = (fileUrl: string, fileName: string): string => {
+  if (!fileUrl) return ''
+  if (!fileName) return fileUrl
+
+  const isOssUrl = /\.aliyuncs\.com/.test(fileUrl)
+  if (!isOssUrl) return fileUrl
+
+  const disposition = `attachment;filename="${encodeURIComponent(fileName)}"`
+  const separator = fileUrl.includes('?') ? '&' : '?'
+  return fileUrl + separator + 'response-content-disposition=' + encodeURIComponent(disposition)
+}
+
 /**
  * 兼容方案：为老版本上传的文件补齐 fileSize
  * 逻辑：

src/views/elderly/fee/bill-pay/Form.vue

@@ -914,25 +914,21 @@ const formatArr = (dict: string, value: string) => {
 // 下载文件
 const handleDownLoad = (item) => {
   fetch(item.fileUrl)
-    .then((response) => response.blob())
+    .then((response) => {
+      if (!response.ok) throw new Error('下载失败')
+      return response.blob()
+    })
     .then((blob) => {
-      // 创建一个指向Blob的URL
       const url = URL.createObjectURL(blob)
-
-      // 创建一个a标签用于下载
       const a = document.createElement('a')
       a.href = url
-      // 尝试设置下载文件名
       a.download = item.fileName
-      // 触发下载
       document.body.appendChild(a)
       a.click()
-
-      // 清理
       document.body.removeChild(a)
       URL.revokeObjectURL(url)
     })
-    .catch((error) => console.error('Error downloading the file:', error))
+    .catch((error) => console.error('下载失败:', error))
 }
 
 onMounted(()=>{

src/views/elderly/fee/out-refund/Form.vue

@@ -32,7 +32,7 @@
             </TgSelect>
           </el-form-item>
         </el-col>
-        <el-col :span="12" :xs="24">
+        <el-col :span="6" :xs="24">
           <el-form-item label="是否退费" prop="isRefund">
             <TgRadio
               v-model="dataForm.isRefund"
@@ -48,7 +48,23 @@
             </TgRadio>
           </el-form-item>
         </el-col>
-        <el-col :span="12" :xs="24">
+        <el-col :span="6" :xs="24">
+          <el-form-item v-if="dataForm.isRefund" label="是否自动跨月" prop="isAutoCross" label-width="130">
+            <TgRadio
+              v-model="dataForm.isAutoCross"
+              clearable
+              :list="getDictOptions(DICT_TYPE.COMMON_STATUS6)"
+            >
+              <el-radio
+                v-for="(item, index) in getIntDictOptions(DICT_TYPE.COMMON_STATUS6)"
+                :key="index"
+                :value="item.value"
+              >{{ item.label }}</el-radio
+              >
+            </TgRadio>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" :xs="24">
           <el-form-item label="状态" prop="status">
             <TgRadio
               v-model="dataForm.status"
@@ -397,6 +413,7 @@ const state = reactive<OutRefundFormType>({
     name: '',
     type: '',
     isRefund: '',
+    isAutoCross: 1,
     isSameDayRefund: '',
     configType: 0,
     status: 1,
@@ -430,6 +447,9 @@ const open = async (tenantId, id, detail) => {
     try {
       const res = await getOutboundRefundDetail(id)
       dataForm.value = res
+      if(!dataForm.value.isAutoCross){
+        dataForm.value.isAutoCross = 1
+      }
       dataForm.value.items.map(async (item) => {
         getItemList(item, false, false)
       })