staging #27

Merged
hy merged 3 commits from staging into master 2025-10-16 10:51:15 +08:00
3 changed files with 11 additions and 5 deletions
Showing only changes of commit 0db9c78a6a - Show all commits

View File

@ -1,3 +1,4 @@
import { Ref } from "vue";
import { array } from "vue-types"; import { array } from "vue-types";
export interface Dialog { export interface Dialog {
@ -329,6 +330,8 @@ export interface TableConfig {
searchCallback?: (s: SearchConditions) => void; searchCallback?: (s: SearchConditions) => void;
/** 新增/修改回调函数 */ /** 新增/修改回调函数 */
editCallback?: (from: any) => void; editCallback?: (from: any) => void;
/** 编辑表单初始化回调函数 */
editInitCallback?: (from: Ref<Record<string, TableColumn>>) => void;
/** 展开行的回调 */ /** 展开行的回调 */
expandChange?: (row: any, expandedRows: any[]) => void; expandChange?: (row: any, expandedRows: any[]) => void;
/** API地址 */ /** API地址 */

View File

@ -46,6 +46,9 @@ onMounted(() => {
intiColumn(); intiColumn();
fetchInitData(); fetchInitData();
fetchFormData(); fetchFormData();
//
if (editData.value.table.editInitCallback)
editData.value.table.editInitCallback(column);
}); });
function execute(obj, btn) { function execute(obj, btn) {

View File

@ -69,13 +69,13 @@ const tableData: TableConfig = intTableData({
{ {
topBtn: true, // topBtn: true, //
label: "导入", label: "导入",
click:entryAdminnfo, click: entryAdminnfo,
btnStyle: "info", // topBtn: true success danger btnStyle: "info", // topBtn: true success danger
}, },
{ {
topBtn: true, // topBtn: true, //
label: "导入模板", label: "导入模板",
click:DwImportTemplate, click: DwImportTemplate,
btnStyle: "info", // topBtn: true success danger btnStyle: "info", // topBtn: true success danger
}, },
], ],
@ -149,16 +149,16 @@ function entryAdminnfo(eid: number) {
const url = res && window.URL.createObjectURL(res); const url = res && window.URL.createObjectURL(res);
const link = document.createElement("a"); const link = document.createElement("a");
link.href = url; link.href = url;
link.setAttribute("download","导入失败管理员信息.xlsx"); link.setAttribute("download", "导入失败管理员信息.xlsx");
document.body.appendChild(link); document.body.appendChild(link);
link.click(); link.click();
document.body.removeChild(link); document.body.removeChild(link);
ElMessage.warning("导入失败,已导出错误数据"); ElMessage.warning("导入失败,已导出错误数据");
}; };
try { try {
fileE.click(); fileE.click();
} catch (error) { } } catch (error) {}
} }
function DwImportTemplate(obj, row, callBack) { function DwImportTemplate(obj, row, callBack) {
const baseUrl = import.meta.env.VITE_API_BASEURL; const baseUrl = import.meta.env.VITE_API_BASEURL;