Bläddra i källkod

fix: 修改导入导出

xiaweibo 2 månader sedan
förälder
incheckning
d5b66e9d50

+ 17 - 3
src/api/evaluationSystem/index.ts

@@ -696,9 +696,9 @@ export function deleteSecurityExamineDeptAdvUser(id: number) {
 }
 
 /**
- * 导出月度扣分
+ * 考核对象
  */
-export function exportMonthlyDeduction(query: ExportMonthlyDeductionRequest) {
+export function exportEvaluationTarget(query: ExportMonthlyDeductionRequest) {
   return http.request({
     url: '/securityExamine/admin/exportSecurityExamineIssue',
     method: 'post',
@@ -712,7 +712,7 @@ export function exportMonthlyDeduction(query: ExportMonthlyDeductionRequest) {
 /**
  * 导出先进个人
  */
-export function exportEvaluationTarget(query: ExportMonthlyDeductionRequest) {
+export function exportEvaluationAdvUser(query: ExportMonthlyDeductionRequest) {
   return http.request({
     url: '/securityExamine/admin/exportSecurityExamineIssueAdvancedUser',
     method: 'post',
@@ -722,3 +722,17 @@ export function exportEvaluationTarget(query: ExportMonthlyDeductionRequest) {
     isTransformResponse: false,
   });
 }
+
+/**
+ * 导出部门排序
+ */
+export function exportEvaluationDeptSort(query: ExportMonthlyDeductionRequest) {
+  return http.request({
+    url: '/securityExamine/admin/exportSecurityExamineIssueAdvanced',
+    method: 'post',
+    data: query,
+    responseType: 'blob',
+  }, {
+    isTransformResponse: false,
+  });
+}

+ 3 - 3
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationSystemAdvancedPerson.vue

@@ -240,7 +240,7 @@
     updateSecurityExamineAdvUserAdmin,
     deleteSecurityExamineDeptAdvUser,
     querySecurityExamineAdvUser,
-    exportEvaluationTarget,
+    exportEvaluationAdvUser,
   } from '@/api/evaluationSystem';
   import type {
     QuerySecurityExamineIssueAdvancedUserParams,
@@ -685,9 +685,9 @@
         planStartTime: tableQuery.queryParam.startTime || undefined,
         planEndTime: tableQuery.queryParam.endTime || undefined,
       };
-      const response = await exportEvaluationTarget(exportParams);
+      const response = await exportEvaluationAdvUser(exportParams);
       if (response) {
-        const fileName = `考核下发对象_${new Date().toISOString().split('T')[0]}.xlsx`;
+        const fileName = `先进个人_${new Date().toISOString().split('T')[0]}.xlsx`;
         downloadByData(response, fileName);
         ElMessage.success('导出成功');
       }

+ 5 - 3
src/views/production-safety/safetyAssessment/evaluationSystem/components/EvaluationTarget.vue

@@ -298,7 +298,8 @@
     updateSecurityExamineIssueRepeal,
     deleteSecurityExamineIssue,
     querySecurityExamineIssueAdvanced,
-    exportMonthlyDeduction,
+    exportEvaluationDeptSort,
+    exportEvaluationTarget,
   } from '@/api/evaluationSystem';
   import type { QuerySecurityExamineIssueParams, EvaluationSystemItem } from '@/api/evaluationSystem';
   import { ElMessage } from 'element-plus';
@@ -559,9 +560,10 @@
         deductionTitle: tableQuery.queryParam.deductionTitle || undefined,
         status: tableQuery.queryParam.status === '' ? '' : Number(tableQuery.queryParam.status),
       };
-      const response = await exportMonthlyDeduction(exportParams);
+      const response = route.query.operate == 'evaluationSystem-advanced-group' ? await exportEvaluationDeptSort(exportParams) : await exportEvaluationTarget(exportParams);
       if (response) {
-        const fileName = `考核下发对象_${new Date().toISOString().split('T')[0]}.xlsx`;
+        debugger
+        const fileName = `${route.query.operate == 'evaluationSystem-advanced-group' ? '部门考核' : '考核对象'}_${new Date().toISOString().split('T')[0]}.xlsx`;
         downloadByData(response, fileName);
         ElMessage.success('导出成功');
       }