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

2026-02-06 15:42:56 +08:00
parent 591bad2318 6a4c47f6fa
commit 020468c6f1
13 changed files with 540 additions and 615 deletions
--- a/src/api/basic/basicasynctask.ts
+++ b/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',
+	});
+};
--- a/src/api/professional/professionalfile.ts
+++ b/src/api/professional/professionalfile.ts
@@ -8,3 +8,11 @@ export const makeExportTeacherInfoBySelfTask = (data?: any) => {
        data: data,
    });
 };
+
+export const makeExportTeacherInfoByTypeTask = (data?: any) => {
+    return request({
+        url: '/professional/file/makeExportTeacherInfoByTypeTask',
+        method: 'post',
+        data: data,
+    });
+};
--- a/src/api/professional/professionaluser/professionaltitlerelation.ts
+++ b/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',
-	});
-};
-
--- a/src/layout/navBars/breadcrumb/asyncTaskDrawer.vue
+++ b/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>

--- a/src/views/professional/common/import-teacher-other-info.vue
+++ b/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')
 }

 // 暴露方法给父组件
--- a/src/views/professional/professionalqualificationrelation/index.vue
+++ b/src/views/professional/professionalqualificationrelation/index.vue
@@ -229,11 +229,10 @@ import { useDict } from '/@/hooks/dict'
 import { 
  fetchList, 
  examObj, 
-  delObj, 
-  exportExcel
-} from '/@/api/professional/professionaluser/professionalqualificationrelation'
+  delObj} 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
-  try {
-    const response: any = await exportExcel(search)
-    
-    const blob = new Blob([response as BlobPart])
-    const fileName = '职业资格信息.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 (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
+  exportLoading.value = true;
+  let params = Object.assign(search, { type: 'P20003' });
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
+    message.success('后台下载进行中,请稍后查看任务列表');
+  });
+  setTimeout(() => {
+    exportLoading.value = false;
+  }, 3000); // 5分钟后自动关闭
+};

 // 获取资格等级名称
 const getQualificationLevelName = (id: string | number) => {
--- a/src/views/professional/professionalteacheracademicrelation/form.vue
+++ b/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' },
-      { pattern: /^[A-Za-z0-9]+$/, message: '证书编码只能包含英文和数字', trigger: 'blur' }
+      { required: true, message: '请输入证书编号', trigger: 'blur' },
+      { pattern: /^[A-Za-z0-9]+$/, message: '证书编号只能包含英文和数字', trigger: 'blur' }
    ]
  }
  
--- a/src/views/professional/professionalteacheracademicrelation/index.vue
+++ b/src/views/professional/professionalteacheracademicrelation/index.vue
@@ -241,14 +241,13 @@ import { useDict } from '/@/hooks/dict'
 import { 
  fetchList, 
  examObj, 
-  delObj, 
-  exportExcel
-} from '/@/api/professional/professionaluser/professionalteacheracademicrelation'
+  delObj} 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
-  try {
-    const response: any = await exportExcel(search)
-    
-    const blob = new Blob([response as BlobPart])
-    const fileName = '学历学位信息.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 (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
+  exportLoading.value = true;
+  let params = Object.assign(search, { type: 'P20005' });
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
+    message.success('后台下载进行中,请稍后查看任务列表');
+  });
+  setTimeout(() => {
+    exportLoading.value = false;
+  }, 3000); // 5分钟后自动关闭
 }

 // 获取学位名称
--- a/src/views/professional/professionalteachercertificaterelation/index.vue
+++ b/src/views/professional/professionalteachercertificaterelation/index.vue
@@ -212,9 +212,10 @@ import { getTeacherCertificateList } from '/@/api/professional/rsbase/profession
 import { 
  fetchList, 
  examObj, 
-  delObj,
-  exportExcel
+  delObj
 } 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
