This commit is contained in:
2026-01-22 13:38:10 +08:00
parent b350322626
commit 313fe64475
151 changed files with 13060 additions and 4411 deletions

View File

@@ -122,7 +122,6 @@ const getUnionTypeDict = async () => {
unionTypeList.value = []
}
} catch (err) {
console.error('获取类型字典失败', err)
unionTypeList.value = []
}
}
@@ -162,7 +161,6 @@ const openDialog = async (type: string = 'edit', row?: any) => {
form.sort = res.data.sort !== undefined && res.data.sort !== null ? res.data.sort : undefined
}
}).catch((err) => {
console.error('获取详情失败', err)
}).finally(() => {
loading.value = false
})

View File

@@ -6,9 +6,26 @@
<div class="mb8" style="width: 100%">
<right-toolbar
v-model:showSearch="showSearch"
class="ml10 mr20"
class="ml10"
style="float: right;"
@queryTable="getDataList">
<TableColumnControl
ref="columnControlRef"
:columns="tableColumns"
v-model="visibleColumns"
trigger-type="default"
trigger-circle
@change="handleColumnChange"
@order-change="handleColumnOrderChange"
>
<template #trigger>
<el-tooltip class="item" effect="dark" content="列设置" placement="top">
<el-button circle style="margin-left: 0;">
<el-icon><Menu /></el-icon>
</el-button>
</el-tooltip>
</template>
</TableColumnControl>
</right-toolbar>
</div>
</el-row>
@@ -25,47 +42,34 @@
<el-icon><List /></el-icon>
</template>
</el-table-column>
<el-table-column prop="unionName" label="学生会名称" show-overflow-tooltip align="center" min-width="200">
<template #header>
<el-icon><OfficeBuilding /></el-icon>
<span style="margin-left: 4px">学生会名称</span>
</template>
</el-table-column>
<el-table-column prop="unionType" label="类型" show-overflow-tooltip align="center" width="120">
<template #header>
<el-icon><Collection /></el-icon>
<span style="margin-left: 4px">类型</span>
</template>
<template #default="scope">
<el-tag size="small" type="info" effect="plain">
{{ formatUnionType(scope.row.unionType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="address" label="联系地址" show-overflow-tooltip align="center" min-width="200">
<template #header>
<el-icon><Location /></el-icon>
<span style="margin-left: 4px">联系地址</span>
</template>
</el-table-column>
<el-table-column prop="maintainer" label="负责人" show-overflow-tooltip align="center" width="120">
<template #header>
<el-icon><UserFilled /></el-icon>
<span style="margin-left: 4px">负责人</span>
</template>
</el-table-column>
<el-table-column prop="sort" label="排序" show-overflow-tooltip align="center" width="80">
<template #header>
<el-icon><Sort /></el-icon>
<span style="margin-left: 4px">排序</span>
</template>
<template #default="scope">
<el-tag v-if="scope.row.sort !== undefined && scope.row.sort !== null" size="small" type="primary" effect="plain">
{{ scope.row.sort }}
</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<template v-for="col in sortedTableColumns" :key="col.prop || col.label">
<el-table-column
v-if="checkColumnVisible(col.prop || '') && col.prop !== '操作'"
:prop="col.prop"
:label="col.label"
show-overflow-tooltip
align="center"
:min-width="col.minWidth"
:width="col.width">
<template #header>
<el-icon><component :is="columnConfigMap[col.prop]?.icon || Calendar" /></el-icon>
<span style="margin-left: 4px">{{ col.label }}</span>
</template>
<!-- 类型列特殊模板 -->
<template v-if="col.prop === 'unionType'" #default="scope">
<el-tag size="small" type="info" effect="plain">
{{ formatUnionType(scope.row.unionType) }}
</el-tag>
</template>
<!-- 排序列特殊模板 -->
<template v-else-if="col.prop === 'sort'" #default="scope">
<el-tag v-if="scope.row.sort !== undefined && scope.row.sort !== null" size="small" type="primary" effect="plain">
{{ scope.row.sort }}
</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
</template>
<el-table-column label="操作" width="100" align="center" fixed="right">
<template #header>
<el-icon><Setting /></el-icon>
@@ -96,21 +100,147 @@
</template>
<script setup lang="ts" name="StuUnion">
import { reactive, ref, onMounted } from 'vue'
import { reactive, ref, onMounted, computed, nextTick } from 'vue'
import { useRoute } from 'vue-router'
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList } from "/@/api/stuwork/stuunion";
import { useMessage } from "/@/hooks/message";
import { getDicts } from "/@/api/admin/dict";
import TableColumnControl from '/@/components/TableColumnControl/index.vue'
import FormDialog from './form.vue'
import {
List, OfficeBuilding, Collection, Location, UserFilled, Sort, Setting
List, OfficeBuilding, Collection, Location, UserFilled, Sort, Setting, Menu, Calendar
} from '@element-plus/icons-vue'
// 定义变量内容
const route = useRoute()
const formDialogRef = ref()
const columnControlRef = ref<any>()
const showSearch = ref(false)
const unionTypeList = ref<any[]>([])
// 表格列配置
const tableColumns = [
{ prop: 'unionName', label: '学生会名称', minWidth: 200 },
{ prop: 'unionType', label: '类型', width: 120 },
{ prop: 'address', label: '联系地址', minWidth: 200 },
{ prop: 'maintainer', label: '负责人', width: 120 },
{ prop: 'sort', label: '排序', width: 80 }
]
// 列配置映射(用于图标)
const columnConfigMap: Record<string, { icon: any }> = {
unionName: { icon: OfficeBuilding },
unionType: { icon: Collection },
address: { icon: Location },
maintainer: { icon: UserFilled },
sort: { icon: Sort }
}
// 当前显示的列
const visibleColumns = ref<string[]>([])
// 列排序顺序
const columnOrder = ref<string[]>([])
// 立即从 localStorage 加载配置
const loadSavedConfig = () => {
const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
const storageKey = `table-columns-${routePath}`
const saved = localStorage.getItem(storageKey)
if (saved) {
try {
const savedColumns = JSON.parse(saved)
const validColumns = tableColumns.map(col => col.prop || col.label)
const filteredSaved = savedColumns.filter((col: string) => validColumns.includes(col))
visibleColumns.value = filteredSaved.length > 0 ? filteredSaved : validColumns
} catch (e) {
visibleColumns.value = tableColumns.map(col => col.prop || col.label)
}
} else {
visibleColumns.value = tableColumns.map(col => col.prop || col.label)
}
const orderKey = `${storageKey}-order`
const savedOrder = localStorage.getItem(orderKey)
if (savedOrder) {
try {
const parsedOrder = JSON.parse(savedOrder)
const validColumns = tableColumns.map(col => col.prop || col.label)
columnOrder.value = parsedOrder.filter((key: string) => validColumns.includes(key))
validColumns.forEach(key => {
if (!columnOrder.value.includes(key)) {
columnOrder.value.push(key)
}
})
} catch (e) {
columnOrder.value = tableColumns.map(col => col.prop || col.label)
}
} else {
columnOrder.value = tableColumns.map(col => col.prop || col.label)
}
}
loadSavedConfig()
// 排序后的表格列
const sortedTableColumns = computed(() => {
const columns = tableColumns.filter(col => {
const key = col.prop || col.label
return visibleColumns.value.includes(key)
})
if (columnOrder.value.length > 0) {
const orderedColumns: typeof tableColumns = []
const unorderedColumns: typeof tableColumns = []
columnOrder.value.forEach(key => {
const col = columns.find(c => (c.prop || c.label) === key)
if (col) {
orderedColumns.push(col)
}
})
columns.forEach(col => {
const key = col.prop || col.label
if (!columnOrder.value.includes(key)) {
unorderedColumns.push(col)
}
})
return [...orderedColumns, ...unorderedColumns]
}
return columns
})
// 列显示控制函数
const checkColumnVisible = (prop: string): boolean => {
if (visibleColumns.value.length === 0) {
return true
}
return visibleColumns.value.includes(prop)
}
// 监听列变化
const handleColumnChange = (columns: string[]) => {
visibleColumns.value = columns
const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
const storageKey = `table-columns-${routePath}`
const selectableColumns = columns.filter(col => {
const column = tableColumns.find(c => (c.prop || c.label) === col)
return column && !column.alwaysShow && !column.fixed
})
localStorage.setItem(storageKey, JSON.stringify(selectableColumns))
}
// 监听列排序变化
const handleColumnOrderChange = (order: string[]) => {
columnOrder.value = order
const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
const storageKey = `table-columns-${routePath}-order`
localStorage.setItem(storageKey, JSON.stringify(order))
}
// 表格样式
const tableStyle = {
cellStyle: { padding: '8px 0' },
@@ -163,7 +293,6 @@ const getUnionTypeDict = async () => {
unionTypeList.value = []
}
} catch (err) {
console.error('获取类型字典失败', err)
unionTypeList.value = []
}
}
@@ -171,6 +300,11 @@ const getUnionTypeDict = async () => {
// 初始化
onMounted(() => {
getUnionTypeDict()
nextTick(() => {
if (visibleColumns.value.length === 0) {
loadSavedConfig()
}
})
})
</script>