RISE/school-developer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
吴红兵
2026-02-06 15:42:56 +08:00
parent 591bad2318 6a4c47f6fa
commit 020468c6f1
13 changed files with 540 additions and 615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/basic/basicasynctask.ts
View File

@@ -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',
});
};

10
src/api/professional/professionalfile.ts
View File

@@ -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,
});
};

13
src/api/professional/professionaluser/professionaltitlerelation.ts
View File

@@ -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',
});
};

39
src/layout/navBars/breadcrumb/asyncTaskDrawer.vue
View File

@@ -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>

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

@@ -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')
}
// 暴露方法给父组件

35
src/views/professional/professionalqualificationrelation/index.vue
View File

@@ -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) => {

8
src/views/professional/professionalteacheracademicrelation/form.vue
View File

@@ -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' }
]
}

33
src/views/professional/professionalteacheracademicrelation/index.vue
View File

@@ -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分钟后自动关闭
}
// 获取学位名称

35
src/views/professional/professionalteachercertificaterelation/index.vue
View File

@@ -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) => {

32
src/views/professional/professionalteacherhonor/index.vue
View File

@@ -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分钟后自动关闭
}
// 打开导入弹窗

921
src/views/professional/professionaltitlerelation/index.vue
View File

File diff suppressed because it is too large Load Diff

12
src/views/professional/teacherbase/import-teacherInfo.vue
View File

@@ -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"

2
src/views/professional/teacherbase/index.vue
View File

@@ -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