-  try {
-    const response: any = await exportExcel(search)
-    
-    const blob = new Blob([response as BlobPart])
-    const fileName = '教师资格证信息.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 (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
+  exportLoading.value = true;
+  let params = Object.assign(search, { type: 'P20004' });
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
+    message.success('后台下载进行中,请稍后查看任务列表');
+  });
+  setTimeout(() => {
+    exportLoading.value = false;
+  }, 3000); // 5分钟后自动关闭
+};

 // 获取证书名称
 const getCertificateName = (id: string | number) => {
--- a/src/views/professional/professionalteacherhonor/index.vue
+++ b/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
-  try {
-    const response = await fetchList({
-      current: 1,
-      size: 999999,
-      ...search
-    })
-    const data = response.data.records || []
-    
-    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
-  }
+  exportLoading.value = true;
+  let params = Object.assign(search, { type: 'P20006' });
+  makeExportTeacherInfoByTypeTask(params).then((res: any) => {
+    message.success('后台下载进行中,请稍后查看任务列表');
+  });
+  setTimeout(() => {
+    exportLoading.value = false;
+  }, 3000); // 5分钟后自动关闭
 }

 // 打开导入弹窗
--- a/src/views/professional/professionaltitlerelation/index.vue
+++ b/src/views/professional/professionaltitlerelation/index.vue
@@ -5,74 +5,28 @@
 			<div class="content-block">
 				<!-- 最上：搜索区 -->
 				<div v-show="showSearch" class="content-block__filter">
-          <search-form
-            :model="search"
-            ref="searchFormRef"
-            @keyup-enter="handleFilter"
-          >
+					<search-form :model="search" ref="searchFormRef" @keyup-enter="handleFilter">
 						<template #default="{ visible }">
 							<template v-if="visible">
 								<el-form-item label="姓名" prop="realName">
-                  <el-input
-                    v-model="search.realName"
-                    clearable
-                    placeholder="请输入姓名"
-                    class="filter-input"
-                  />
+									<el-input v-model="search.realName" clearable placeholder="请输入姓名" class="filter-input" />
 								</el-form-item>
 								<el-form-item label="工号" prop="teacherNo">
-                  <el-input
-                    v-model="search.teacherNo"
-                    clearable
-                    placeholder="请输入工号"
-                    class="filter-input"
-                  />
+									<el-input v-model="search.teacherNo" clearable placeholder="请输入工号" class="filter-input" />
 								</el-form-item>
 								<el-form-item label="审核状态" prop="state">
-                  <el-select
-                    v-model="search.state"
-                    clearable
-                    placeholder="请选择审核状态"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in professionalState"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
+									<el-select v-model="search.state" clearable placeholder="请选择审核状态" class="filter-select">
+										<el-option v-for="item in professionalState" :key="item.value" :label="item.label" :value="item.value" />
 									</el-select>
 								</el-form-item>
 								<el-form-item label="职称" prop="professionalTitleConfigId">
-                  <el-select
-                    v-model="search.professionalTitleConfigId"
-                    clearable
-                    filterable
-                    placeholder="请选择职称"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in professionalTitleList"
-                      :key="item.id"
-                      :label="item.professionalTitle"
-                      :value="item.id"
-                    />
+									<el-select v-model="search.professionalTitleConfigId" clearable filterable placeholder="请选择职称" class="filter-select">
+										<el-option v-for="item in professionalTitleList" :key="item.id" :label="item.professionalTitle" :value="item.id" />
 									</el-select>
 								</el-form-item>
 								<el-form-item label="专业技术职务" prop="majorStation">
-                  <el-select
-                    v-model="search.majorStation"
-                    clearable
-                    filterable
-                    placeholder="请选择专业技术职务"
-                    class="filter-select"
-                  >
-                    <el-option
-                      v-for="item in majorStationList"
-                      :key="item.id"
-                      :label="item.majorStationName"
-                      :value="item.id"
-                    />
+									<el-select v-model="search.majorStation" clearable filterable placeholder="请选择专业技术职务" class="filter-select">
+										<el-option v-for="item in majorStationList" :key="item.id" :label="item.majorStationName" :value="item.id" />
 									</el-select>
 								</el-form-item>
 							</template>
