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

@@ -120,6 +120,23 @@
class="ml10 mr20"
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>
@@ -136,150 +153,68 @@
<el-icon><List /></el-icon>
</template>
</el-table-column>
<el-table-column prop="schoolYear" label="学年" show-overflow-tooltip align="center">
<el-table-column
v-for="col in visibleColumnsSorted"
:key="col.prop"
:prop="col.prop"
:label="col.label"
:width="col.width"
:min-width="col.minWidth"
:show-overflow-tooltip="col.showOverflowTooltip !== false"
:align="col.align || 'center'">
<template #header>
<el-icon><Calendar /></el-icon>
<span style="margin-left: 4px">学年</span>
<el-icon v-if="col.icon"><component :is="col.icon" /></el-icon>
<span :style="{ marginLeft: col.icon ? '4px' : '0' }">{{ col.label }}</span>
</template>
</el-table-column>
<el-table-column prop="schoolTerm" label="学期" show-overflow-tooltip align="center">
<template #header>
<el-icon><Clock /></el-icon>
<span style="margin-left: 4px">学期</span>
</template>
<template #default="scope">
<template #default="scope" v-if="col.prop === 'schoolTerm'">
<el-tag size="small" type="primary" effect="plain">
{{ formatSchoolTerm(scope.row.schoolTerm) }}
</el-tag>
</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="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="num" label="人数" show-overflow-tooltip align="center">
<template #header>
<el-icon><UserFilled /></el-icon>
<span style="margin-left: 4px">人数</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'num'">
<el-tag v-if="scope.row.num" size="small" type="success" effect="plain">
{{ scope.row.num }}
</el-tag>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column prop="startTime" label="请假开始时间" show-overflow-tooltip align="center" width="180">
<template #header>
<el-icon><Calendar /></el-icon>
<span style="margin-left: 4px">请假开始时间</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'startTime'">
<span>{{ scope.row.startTime ? formatDateTime(scope.row.startTime) : '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="endTime" label="请假结束时间" show-overflow-tooltip align="center" width="180">
<template #header>
<el-icon><Calendar /></el-icon>
<span style="margin-left: 4px">请假结束时间</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'endTime'">
<span>{{ scope.row.endTime ? formatDateTime(scope.row.endTime) : '-' }}</span>
</template>
</el-table-column>
<el-table-column prop="leaveType" label="请假类型" show-overflow-tooltip align="center">
<template #header>
<el-icon><Collection /></el-icon>
<span style="margin-left: 4px">请假类型</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'leaveType'">
<el-tag size="small" type="info" effect="plain">
{{ formatLeaveType(scope.row.leaveType) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="reason" label="请假事由" show-overflow-tooltip align="center" min-width="150">
<template #header>
<el-icon><Document /></el-icon>
<span style="margin-left: 4px">请假事由</span>
</template>
</el-table-column>
<el-table-column prop="stayDorm" label="是否住宿" show-overflow-tooltip align="center">
<template #header>
<el-icon><House /></el-icon>
<span style="margin-left: 4px">是否住宿</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'stayDorm'">
<StatusTag
:value="scope.row.stayDorm"
: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="isSegment" label="时段请假" show-overflow-tooltip align="center">
<template #header>
<el-icon><Clock /></el-icon>
<span style="margin-left: 4px">时段请假</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'isSegment'">
<StatusTag
:value="scope.row.isSegment"
: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="segmentString" label="请假时段" show-overflow-tooltip align="center" min-width="150">
<template #header>
<el-icon><Clock /></el-icon>
<span style="margin-left: 4px">请假时段</span>
</template>
</el-table-column>
<el-table-column prop="schoolDoor" label="请假校门" show-overflow-tooltip align="center">
<template #header>
<el-icon><Location /></el-icon>
<span style="margin-left: 4px">请假校门</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'schoolDoor'">
<el-tag size="small" type="warning" effect="plain">
{{ formatSchoolDoor(scope.row.schoolDoor) }}
</el-tag>
</template>
</el-table-column>
<el-table-column prop="deptAudit" label="基础部审核" show-overflow-tooltip align="center">
<template #header>
<el-icon><CircleCheck /></el-icon>
<span style="margin-left: 4px">基础部审核</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'deptAudit'">
<StatusTag
:value="scope.row.deptAudit"
:options="[{ label: '待审核', value: '0' }, { label: '通过', value: '1' }, { label: '驳回', value: '2' }]"
:type-map="{ '0': { type: 'warning', effect: 'light' }, '1': { type: 'success', effect: 'light' }, '2': { type: 'danger', effect: 'light' } }"
/>
</template>
</el-table-column>
<el-table-column prop="schoolAudit" label="学工处审批" show-overflow-tooltip align="center">
<template #header>
<el-icon><CircleCheck /></el-icon>
<span style="margin-left: 4px">学工处审批</span>
</template>
<template #default="scope">
<template #default="scope" v-else-if="col.prop === 'schoolAudit'">
<StatusTag
:value="scope.row.schoolAudit"
:options="[{ label: '待审核', value: '0' }, { label: '通过', value: '1' }, { label: '驳回', value: '2' }]"
@@ -287,12 +222,6 @@
/>
</template>
</el-table-column>
<el-table-column prop="rejectReason" label="驳回原因" show-overflow-tooltip align="center" min-width="150">
<template #header>
<el-icon><Warning /></el-icon>
<span style="margin-left: 4px">驳回原因</span>
</template>
</el-table-column>
<el-table-column label="操作" width="150" align="center" fixed="right">
<template #header>
<el-icon><Setting /></el-icon>
@@ -333,7 +262,8 @@
</template>
<script setup lang="ts" name="ClassLeaveApply">
import { reactive, ref, onMounted } from 'vue'
import { reactive, ref, onMounted, computed } from 'vue'
import { useRoute } from 'vue-router'
import { BasicTableProps, useTable } from "/@/hooks/table";
import { fetchList, delObj, deleteByClass } from "/@/api/stuwork/classleaveapply";
import { queryAllSchoolYear } from "/@/api/basic/basicyear";
@@ -341,14 +271,17 @@ import { getDicts } from "/@/api/admin/dict";
import { getDeptListByLevelTwo } from "/@/api/basic/basicdept";
import { getClassListByRole } from "/@/api/basic/basicclass";
import { useMessage, useMessageBox } from "/@/hooks/message";
import TableColumnControl from '/@/components/TableColumnControl/index.vue'
import FormDialog from './form.vue'
import DetailDialog from './detail.vue'
import { List, Calendar, Clock, OfficeBuilding, Grid, UserFilled, Collection, Document, House, Location, CircleCheck, Warning, Setting } from '@element-plus/icons-vue'
import { List, Calendar, Clock, OfficeBuilding, Grid, UserFilled, Collection, Document, House, Location, CircleCheck, Warning, Setting, Menu } from '@element-plus/icons-vue'
import { defineAsyncComponent } from 'vue'
const StatusTag = defineAsyncComponent(() => import('/@/components/StatusTag/index.vue'))
// 定义变量内容
const route = useRoute()
const searchFormRef = ref()
const columnControlRef = ref()
const showSearch = ref(true)
const schoolYearList = ref<any[]>([])
const schoolTermList = ref<any[]>([])
@@ -361,6 +294,121 @@ const schoolDoorList = ref<any[]>([])
const formDialogRef = ref()
const detailDialogRef = ref()
// 表格列配置
const tableColumns = [
{ prop: 'schoolYear', label: '学年', icon: Calendar },
{ prop: 'schoolTerm', label: '学期', icon: Clock },
{ prop: 'deptName', label: '学院', icon: OfficeBuilding },
{ prop: 'classNo', label: '班号', icon: Grid },
{ prop: 'teacherRealName', label: '班主任', icon: UserFilled },
{ prop: 'num', label: '人数', icon: UserFilled },
{ prop: 'startTime', label: '请假开始时间', icon: Calendar, width: 180 },
{ prop: 'endTime', label: '请假结束时间', icon: Calendar, width: 180 },
{ prop: 'leaveType', label: '请假类型', icon: Collection },
{ prop: 'reason', label: '请假事由', icon: Document, minWidth: 150 },
{ prop: 'stayDorm', label: '是否住宿', icon: House },
{ prop: 'isSegment', label: '时段请假', icon: Clock },
{ prop: 'segmentString', label: '请假时段', icon: Clock, minWidth: 150 },
{ prop: 'schoolDoor', label: '请假校门', icon: Location },
{ prop: 'deptAudit', label: '基础部审核', icon: CircleCheck },
{ prop: 'schoolAudit', label: '学工处审批', icon: CircleCheck },
{ prop: 'rejectReason', label: '驳回原因', icon: Warning, minWidth: 150 }
]
// 当前显示的列
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)
}
}
// 列变化处理
const handleColumnChange = (value: string[]) => {
visibleColumns.value = value
const routePath = route.path.replace(/^\//, '').replace(/\//g, '-')
const storageKey = `table-columns-${routePath}`
const selectableColumns = value.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}`
localStorage.setItem(`${storageKey}-order`, JSON.stringify(order))
}
// 排序后的表格列
const visibleColumnsSorted = computed(() => {
const columns = tableColumns.filter(col => {
const key = col.prop || col.label
return visibleColumns.value.includes(key)
})
if (columnOrder.value.length > 0) {
const orderedColumns: any[] = []
const unorderedColumns: any[] = []
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 schoolDoorListData = [
{ label: '校门东', value: '0' },
@@ -506,7 +554,6 @@ const getSchoolYearListData = async () => {
schoolYearList.value = Array.isArray(res.data) ? res.data : []
}
} catch (err) {
console.error('获取学年列表失败', err)
schoolYearList.value = []
}
}
@@ -522,7 +569,6 @@ const getSchoolTermDict = async () => {
})) : []
}
} catch (err) {
console.error('获取学期字典失败', err)
schoolTermList.value = []
}
}
@@ -535,7 +581,6 @@ const getDeptListData = async () => {
deptList.value = Array.isArray(res.data) ? res.data : []
}
} catch (err) {
console.error('获取系部列表失败', err)
deptList.value = []
}
}
@@ -548,7 +593,6 @@ const getClassListData = async () => {
classList.value = Array.isArray(res.data) ? res.data : []
}
} catch (err) {
console.error('获取班级列表失败', err)
classList.value = []
}
}
@@ -564,7 +608,6 @@ const getLeaveTypeDict = async () => {
})) : []
}
} catch (err) {
console.error('获取请假类型字典失败', err)
leaveTypeList.value = []
}
}
@@ -580,7 +623,6 @@ const getYesNoDict = async () => {
})) : []
}
} catch (err) {
console.error('获取是否字典失败', err)
yesNoList.value = []
}
}
@@ -596,12 +638,12 @@ const getAuditTypeDict = async () => {
})) : []
}
} catch (err) {
console.error('获取审核类型字典失败', err)
auditTypeList.value = []
}
}
// 初始化
loadSavedConfig()
onMounted(() => {
schoolDoorList.value = schoolDoorListData
getSchoolYearListData()