Merge remote-tracking branch 'origin/developer' into developer

src/api/basic/basicasynctask.ts

@@ -28,3 +28,16 @@ export const fetchList = (query?: any) => {
 		params: query,
 	});
 };
+
+/**
+ * 下载任务文件
+ * @param data 如 { id: 任务id }
+ */
+export const downloadTaskFile = (data?: any) => {
+	return request({
+		url: '/basic/basicAsyncTask/downloadTaskFile',
+		method: 'post',
+		data: data,
+		responseType: 'blob',
+	});
+};

src/api/professional/professionalfile.ts

@@ -7,4 +7,12 @@ export const makeExportTeacherInfoBySelfTask = (data?: any) => {
         method: 'post',
         data: data,
     });
-};
+};
+
+export const makeExportTeacherInfoByTypeTask = (data?: any) => {
+    return request({
+        url: '/professional/file/makeExportTeacherInfoByTypeTask',
+        method: 'post',
+        data: data,
+    });
+};

src/api/professional/professionaluser/professionaltitlerelation.ts

@@ -138,16 +138,3 @@ export const titleCountInfo = () => {
 	});
 };
 
-/**
- * 导出Excel
- * @param data 查询参数
- */
-export const exportRelation = (data: any) => {
-	return request({
-		url: '/professional/professionaltitlerelation/exportRelation',
-		method: 'post',
-		data: data,
-		responseType: 'blob',
-	});
-};
-

src/layout/navBars/breadcrumb/asyncTaskDrawer.vue

@@ -28,7 +28,12 @@
 			>
 				<el-table-column label="所属模块" prop="moduleName" width="120" show-overflow-tooltip />
 				<el-table-column label="任务类型" prop="typeLabel" width="100" show-overflow-tooltip />
-				<el-table-column label="任务名称" prop="detailType" min-width="150" show-overflow-tooltip />
+				<el-table-column label="任务名称" prop="detailType" min-width="150" show-overflow-tooltip >
+          <template #default="{ row }">
+            <el-button v-if="row.type==2" type="text" icon="Download" class="task-name-text" :loading="downloadingId === row.id" @click="handleDownloadFile(row)">{{row.detailType}}</el-button>
+            <span v-else class="task-name-text">{{row.detailType}}</span>
+          </template>
+        </el-table-column>
 				<el-table-column label="任务状态" align="center" show-overflow-tooltip>
 					<template #default="{ row }">
 						<el-tag>{{ row.status }}</el-tag>
@@ -58,7 +63,8 @@
 
 <script setup lang="ts">
 import { ref, reactive, watch, computed } from 'vue'
-import { fetchList } from '/@/api/basic/basicasynctask'
+import { fetchList, downloadTaskFile } from '/@/api/basic/basicasynctask'
+import { useMessage } from '/@/hooks/message'
 
 type TaskTab = 'upload' | 'download' | 'other'
 
@@ -87,6 +93,7 @@ const tableStyle = {
 }
 
 const emptyText = computed(() => EMPTY_TEXT_MAP[activeTab.value])