@@ -90,12 +44,9 @@
 				<div class="content-block__header">
 					<div class="header-actions">
 						<div class="action-group">
-              <el-button
-                v-if="hasAuth('professional_professionaltitlerelation_add')"
-                type="primary"
-                icon="FolderAdd"
-                @click="handleAdd"
-              >新增</el-button>
+							<el-button v-if="hasAuth('professional_professionaltitlerelation_add')" type="primary" icon="FolderAdd" @click="handleAdd"
+								>新增</el-button
+							>
 							<el-button
 								v-if="hasAuth('professional_teacherbase_export')"
 								type="warning"
@@ -103,21 +54,20 @@
 								icon="Download"
 								@click="handleDownLoadWord"
 								:loading="exportLoading"
-              >导出信息</el-button>
+								>导出信息</el-button
+							>
 							<el-button
 								v-auth="'professional_teacherinfo_import'"
 								type="primary"
 								plain
 								icon="UploadFilled"
 								:loading="exportLoading"
-                  @click="handleImportDialog">导入信息
+								@click="handleImportDialog"
+								>导入信息
 							</el-button>
 						</div>
 						<div class="header-right">
-              <RightToolbar
-                v-model:showSearch="showSearch"
-                @queryTable="getDataList"
-              />
+							<RightToolbar v-model:showSearch="showSearch" @queryTable="getDataList" />
 						</div>
 					</div>
 				</div>
@@ -167,7 +117,8 @@
 								type="primary"
 								link
 								icon="Document"
-              @click="handlePreview(scope.row.srcList)">查看
+								@click="handlePreview(scope.row.srcList)"
+								>查看
 							</el-button>
 							<span v-else class="empty-text">-</span>
 						</template>
@@ -183,42 +134,43 @@
 									type="primary"
 									link
 									icon="edit-pen"
-              @click="handleEdit(scope.row)">修改
+									@click="handleEdit(scope.row)"
+									>修改
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canExam"
 									type="success"
 									link
 									icon="CircleCheck"
-              @click="changeState(scope.row, 1)">通过
+									@click="changeState(scope.row, 1)"
+									>通过
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canDeptExam"
 									type="success"
 									link
 									icon="CircleCheck"
-              @click="changeState(scope.row, 1)">部门通过
+									@click="changeState(scope.row, 1)"
+									>部门通过
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canBack"
 									type="danger"
 									link
 									icon="CircleClose"
-              @click="changeState(scope.row, -2)">驳回
+									@click="changeState(scope.row, -2)"
+									>驳回
 								</el-button>
 								<el-button
 									v-if="hasAuth('professional_professionaltitlerelation_exam') && scope.row.canDeptBack"
 									type="danger"
 									link
 									icon="CircleClose"
-              @click="changeState(scope.row, -2)">部门驳回
+									@click="changeState(scope.row, -2)"
+									>部门驳回
 								</el-button>
-            <el-button
-              v-if="hasAuth('professional_professionaltitlerelation_del')"
-              type="danger"
-              link
-              icon="delete"
-              @click="handleDel(scope.row)">删除
+								<el-button v-if="hasAuth('professional_professionaltitlerelation_del')" type="danger" link icon="delete" @click="handleDel(scope.row)"
+									>删除
 								</el-button>
 							</div>
 						</template>
@@ -226,21 +178,12 @@
 				</el-table>

 				<!-- 分页 -->
-        <pagination
-          v-bind="state.pagination"
-          @current-change="currentChangeHandle"
-          @size-change="sizeChangeHandle"
-        />
+				<pagination v-bind="state.pagination" @current-change="currentChangeHandle" @size-change="sizeChangeHandle" />
 			</div>
 		</div>

 		<!-- 材料预览：图片直接显示，PDF 在组件内部 dialog 中显示 -->
