Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

This commit is contained in:
guochunsi
2026-02-04 14:01:11 +08:00
4 changed files with 42 additions and 12 deletions

View File

@@ -68,7 +68,7 @@ import { ElNotification } from 'element-plus';
import { Download } from '@element-plus/icons-vue';
import global from '/@/components/tools/commondict.vue';
import request from '/@/utils/request';
import { exportTeacherInfoBySelf } from '/@/api/professional/professionalfile';
import { makeExportTeacherInfoBySelfTask } from '/@/api/professional/professionalfile';
// Props
const props = defineProps<{
@@ -224,7 +224,7 @@ const exportTeacherInfo = async () => {
teacherBaseDTO: searchData,
};
exportTeacherInfoBySelf(params).then((res:any)=>{
makeExportTeacherInfoBySelfTask(params).then((res:any)=>{
ElNotification.success({
title: '下载后台进行中',
message: '操作成功'

View File

@@ -215,14 +215,14 @@
icon="Lock"
@click="dialogVisible.statusDialogFormVisible=true">状态锁定
</el-button>
<el-button
v-if="permissions.professional_teacherbase_export"
type="warning"
plain
icon="Download"
:loading="exportLoading"
@click="handleDownLoadWord('')">导出WORD
</el-button>
<!-- <el-button-->
<!-- v-if="permissions.professional_teacherbase_export"-->
<!-- type="warning"-->
<!-- plain-->
<!-- icon="Download"-->
<!-- :loading="exportLoading"-->
<!-- @click="handleDownLoadWord('')">导出WORD-->
<!-- </el-button>-->
<el-button
v-if="permissions.professional_teacherbase_export"
type="warning"