add fiel

src/views/stuwork/classactivity/form.vue

@@ -271,7 +271,6 @@ const getClassListData = async () => {
       classList.value = res.data
     }
   } catch (err) {
-    console.error('获取班级列表失败', err)
   }
 }
 
@@ -288,7 +287,6 @@ const getSchoolYearList = async () => {
       currentSchoolYear.value = CURRENT_SCHOOL_YEAR
     }
   } catch (err) {
-    console.error('获取学年列表失败', err)
     currentSchoolYear.value = CURRENT_SCHOOL_YEAR
   }
 }
@@ -309,7 +307,6 @@ const getSchoolTermDict = async () => {
       currentSchoolTerm.value = CURRENT_SCHOOL_TERM
     }
   } catch (err) {
-    console.error('获取学期字典失败', err)
     currentSchoolTerm.value = CURRENT_SCHOOL_TERM
   }
 }

src/views/stuwork/classactivity/index.vue

@@ -70,6 +70,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>
@@ -86,70 +103,35 @@
             <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'"
+          :fixed="col.fixed">
           <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="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="themeName" label="活动主题" show-overflow-tooltip align="center" min-width="150">
-          <template #header>
-            <el-icon><Trophy /></el-icon>
-            <span style="margin-left: 4px">活动主题</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="author" label="主持人" show-overflow-tooltip align="center">
-          <template #header>
-            <el-icon><User /></el-icon>
-            <span style="margin-left: 4px">主持人</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="activityTime" 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">
+          <template #default="scope" v-else-if="col.prop === 'activityTime'">
             <span>{{ scope.row.activityTime || scope.row.recordDate || '-' }}</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="address" label="活动地点" show-overflow-tooltip align="center" min-width="150">
-          <template #header>
-            <el-icon><Location /></el-icon>
-            <span style="margin-left: 4px">活动地点</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="attendNum" 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 === 'attendNum'">
             <el-tag v-if="scope.row.attendNum" size="small" type="success" effect="plain">
               {{ scope.row.attendNum }}
             </el-tag>
             <span v-else>-</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="attachment" label="活动图片" show-overflow-tooltip align="center" width="100">
-          <template #default="scope">
+          <template #default="scope" v-else-if="col.prop === 'attachment'">
             <el-button 
               v-if="scope.row.attachment"
               icon="Picture"
@@ -161,9 +143,7 @@
             </el-button>
             <span v-else>-</span>
           </template>
-        </el-table-column>
-        <el-table-column prop="attachment2" label="活动图片2" show-overflow-tooltip align="center" width="100">
-          <template #default="scope">
+          <template #default="scope" v-else-if="col.prop === 'attachment2'">
             <el-button 
               v-if="scope.row.attachment2"
               icon="Picture"
@@ -213,24 +193,141 @@
 </template>
 
 <script setup lang="ts" name="ClassActivity">
-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 } from "/@/api/stuwork/classactivity";
 import { getClassListByRole } from "/@/api/basic/basicclass";
 import { queryAllSchoolYear } from "/@/api/basic/basicyear";
 import { getDicts } from "/@/api/admin/dict";
 import { useMessage, useMessageBox } from "/@/hooks/message";
+import TableColumnControl from '/@/components/TableColumnControl/index.vue'
 import FormDialog from './form.vue'
-import { List, Calendar, Clock, Grid, Trophy, User, Location, UserFilled, Setting } from '@element-plus/icons-vue'
+import { List, Calendar, Clock, Grid, Trophy, User, Location, UserFilled, Setting, Menu } from '@element-plus/icons-vue'
 
 // 定义变量内容
+const route = useRoute()
 const formDialogRef = ref()
 const searchFormRef = ref()
+const columnControlRef = ref()
 const showSearch = ref(true)
 const schoolYearList = ref<any[]>([])
 const schoolTermList = ref<any[]>([])
 const classList = ref<any[]>([])
 
+// 表格列配置
+const tableColumns = [
+  { prop: 'schoolYear', label: '学年', icon: Calendar },
+  { prop: 'schoolTerm', label: '学期', icon: Clock },
+  { prop: 'classNo', label: '班号', icon: Grid },
+  { prop: 'themeName', label: '活动主题', icon: Trophy, minWidth: 150 },
+  { prop: 'author', label: '主持人', icon: User },
+  { prop: 'activityTime', label: '活动时间', icon: Calendar, width: 120 },
+  { prop: 'address', label: '活动地点', icon: Location, minWidth: 150 },
+  { prop: 'attendNum', label: '参加人数', icon: UserFilled },
+  { prop: 'attachment', label: '活动图片', width: 100 },
+  { prop: 'attachment2', label: '活动图片2', width: 100 }
+]
+
+// 当前显示的列
+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 checkColumnVisible = (prop: string) => {
+  return visibleColumns.value.includes(prop)
+}
+
+// 列变化处理
+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 tableStyle = {
   cellStyle: { padding: '8px 0' },
@@ -320,7 +417,6 @@ const getSchoolYearList = async () => {
       schoolYearList.value = []
     }
   } catch (err) {
-    console.error('获取学年列表失败', err)
     schoolYearList.value = []
   }
 }
@@ -338,7 +434,6 @@ const getSchoolTermDict = async () => {
       schoolTermList.value = []
     }
   } catch (err) {
-    console.error('获取学期字典失败', err)
     schoolTermList.value = []
   }
 }
@@ -353,12 +448,12 @@ const getClassListData = async () => {
       classList.value = []
     }
   } catch (err) {
-    console.error('获取班级列表失败', err)
     classList.value = []
   }
 }
 
 // 初始化
+loadSavedConfig()
 onMounted(() => {
   getSchoolYearList()
   getSchoolTermDict()