-    <preview-file 
-      v-for="src in imgUrl" 
-      :key="src.title" 
-      :authSrc="src.url"
-      dialog-title="职称材料"  
-    />
+		<preview-file v-for="src in imgUrl" :key="src.title" :authSrc="src.url" dialog-title="职称材料" />

 		<!-- 子组件 -->
 		<MultiDialog ref="multiDialogRef" @getList="getDataList" :page="state.pagination" :nowRow="null" />
@@ -252,48 +195,44 @@
 </template>

 <script setup lang="ts">
-import { ref, reactive, onMounted, nextTick } from 'vue'
-import { BasicTableProps, useTable } from '/@/hooks/table'
-import { useAuth } from '/@/hooks/auth'
-import { useMessage } from '/@/hooks/message'
-import { useMessageBox } from '/@/hooks/message'
-import { useDict } from '/@/hooks/dict'
+import { ref, reactive, onMounted, nextTick } from 'vue';
+import { BasicTableProps, useTable } from '/@/hooks/table';
+import { useAuth } from '/@/hooks/auth';
+import { useMessage } from '/@/hooks/message';
+import { useMessageBox } from '/@/hooks/message';
+import { useDict } from '/@/hooks/dict';
 // 接口
-import { 
-  fetchList, 
-  examObj, 
-  delObj, 
-  exportRelation
-} from '/@/api/professional/professionaluser/professionaltitlerelation'
-import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig'
-import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation'
-import { defineAsyncComponent } from 'vue'
+import { fetchList, examObj, delObj } from '/@/api/professional/professionaluser/professionaltitlerelation';
+import { getProfessionalTitleList } from '/@/api/professional/rsbase/professionaltitlelevelconfig';
+import { getMajorStationList } from '/@/api/professional/rsbase/professionalmajorstation';
+import { makeExportTeacherInfoByTypeTask } from '/@/api/professional/professionalfile';
+import { defineAsyncComponent } from 'vue';
 // 子组件
-const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'))
-const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'))
-const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'))
-const DataForm = defineAsyncComponent(() => import('./form.vue'))
-const ProfessionalBackResaon = defineAsyncComponent(() => import('/@/views/professional/common/professional-back-resaon.vue'))
-const previewFile = defineAsyncComponent(() => import('/@/components/tools/preview-file.vue'))
-const ImportTeacherOtherInfo = defineAsyncComponent(() => import('/@/views/professional/common/import-teacher-other-info.vue'))
+const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue'));
+const AuditState = defineAsyncComponent(() => import('/@/components/AuditState/index.vue'));
+const MultiDialog = defineAsyncComponent(() => import('/@/views/professional/teacherbase/multiDialog.vue'));
+const DataForm = defineAsyncComponent(() => import('./form.vue'));
+const ProfessionalBackResaon = defineAsyncComponent(() => import('/@/views/professional/common/professional-back-resaon.vue'));
+const previewFile = defineAsyncComponent(() => import('/@/components/tools/preview-file.vue'));
+const ImportTeacherOtherInfo = defineAsyncComponent(() => import('/@/views/professional/common/import-teacher-other-info.vue'));

 // 无权限即无节点：使用 useAuth + v-if
-const { hasAuth } = useAuth()
+const { hasAuth } = useAuth();

 // 消息提示 hooks
-const message = useMessage()
-const messageBox = useMessageBox()
+const message = useMessage();
+const messageBox = useMessageBox();

 // 字典数据
-const { professional_state: professionalState } = useDict('professional_state')
+const { professional_state: professionalState } = useDict('professional_state');

 // 表格引用
-const tableRef = ref()
-const searchFormRef = ref()
-const multiDialogRef = ref()
-const dataFormRef = ref()
-const backReasonRef = ref()
-const showSearch = ref(true) // 方案 F：默认收起筛选，首屏仅一张大卡片
+const tableRef = ref();
+const searchFormRef = ref();
+const multiDialogRef = ref();
+const dataFormRef = ref();
+const backReasonRef = ref();
+const showSearch = ref(true); // 方案 F：默认收起筛选，首屏仅一张大卡片

 // 搜索表单数据
 const search = reactive({
@@ -301,82 +240,85 @@ const search = reactive({
 	teacherNo: '',
 	realName: '',
 	professionalTitleConfigId: '',
-  majorStation: ''
-})
+	majorStation: '',
+});

 // 材料预览
