Merge remote-tracking branch 'origin/master'

This commit is contained in:
ye1023
2026-07-02 14:00:01 +08:00
@@ -26,7 +26,13 @@
<!-- </a-col>-->
<a-col :lg="6" :md="6" :sm="8">
<a-form-item label="完成状态" name="bpmStatus">
<JDictSelectTag v-model:value="queryParam.bpmStatus" dictCode="super_status" placeholder="请选择完成状态" allow-clear @change="searchQuery" />
<JDictSelectTag
v-model:value="queryParam.bpmStatus"
dictCode="super_status"
placeholder="请选择完成状态"
allow-clear
@change="searchQuery"
/>
</a-form-item>
</a-col>
<a-col :lg="3" :md="8" :sm="12">
@@ -45,9 +51,15 @@
<template #tableTitle>
<a-button type="primary" v-auth="actionAuth.add" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
<a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
<a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:download-outlined" @click="handleDownloadTemplate">下载模板</a-button>
<j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:check-outlined" @click="handleCheckExcel">模板校验</j-upload-button>
<j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:import-outlined" @click="handleImportByTemplate">模板导入</j-upload-button>
<a-button type="primary" v-auth="actionAuth.exportXls" preIcon="ant-design:download-outlined" @click="handleDownloadTemplate"
>下载模板</a-button
>
<j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:check-outlined" @click="handleCheckExcel"
>模板校验</j-upload-button
>
<j-upload-button type="primary" v-auth="actionAuth.importExcel" preIcon="ant-design:import-outlined" @click="handleImportByTemplate"
>模板导入</j-upload-button
>
<a-dropdown v-if="selectedRowKeys.length > 0">
<template #overlay>
<a-menu>
@@ -70,8 +82,7 @@
<TableAction stopButtonPropagation :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)" />
</template>
<!--字段回显插槽-->
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
<template v-slot:bodyCell="{ column, record, index, text }"> </template>
<!--嵌套子表-->
<template #expandedRowRender="{ record }">
<div class="feedback-expand-table">
@@ -619,7 +630,7 @@
});
async function handleDownloadTemplate() {
const data = await defHttp.get({ url: getExportXlsHeadersUrl, params: {}, responseType: 'blob', timeout: 60000 }, { isTransformResponse: false });
const data = await defHttp.get({ url: getExportXlsHeadersUrl, params: { meetingType: props.meetingType }, responseType: 'blob', timeout: 60000 }, { isTransformResponse: false });
if (!data) {
createMessage.warning('文件下载失败');
return;
@@ -648,7 +659,7 @@
// ignore
}
};
await defHttp.uploadFile({ url: getCheckExcelByEasyExcelUrl }, { file: data.file }, { success: isReturn });
await defHttp.uploadFile({ url: getCheckExcelByEasyExcelUrl + '?meetingType=' + props.meetingType }, { file: data.file }, { success: isReturn });
}
async function handleImportByTemplate(data) {
@@ -669,7 +680,7 @@
reload();
}
};
await defHttp.uploadFile({ url: getImportExcelByEasyExcelUrl }, { file: data.file }, { success: isReturn });
await defHttp.uploadFile({ url: getImportExcelByEasyExcelUrl + '?meetingType=' + props.meetingType }, { file: data.file }, { success: isReturn });
}
/**