合并

src/views/progress/progressCategory/index.vue

@@ -153,7 +153,6 @@ import {
 } from '@/api/progress/progressCategory';
 import { ProgressCategoryVO, ProgressCategoryQuery, ProgressCategoryForm } from '@/api/progress/progressCategory/types';
 import { useUserStoreHook } from '@/store/modules/user';
-import { download } from '@/utils/request';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { progress_unit_type, progress_work_type } = toRefs<any>(proxy?.useDict('progress_unit_type', 'progress_work_type'));
@@ -367,9 +366,14 @@ const handleUpdate = async (row: ProgressCategoryVO) => {
 
 const handleExport = async () => {
   const ids = treeRef.value.getCheckedNodes()[0].pathNodes[0].childrenData.map((item) => item.matrixId);
-  const res = await downloadProgressCategory({ ids });
-  download('/progress/progressCategory/export', { ids }, '方阵.xlsx', true);
-  // window.open(res.data);
+  proxy?.download(
+    '/progress/progressCategory/export',
+    {
+      ids: ids
+    },
+    `qualityInspection_${new Date().getTime()}.xlsx`,
+    true
+  );
 };
 
 /** 提交按钮 */