+const message = useMessage()
 
 const loadList = async () => {
 	const type = activeTab.value
@@ -135,6 +142,34 @@ const open = () => {
 	visible.value = true
 }
 
+const downloadingId = ref<string | number | null>(null)
+const handleDownloadFile = async (row: any) => {
+	if (!row?.id) return
+	downloadingId.value = row.id
+	try {
+		const response: any = await downloadTaskFile({ id: row.id })
+		const blob = (response && response.data instanceof Blob)
+			? response.data
+			: (response instanceof Blob ? response : new Blob([response]))
+		const dateStr = new Date().toISOString().slice(0, 10)
+		const baseName = row.detailType ? String(row.detailType).replace(/\s+/g, '_') : '下载文件'
+		const fileName = `${baseName}_${dateStr}.xls`
+		const elink = document.createElement('a')
+		elink.download = fileName
+		elink.style.display = 'none'
+		elink.href = URL.createObjectURL(blob)
+		document.body.appendChild(elink)
+		elink.click()
+		URL.revokeObjectURL(elink.href)
+		document.body.removeChild(elink)
+		message.success('下载成功')
+	} catch {
+		message.error('下载失败')
+	} finally {
+		downloadingId.value = null
+	}
+}
+
 defineExpose({ open })
 </script>
 

src/views/professional/common/import-teacher-other-info.vue

@@ -98,7 +98,7 @@ const handleAvatarError = (err: any) => {
 };
 
 const handleDownloadTemplate = () => {
-	downBlobFile('/professional/file/exportTeacherInfoTemplate', { type: currentType.value || 'titleRelation' }, '职工信息导入模板.xlsx')
+	downBlobFile('/professional/file/exportTeacherInfoTemplate', { type: currentType.value || 'titleRelation' }, title.value+'模板.xlsx')
 }
 
 // 暴露方法给父组件

src/views/professional/professionalqualificationrelation/index.vue

@@ -229,11 +229,10 @@ import { useDict } from '/@/hooks/dict'
 import { 
   fetchList, 
   examObj, 
-  delObj, 
+  delObj} from '/@/api/professional/professionaluser/professionalqualificationrelation'
-  exportExcel
-} from '/@/api/professional/professionaluser/professionalqualificationrelation'
 import { getLevelList } from '/@/api/professional/rsbase/professionalqualificationconfig'
 import { getWorkTypeList } from '/@/api/professional/rsbase/professionalworktype'
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
 import { Medal } from '@element-plus/icons-vue'
@@ -391,27 +390,15 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20003' });
-    const response: any = await exportExcel(search)
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+    message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+  });
-    const fileName = '职业资格信息.xls'
+  setTimeout(() => {
-    const elink = document.createElement('a')
+    exportLoading.value = false;
-    elink.download = fileName
+  }, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
+};
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
 
 // 获取资格等级名称
 const getQualificationLevelName = (id: string | number) => {

src/views/professional/professionalteacheracademicrelation/form.vue

@@ -84,10 +84,10 @@
           />
         </el-form-item>
 
-        <el-form-item label="证书编码" prop="certificateNumber">
+        <el-form-item label="证书编号" prop="certificateNumber">
           <el-input
             v-model="dataForm.certificateNumber"
-            placeholder="请输入证书编码（仅支持英文和数字）"
+            placeholder="请输入证书编号（仅支持英文和数字）"
             clearable
             show-word-limit
             maxlength="100"
@@ -215,8 +215,8 @@ const formRules = computed(() => {
       { required: true, message: '请输入所学专业', trigger: 'blur' }
     ],
     certificateNumber: [
-      { required: true, message: '请输入证书编码', trigger: 'blur' },
+      { required: true, message: '请输入证书编号', trigger: 'blur' },
-      { pattern: /^[A-Za-z0-9]+$/, message: '证书编码只能包含英文和数字', trigger: 'blur' }
+      { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
     ]
   }
   

src/views/professional/professionalteacheracademicrelation/index.vue

@@ -241,14 +241,13 @@ import { useDict } from '/@/hooks/dict'
 import { 
   fetchList, 
   examObj, 
-  delObj, 
+  delObj} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
-  exportExcel
-} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
 import { getDegreeList } from '/@/api/professional/rsbase/professionalacademicdegreeconfig'
 import { getQualificationList } from '/@/api/professional/rsbase/academicqualificationsconfig'
 import { getAllTypeList } from '/@/api/professional/rsbase/professionalacademiceducationtypeconfig'
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
+import {makeExportTeacherInfoByTypeTask} from "/@/api/professional/professionalfile";
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
 const DataForm = defineAsyncComponent(() => import('./form.vue'))
@@ -412,26 +411,14 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20005' });
-    const response: any = await exportExcel(search)
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+    message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+  });
-    const fileName = '学历学位信息.xls'
+  setTimeout(() => {
-    const elink = document.createElement('a')
+    exportLoading.value = false;
-    elink.download = fileName
+  }, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
 }
 
 // 获取学位名称

src/views/professional/professionalteachercertificaterelation/index.vue

