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

@@ -144,9 +144,26 @@
</el-button>
<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>
@@ -164,85 +181,36 @@
<el-icon><List /></el-icon>
</template>
</el-table-column>
<el-table-column prop="deptName" label="学院" show-overflow-tooltip align="center">
<template #header>
<el-icon><OfficeBuilding /></el-icon>
<span style="margin-left: 4px">学院</span>
</template>
</el-table-column>
<el-table-column prop="roomNo" label="房间号" show-overflow-tooltip align="center">
<template #header>
<el-icon><House /></el-icon>
<span style="margin-left: 4px">房间号</span>
</template>
</el-table-column>
<el-table-column prop="classNo" label="班号" show-overflow-tooltip align="center">
<template #header>
<el-icon><Grid /></el-icon>
<span style="margin-left: 4px">班号</span>
</template>
</el-table-column>
<el-table-column prop="teacherRealName" label="班主任" show-overflow-tooltip align="center">
<template #header>
<el-icon><UserFilled /></el-icon>
<span style="margin-left: 4px">班主任</span>
</template>
</el-table-column>
<el-table-column prop="teacherPhone" label="班主任电话" show-overflow-tooltip align="center">
<template #header>
<el-icon><Phone /></el-icon>
<span style="margin-left: 4px">班主任电话</span>
</template>
</el-table-column>
<el-table-column prop="stuNo" label="学号" show-overflow-tooltip align="center">
<template #header>
<el-icon><CreditCard /></el-icon>
<span style="margin-left: 4px">学号</span>
</template>
</el-table-column>
<el-table-column prop="realName" label="姓名" show-overflow-tooltip align="center">
<template #header>
<el-icon><Avatar /></el-icon>
<span style="margin-left: 4px">姓名</span>
</template>
</el-table-column>
<el-table-column prop="bedNo" label="床位号" show-overflow-tooltip align="center">
<template #header>
<el-icon><House /></el-icon>
<span style="margin-left: 4px">床位号</span>
</template>
<template #default="scope">
<el-tag v-if="scope.row.bedNo" size="small" type="info" effect="plain">
{{ scope.row.bedNo }}
</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="isLeader" label="是否舍长" show-overflow-tooltip align="center">
<template #header>
<el-icon><User /></el-icon>
<span style="margin-left: 4px">是否舍长</span>
</template>
<template #default="scope">
<StatusTag
:value="scope.row.isLeader"
:options="[{ label: '是', value: '1' }, { label: '否', value: '0' }]"
:type-map="{ '1': { type: 'success', effect: 'light' }, '0': { type: 'info', effect: 'light' } }"
/>
</template>
</el-table-column>
<el-table-column prop="phone" label="学生电话" show-overflow-tooltip align="center">
<template #header>
<el-icon><Phone /></el-icon>
<span style="margin-left: 4px">学生电话</span>
</template>
</el-table-column>
<el-table-column prop="tel" label="家长电话" show-overflow-tooltip align="center">
<template #header>
<el-icon><Phone /></el-icon>
<span style="margin-left: 4px">家长电话</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 || OfficeBuilding" /></el-icon>
<span style="margin-left: 4px">{{ col.label }}</span>
</template>
<!-- 床位号列特殊模板 -->
<template v-if="col.prop === 'bedNo'" #default="scope">
<el-tag v-if="scope.row.bedNo" size="small" type="info" effect="plain">
{{ scope.row.bedNo }}
</el-tag>
<span v-else>-</span>
</template>
<!-- 是否舍长列特殊模板 -->
<template v-else-if="col.prop === 'isLeader'" #default="scope">
<StatusTag
:value="scope.row.isLeader"
:options="[{ label: '是', value: '1' }, { label: '否', value: '0' }]"
:type-map="{ '1': { type: 'success', effect: 'light' }, '0': { type: 'info', effect: 'light' } }"
/>
</template>
</el-table-column>
</template>
<el-table-column label="操作" width="150" align="center" fixed="right">
<template #header>
<el-icon><Setting /></el-icon>
@@ -283,22 +251,26 @@
</template>
<script setup lang="ts" name="DormRoomStudent">
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, delObjs } from "/@/api/stuwork/dormroomstudent";
import { getDeptList } from "/@/api/basic/basicclass";
import { getBuildingList } from "/@/api/stuwork/dormbuilding";
import { fetchDormRoomTreeList } from "/@/api/stuwork/dormroom";
import { useMessage, useMessageBox } from "/@/hooks/message";
import TableColumnControl from '/@/components/TableColumnControl/index.vue'
import FormDialog from './form.vue';
import TransferDialog from './transfer.vue';
import TreeSelect from '/@/components/TreeSelect/index.vue';
import { List, OfficeBuilding, House, Grid, UserFilled, Phone, CreditCard, Avatar, User, Setting } from '@element-plus/icons-vue'
import { List, OfficeBuilding, House, Grid, UserFilled, Phone, CreditCard, Avatar, User, Setting, Menu } from '@element-plus/icons-vue'
import { defineAsyncComponent } from 'vue'
const StatusTag = defineAsyncComponent(() => import('/@/components/StatusTag/index.vue'))
// 定义变量内容
const route = useRoute()
const formDialogRef = ref()
const columnControlRef = ref<any>()
const transferDialogRef = ref()
const searchFormRef = ref()
const showSearch = ref(true)
@@ -306,6 +278,140 @@ const deptList = ref<any[]>([])
const buildingList = ref<any[]>([])
const dormRoomTreeList = ref<any[]>([])
// 表格列配置
const tableColumns = [
{ prop: 'deptName', label: '学院' },
{ prop: 'roomNo', label: '房间号' },
{ prop: 'classNo', label: '班号' },
{ prop: 'teacherRealName', label: '班主任' },
{ prop: 'teacherPhone', label: '班主任电话' },
{ prop: 'stuNo', label: '学号' },
{ prop: 'realName', label: '姓名' },
{ prop: 'bedNo', label: '床位号' },
{ prop: 'isLeader', label: '是否舍长' },
{ prop: 'phone', label: '学生电话' },
{ prop: 'tel', label: '家长电话' }
]
// 列配置映射(用于图标)
const columnConfigMap: Record<string, { icon: any }> = {
deptName: { icon: OfficeBuilding },
roomNo: { icon: House },
classNo: { icon: Grid },
teacherRealName: { icon: UserFilled },
teacherPhone: { icon: Phone },
stuNo: { icon: CreditCard },
realName: { icon: Avatar },
bedNo: { icon: House },
isLeader: { icon: User },
phone: { icon: Phone },
tel: { icon: Phone }
}
// 当前显示的列
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 treeProps = {
value: 'id', // 值字段
@@ -432,7 +538,6 @@ const getDeptListData = async () => {
deptList.value = Array.isArray(res.data) ? res.data : []
}
} catch (err) {
console.error('获取学院列表失败', err)
deptList.value = []
}
}
@@ -445,7 +550,6 @@ const getBuildingListData = async () => {
buildingList.value = Array.isArray(res.data) ? res.data : []
}
} catch (err) {
console.error('获取楼号列表失败', err)
buildingList.value = []
}
}
@@ -470,7 +574,6 @@ const getDormRoomTreeListData = async (dormdataType?: string) => {
}
}
} catch (err) {
console.error('获取宿舍树状列表失败', err)
dormRoomTreeList.value = []
}
}
@@ -480,6 +583,11 @@ onMounted(() => {
getDeptListData()
getBuildingListData()
getDormRoomTreeListData()
nextTick(() => {
if (visibleColumns.value.length === 0) {
loadSavedConfig()
}
})
})
</script>