-const imgUrl = ref<Array<{ title: string; url: string }>>([])
+const imgUrl = ref<Array<{ title: string; url: string }>>([]);

 // 导出加载状态
-const exportLoading = ref(false)
+const exportLoading = ref(false);

 // 职称和专业技术职务列表
-const professionalTitleList = ref<any[]>([])
-const majorStationList = ref<any[]>([])
+const professionalTitleList = ref<any[]>([]);
+const majorStationList = ref<any[]>([]);

 // 配置 useTable
 const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: async (params: any) => {
-    const response = await fetchList(params)
-    const records = response.data.records || []
+		const response = await fetchList(params);
+		const records = response.data.records || [];
 		// 处理证明材料列表
 		records.forEach((v: any) => {
 			if (v.evidence != null) {
-        v.srcList = [v.evidence]
+				v.srcList = [v.evidence];
 			} else {
-        v.srcList = []
+				v.srcList = [];
 			}
-    })
+		});
 		return {
 			data: {
 				records,
-        total: response.data.total || 0
-      }
-    }
+				total: response.data.total || 0,
 			},
-  queryForm: search
-})
+		};
+	},
+	queryForm: search,
+});

-const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, tableStyle } = useTable(state);

 // 预览材料
 const handlePreview = (list: string[]) => {
-  imgUrl.value = []
+	imgUrl.value = [];
 	nextTick(() => {
-    list.forEach(v => {
+		list.forEach((v) => {
 			imgUrl.value.push({
 				title: '',
-        url: v
-      })
-    })
-  })
-}
+				url: v,
+			});
+		});
+	});
+};

 // 审核状态变更
 const changeState = (row: any, val: number) => {
 	if (val === 1) {
-    const str = '通过'
-    messageBox.confirm(`是否确认${str}${row.realName}的申请`).then(async () => {
+		const str = '通过';
+		messageBox
+			.confirm(`是否确认${str}${row.realName}的申请`)
+			.then(async () => {
 				try {
 					await examObj({
 						id: row.id,
-          state: val
-        })
-        message.success('操作成功')
-        getDataList()
+						state: val,
+					});
+					message.success('操作成功');
+					getDataList();
 				} catch (error: any) {
 					// 处理业务错误
 				}
-    }).catch(() => {})
+			})
+			.catch(() => {});
 	} else if (val === -2) {
-    backReasonRef.value?.init(row, 'title')
+		backReasonRef.value?.init(row, 'title');
 	}