@@ -212,9 +212,10 @@ import { getTeacherCertificateList } from '/@/api/professional/rsbase/profession
 import { 
   fetchList, 
   examObj, 
-  delObj,
+  delObj
-  exportExcel
 } from '/@/api/professional/professionaluser/professionalteachercertificaterelation'
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
+
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
@@ -368,27 +369,15 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20004' });
-    const response: any = await exportExcel(search)
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-    
+    message.success('后台下载进行中,请稍后查看任务列表');
-    const blob = new Blob([response as BlobPart])
+  });
-    const fileName = '教师资格证信息.xls'
+  setTimeout(() => {
-    const elink = document.createElement('a')
+    exportLoading.value = false;
-    elink.download = fileName
+  }, 3000); // 5分钟后自动关闭
-    elink.style.display = 'none'
+};
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href)
-    document.body.removeChild(elink)
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
 
 // 获取证书名称
 const getCertificateName = (id: string | number) => {

src/views/professional/professionalteacherhonor/index.vue

@@ -243,6 +243,7 @@ import {
 } from '/@/api/professional/professionaluser/professionalteacherhonor'
 import { PROFESSIONAL_AUDIT_STATE_OPTIONS, getStatusConfig } from '/@/config/global'
 import { defineAsyncComponent } from 'vue'
+import {makeExportTeacherInfoByTypeTask} from "/@/api/professional/professionalfile";
 const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
 const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
 const ClickableTag = defineAsyncComponent(() => import('/@/components/ClickableTag/index.vue'))
@@ -393,29 +394,14 @@ const handleDel = (row: any) => {
 
 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
+  exportLoading.value = true;
-  try {
+  let params = Object.assign(search, { type: 'P20006' });
-    const response = await fetchList({
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
-      current: 1,
+    message.success('后台下载进行中,请稍后查看任务列表');
-      size: 999999,
+  });
-      ...search
+  setTimeout(() => {
-    })
+    exportLoading.value = false;
-    const data = response.data.records || []
+  }, 3000); // 5分钟后自动关闭
-    
-    const tHeader = ['工号', '姓名', '荣誉', '表彰单位', '年份']
-    const filterVal = ['teacherNo', 'teacherName', 'honor', 'honorCompany', 'year']
-    
-    // 动态导入导出工具
-    const { export_json_to_excel } = await import('/@/excel/Export2Excel.js')
-    const exportData = data.map((v: any) => filterVal.map((j: string) => v[j]))
-    export_json_to_excel(tHeader, exportData, '综合表彰.xls')
-    
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
 }
 
 // 打开导入弹窗

src/views/professional/teacherbase/import-teacherInfo.vue

@@ -6,15 +6,15 @@
         show-icon
         style="margin-bottom: 20px;">
         <template #title>
-          <span>导入前请先下载字典文件，部分字段需严格按照字典值填写</span>
+          <span> 可先导出教职工信息,按照导出信息的模板填入职工数据,再执行导入</span>
         </template>
       </el-alert>
 
-      <div style="text-align: center; margin-bottom: 20px;">
+<!--      <div style="text-align: center; margin-bottom: 20px;">-->
-        <a href="excel/dictlist.xlsx" rel="external nofollow" download="职工信息字典下载" style="text-decoration: none;">
+<!--        <a href="excel/dictlist.xlsx" rel="external nofollow" download="职工信息字典下载" style="text-decoration: none;">-->
-          <el-button type="success" :icon="Download">下载字典文件</el-button>
+<!--          <el-button type="success" :icon="Download">下载字典文件</el-button>-->
-        </a>
+<!--        </a>-->
-      </div>
+<!--      </div>-->
 
       <el-upload
         class="upload-demo"

src/views/professional/teacherbase/index.vue

@@ -1024,7 +1024,7 @@
               </el-table-column>
               <el-table-column prop="graduateSchool" label="毕业学校" min-width="180" align="center" show-overflow-tooltip />
               <el-table-column prop="major" label="所学专业" min-width="150" align="center" show-overflow-tooltip />
-              <el-table-column prop="certificateNumber" label="证书编码" min-width="120" align="center" />
+              <el-table-column prop="certificateNumber" label="证书编号" min-width="120" align="center" />
               <el-table-column label="学历证书" min-width="150" align="center">
                 <template #default="scope">
                   <el-button