|
|
|
|
@@ -111,9 +111,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>
|
|
|
|
|
@@ -130,87 +147,50 @@
|
|
|
|
|
<el-icon><List /></el-icon>
|
|
|
|
|
</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="schoolYear" label="学年" show-overflow-tooltip align="center">
|
|
|
|
|
<template #header>
|
|
|
|
|
<el-icon><Calendar /></el-icon>
|
|
|
|
|
<span style="margin-left: 4px">学年</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">
|
|
|
|
|
<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="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="conductType" label="类型" show-overflow-tooltip align="center">
|
|
|
|
|
<template #header>
|
|
|
|
|
<el-icon><Collection /></el-icon>
|
|
|
|
|
<span style="margin-left: 4px">类型</span>
|
|
|
|
|
</template>
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<el-tag size="small" type="warning" effect="plain">
|
|
|
|
|
{{ formatType(scope.row.conductType) }}
|
|
|
|
|
</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="recordDate" label="考核时间" show-overflow-tooltip align="center" width="120">
|
|
|
|
|
<template #header>
|
|
|
|
|
<el-icon><Calendar /></el-icon>
|
|
|
|
|
<span style="margin-left: 4px">考核时间</span>
|
|
|
|
|
</template>
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<span>{{ scope.row.recordDate || '-' }}</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column prop="description" 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="attachment" label="附件" show-overflow-tooltip align="center" width="100">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
v-if="scope.row.attachment"
|
|
|
|
|
icon="Document"
|
|
|
|
|
text
|
|
|
|
|
type="primary"
|
|
|
|
|
size="small"
|
|
|
|
|
@click="handleViewAttachment(scope.row)">
|
|
|
|
|
查看
|
|
|
|
|
</el-button>
|
|
|
|
|
<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 === 'schoolTerm'" #default="scope">
|
|
|
|
|
<el-tag size="small" type="primary" effect="plain">
|
|
|
|
|
{{ formatSchoolTerm(scope.row.schoolTerm) }}
|
|
|
|
|
</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
<!-- 类型列特殊模板 -->
|
|
|
|
|
<template v-else-if="col.prop === 'conductType'" #default="scope">
|
|
|
|
|
<el-tag size="small" type="warning" effect="plain">
|
|
|
|
|
{{ formatType(scope.row.conductType) }}
|
|
|
|
|
</el-tag>
|
|
|
|
|
</template>
|
|
|
|
|
<!-- 考核时间列特殊模板 -->
|
|
|
|
|
<template v-else-if="col.prop === 'recordDate'" #default="scope">
|
|
|
|
|
<span>{{ scope.row.recordDate || '-' }}</span>
|
|
|
|
|
</template>
|
|
|
|
|
<!-- 附件列特殊模板 -->
|
|
|
|
|
<template v-else-if="col.prop === 'attachment'" #default="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
v-if="scope.row.attachment"
|
|
|
|
|
icon="Document"
|
|
|
|
|
text
|
|
|
|
|
type="primary"
|
|
|
|
|
size="small"
|
|
|
|
|
@click="handleViewAttachment(scope.row)">
|
|
|
|
|
查看
|
|
|
|
|
</el-button>
|
|
|
|
|
<span v-else>-</span>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</template>
|
|
|
|
|
<el-table-column label="操作" width="150" align="center" fixed="right">
|
|
|
|
|
<template #header>
|
|
|
|
|
<el-icon><Setting /></el-icon>
|
|
|
|
|
@@ -280,7 +260,8 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script setup lang="ts" name="StuConduct">
|
|
|
|
|
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, delObj, importExcel } from "/@/api/stuwork/stuconduct";
|
|
|
|
|
import { getDeptList } from "/@/api/basic/basicclass";
|
|
|
|
|
@@ -288,11 +269,14 @@ import { queryAllSchoolYear } from "/@/api/basic/basicyear";
|
|
|
|
|
import { getClassListByRole } from "/@/api/basic/basicclass";
|
|
|
|
|
import { getDicts } from "/@/api/admin/dict";
|
|
|
|
|
import { useMessage, useMessageBox } from "/@/hooks/message";
|
|
|
|
|
import { UploadFilled, List, CreditCard, Calendar, Clock, OfficeBuilding, Grid, Avatar, Collection, Document, Setting } from '@element-plus/icons-vue'
|
|
|
|
|
import TableColumnControl from '/@/components/TableColumnControl/index.vue'
|
|
|
|
|
import { UploadFilled, List, CreditCard, Calendar, Clock, OfficeBuilding, Grid, Avatar, Collection, Document, Setting, Menu } from '@element-plus/icons-vue'
|
|
|
|
|
import FormDialog from './form.vue'
|
|
|
|
|
|
|
|
|
|
// 定义变量内容
|
|
|
|
|
const route = useRoute()
|
|
|
|
|
const formDialogRef = ref()
|
|
|
|
|
const columnControlRef = ref<any>()
|
|
|
|
|
const uploadRef = ref()
|
|
|
|
|
const searchFormRef = ref()
|
|
|
|
|
const showSearch = ref(true)
|
|
|
|
|
@@ -305,6 +289,138 @@ const importDialogVisible = ref(false)
|
|
|
|
|
const importFile = ref<File | null>(null)
|
|
|
|
|
const importLoading = ref(false)
|
|
|
|
|
|
|
|
|
|
// 表格列配置
|
|
|
|
|
const tableColumns = [
|
|
|
|
|
{ prop: 'stuNo', label: '学号' },
|
|
|
|
|
{ prop: 'schoolYear', label: '学年' },
|
|
|
|
|
{ prop: 'schoolTerm', label: '学期' },
|
|
|
|
|
{ prop: 'deptName', label: '学院' },
|
|
|
|
|
{ prop: 'classNo', label: '班级' },
|
|
|
|
|
{ prop: 'realName', label: '姓名' },
|
|
|
|
|
{ prop: 'conductType', label: '类型' },
|
|
|
|
|
{ prop: 'recordDate', label: '考核时间', width: 120 },
|
|
|
|
|
{ prop: 'description', label: '情况记录', minWidth: 150 },
|
|
|
|
|
{ prop: 'attachment', label: '附件', width: 100 }
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
// 列配置映射(用于图标)
|
|
|
|
|
const columnConfigMap: Record<string, { icon: any }> = {
|
|
|
|
|
stuNo: { icon: CreditCard },
|
|
|
|
|
schoolYear: { icon: Calendar },
|
|
|
|
|
schoolTerm: { icon: Clock },
|
|
|
|
|
deptName: { icon: OfficeBuilding },
|
|
|
|
|
classNo: { icon: Grid },
|
|
|
|
|
realName: { icon: Avatar },
|
|
|
|
|
conductType: { icon: Collection },
|
|
|
|
|
recordDate: { icon: Calendar },
|
|
|
|
|
description: { icon: Document },
|
|
|
|
|
attachment: { icon: Document }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 当前显示的列
|
|
|
|
|
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))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 配置 useTable
|
|
|
|
|
const state: BasicTableProps = reactive<BasicTableProps>({
|
|
|
|
|
queryForm: {
|
|
|
|
|
@@ -440,7 +556,6 @@ const getSchoolYearList = async () => {
|
|
|
|
|
schoolYearList.value = []
|
|
|
|
|
}
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('获取学年列表失败', err)
|
|
|
|
|
schoolYearList.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -458,7 +573,6 @@ const getSchoolTermDict = async () => {
|
|
|
|
|
schoolTermList.value = []
|
|
|
|
|
}
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('获取学期字典失败', err)
|
|
|
|
|
schoolTermList.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -473,7 +587,6 @@ const getDeptListData = async () => {
|
|
|
|
|
deptList.value = []
|
|
|
|
|
}
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('获取学院列表失败', err)
|
|
|
|
|
deptList.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -488,7 +601,6 @@ const getClassListData = async () => {
|
|
|
|
|
classList.value = []
|
|
|
|
|
}
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('获取班级列表失败', err)
|
|
|
|
|
classList.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -506,7 +618,6 @@ const getTypeDict = async () => {
|
|
|
|
|
typeList.value = []
|
|
|
|
|
}
|
|
|
|
|
} catch (err) {
|
|
|
|
|
console.error('获取类型字典失败', err)
|
|
|
|
|
typeList.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@@ -518,6 +629,11 @@ onMounted(() => {
|
|
|
|
|
getDeptListData()
|
|
|
|
|
getClassListData()
|
|
|
|
|
getTypeDict()
|
|
|
|
|
nextTick(() => {
|
|
|
|
|
if (visibleColumns.value.length === 0) {
|
|
|
|
|
loadSavedConfig()
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
})
|
|
|
|
|
</script>
|
|
|
|
|
|
|
|
|
|
|