-}
+};

 // 查询
 const handleFilter = () => {
-  getDataList()
-}
+	getDataList();
+};

 // 重置查询
 const resetQuery = () => {
@@ -385,103 +327,94 @@ const resetQuery = () => {
 		teacherNo: '',
 		realName: '',
 		professionalTitleConfigId: '',
-    majorStation: ''
-  })
-  getDataList()
-}
+		majorStation: '',
+	});
+	getDataList();
+};

 // 打开新增窗口
 const handleAdd = () => {
-  dataFormRef.value?.openDialog()
-}
+	dataFormRef.value?.openDialog();
+};

 // 打开编辑窗口
 const handleEdit = (row: any) => {
-  dataFormRef.value?.openDialog(row)
-}
+	dataFormRef.value?.openDialog(row);
+};

 // 删除
 const handleDel = (row: any) => {
-  messageBox.confirm('是否确认删除该条记录').then(async () => {
+	messageBox
+		.confirm('是否确认删除该条记录')
+		.then(async () => {
 			try {
-      await delObj(row.id)
-      message.success('删除成功')
+				await delObj(row.id);
+				message.success('删除成功');
 				// 如果当前页只剩一条数据，且不是第一页，则跳转到上一页
 				if (state.pagination && state.dataList && state.dataList.length === 1 && state.pagination.current && state.pagination.current > 1) {
-        state.pagination.current = state.pagination.current - 1
+					state.pagination.current = state.pagination.current - 1;
 				}
-      getDataList()
+				getDataList();
 			} catch (error: any) {
 				// 处理业务错误
-      message.error(error.msg)
+				message.error(error.msg);
 			}
-  }).catch(() => {})
-}
+		})
+		.catch(() => {});
+};

 // 导出
 const handleDownLoadWord = async () => {
-  exportLoading.value = true
-  try {
-    const response: any = await exportRelation(search)
-    
-    const blob = new Blob([response as BlobPart])
-    const fileName = '职称信息.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 (error) {
-    message.error('导出失败')
-  } finally {
-    exportLoading.value = false
-  }
-}
+	exportLoading.value = true;
+	let params = Object.assign(search, { type: 'P20002' });
+	makeExportTeacherInfoByTypeTask(params).then((res: any) => {
+		message.success('后台下载进行中,请稍后查看任务列表');
+	});
+	setTimeout(() => {
+		exportLoading.value = false;
+	}, 3000); // 5分钟后自动关闭
+};

 // 获取职称名称
 const getProfessionalTitleName = (id: string | number) => {
-  const item = professionalTitleList.value.find((item: any) => item.id === id)
-  return item ? item.professionalTitle : '-'
-}
+	const item = professionalTitleList.value.find((item: any) => item.id === id);
+	return item ? item.professionalTitle : '-';
+};

 // 获取专业技术职务名称
 const getMajorStationName = (id: string | number) => {
-  const item = majorStationList.value.find((item: any) => item.id === id)
-  return item ? item.majorStationName : '-'
-}
+	const item = majorStationList.value.find((item: any) => item.id === id);
+	return item ? item.majorStationName : '-';
+};

 // 加载字典数据
 const loadDictData = async () => {
 	try {
 		// 加载职称列表
-    const titleRes = await getProfessionalTitleList()
+		const titleRes = await getProfessionalTitleList();
 		if (titleRes && titleRes.data) {
-      professionalTitleList.value = titleRes.data
+			professionalTitleList.value = titleRes.data;
 		}

 		// 加载专业技术职务列表
-    const majorRes = await getMajorStationList()
+		const majorRes = await getMajorStationList();
 		if (majorRes && majorRes.data) {
-      majorStationList.value = majorRes.data
+			majorStationList.value = majorRes.data;
 		}
 	} catch (error) {
 		// Failed to load dict data
 	}
-}
+};

-const importTeacherOtherInfoRef=ref()
+const importTeacherOtherInfoRef = ref();
 const handleImportDialog = () => {
-  importTeacherOtherInfoRef.value?.init('titleRelation')
-}
+	importTeacherOtherInfoRef.value?.init('titleRelation');
+};

 // 初始化：仅加载下拉字典，表格数据由 useTable 在 createdIsNeed: true 时自动请求
 onMounted(async () => {
-  await loadDictData()
-})
+	await loadDictData();
+});
 </script>

 <style lang="scss" scoped>
--- a/src/views/professional/teacherbase/import-teacherInfo.vue
+++ b/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;">
-        <a href="excel/dictlist.xlsx" rel="external nofollow" download="职工信息字典下载" style="text-decoration: none;">
-          <el-button type="success" :icon="Download">下载字典文件</el-button>
-        </a>
-      </div>
+<!--      <div style="text-align: center; margin-bottom: 20px;">-->
+<!--        <a href="excel/dictlist.xlsx" rel="external nofollow" download="职工信息字典下载" style="text-decoration: none;">-->
+<!--          <el-button type="success" :icon="Download">下载字典文件</el-button>-->
+<!--        </a>-->
+<!--      </div>-->

      <el-upload
        class="upload-demo"
--- a/src/views/professional/teacherbase/index.vue
+++ b/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