add fiel

src/views/stuwork/workstudyattendance/index.vue

@@ -58,9 +58,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>
@@ -77,85 +94,37 @@
             <el-icon><List /></el-icon>
           </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="classCode" 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="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="classProName" label="班级规范名称" show-overflow-tooltip align="center" min-width="200">
-          <template #header>
-            <el-icon><Document /></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="attendanceType" 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">
-              {{ formatAttendanceType(scope.row.attendanceType) }}
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column 
-          v-if="showRemarks" 
-          prop="remarks" 
-          label="落实情况" 
-          show-overflow-tooltip 
-          align="center" 
-          min-width="150">
-          <template #header>
-            <el-icon><Document /></el-icon>
-            <span style="margin-left: 4px">落实情况</span>
-          </template>
-          <template #default="scope">
-            <span>{{ scope.row.remarks || '-' }}</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 === 'attendanceType'" #default="scope">
+              <el-tag size="small" type="warning" effect="plain">
+                {{ formatAttendanceType(scope.row.attendanceType) }}
+              </el-tag>
+            </template>
+            <!-- 落实情况列特殊模板 -->
+            <template v-else-if="col.prop === 'remarks'" #default="scope">
+              <span>{{ scope.row.remarks || '-' }}</span>
+            </template>
+          </el-table-column>
+        </template>
         <el-table-column label="操作" width="150" align="center" fixed="right">
           <template #header>
             <el-icon><Setting /></el-icon>
@@ -183,21 +152,157 @@
 </template>
 
 <script setup lang="ts" name="WorkStudyAttendance">
-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, queryHistoryList } from "/@/api/stuwork/workstudyattendance";
 import { getDeptList } from "/@/api/basic/basicclass";
 import { getClassListByRole } from "/@/api/basic/basicclass";
 import { useMessage } from "/@/hooks/message";
-import { List, Calendar, Clock, OfficeBuilding, Grid, Document, CreditCard, Avatar, Collection, Setting } from '@element-plus/icons-vue'
+import TableColumnControl from '/@/components/TableColumnControl/index.vue'
+import { List, Calendar, Clock, OfficeBuilding, Grid, Document, CreditCard, Avatar, Collection, Setting, Menu } from '@element-plus/icons-vue'
 
 // 定义变量内容
+const route = useRoute()
 const searchFormRef = ref()
+const columnControlRef = ref<any>()
 const showSearch = ref(true)
 const deptList = ref<any[]>([])
 const classList = ref<any[]>([])
 const showRemarks = ref(false) // 控制落实情况列的显示
 
+// 表格列配置
+const tableColumns = [
+  { prop: 'schoolYear', label: '学年' },
+  { prop: 'schoolTerm', label: '学期' },
+  { prop: 'deptName', label: '系部名称' },
+  { prop: 'classCode', label: '班级代码' },
+  { prop: 'classNo', label: '班级简称' },
+  { prop: 'classProName', label: '班级规范名称', minWidth: 200 },
+  { prop: 'stuNo', label: '学号' },
+  { prop: 'realName', label: '姓名' },
+  { prop: 'attendanceType', label: '考勤类型' },
+  { prop: 'remarks', label: '落实情况', minWidth: 150 }
+]
+
+// 列配置映射（用于图标）
+const columnConfigMap: Record<string, { icon: any }> = {
+  schoolYear: { icon: Calendar },
+  schoolTerm: { icon: Clock },
+  deptName: { icon: OfficeBuilding },
+  classCode: { icon: Grid },
+  classNo: { icon: Grid },
+  classProName: { icon: Document },
+  stuNo: { icon: CreditCard },
+  realName: { icon: Avatar },
+  attendanceType: { icon: Collection },
+  remarks: { 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))
+}
+
 // 搜索表单
 const searchForm = reactive({
   deptCode: '',
@@ -308,7 +413,6 @@ const handleReset = () => {
 // 查看详情
 const handleView = (row: any) => {
   useMessage().warning('查看详情功能待实现')
-  console.log('查看详情', row)
 }
 
 // 获取学院列表
@@ -319,7 +423,6 @@ const getDeptListData = async () => {
       deptList.value = Array.isArray(res.data) ? res.data : []
     }
   } catch (err) {
-    console.error('获取学院列表失败', err)
     deptList.value = []
   }
 }
@@ -337,7 +440,6 @@ const getClassListData = async () => {
       classList.value = list
     }
   } catch (err) {
-    console.error('获取班级列表失败', err)
     classList.value = []
   }
 }
@@ -346,6 +448,11 @@ const getClassListData = async () => {
 onMounted(() => {
   getDeptListData()
   getClassListData()
+  nextTick(() => {
+    if (visibleColumns.value.length === 0) {
+      loadSavedConfig()
+    }
+  })
 })
 </script>