add fiel

src/views/stuwork/pendingwork/index.vue

@@ -47,9 +47,26 @@
         <div class="mb8" style="width: 100%">
           <right-toolbar  
             v-model:showSearch="showSearch" 
-            class="ml10 mr20"
+            class="ml10"
             style="float: right;"
-            @queryTable="getDataList"> 
+            @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>
@@ -66,52 +83,34 @@
             <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="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="pendingWork" label="待办事项" show-overflow-tooltip align="center">
-          <template #header>
-            <el-icon><Document /></el-icon>
-            <span style="margin-left: 4px">待办事项</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="nums" label="数量" show-overflow-tooltip align="center">
-          <template #header>
-            <el-icon><DataAnalysis /></el-icon>
-            <span style="margin-left: 4px">数量</span>
-          </template>
-          <template #default="scope">
-            <el-tag type="warning" v-if="scope.row.nums > 0">{{ scope.row.nums }}</el-tag>
-            <span v-else>{{ scope.row.nums || 0 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" 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">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="updateTime" label="更新时间" show-overflow-tooltip align="center" width="180">
-          <template #header>
-            <el-icon><Clock /></el-icon>
-            <span style="margin-left: 4px">更新时间</span>
-          </template>
-          <template #default="scope">
-            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</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 === 'nums'" #default="scope">
+              <el-tag type="warning" v-if="scope.row.nums > 0">{{ scope.row.nums }}</el-tag>
+              <span v-else>{{ scope.row.nums || 0 }}</span>
+            </template>
+            <!-- 创建时间列特殊模板 -->
+            <template v-else-if="col.prop === 'createTime'" #default="scope">
+              <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+            <!-- 更新时间列特殊模板 -->
+            <template v-else-if="col.prop === 'updateTime'" #default="scope">
+              <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+            </template>
+          </el-table-column>
+        </template>
         <el-table-column label="操作" width="150" align="center" fixed="right">
           <template #header>
             <el-icon><Setting /></el-icon>
@@ -139,21 +138,149 @@
 </template>
 
 <script setup lang="ts" name="PendingWork">
-import { reactive, ref, onMounted, computed } from 'vue'
+import { reactive, ref, onMounted, computed, nextTick } from 'vue'
+import { useRoute } from 'vue-router'
 import { BasicTableProps, useTable } from "/@/hooks/table";
 import { fetchList } from "/@/api/stuwork/pendingwork";
 import { getDeptList } from "/@/api/basic/basicclass";
 import { getClassListByRole } from "/@/api/basic/basicclass";
 import { useMessage } from "/@/hooks/message";
 import { parseTime } from "/@/utils/formatTime";
-import { List, OfficeBuilding, Grid, Document, DataAnalysis, Calendar, Clock, Setting } from '@element-plus/icons-vue'
+import TableColumnControl from '/@/components/TableColumnControl/index.vue'
+import { List, OfficeBuilding, Grid, Document, DataAnalysis, Calendar, Clock, 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 tableColumns = [
+  { prop: 'deptName', label: '学院' },
+  { prop: 'classNo', label: '班级' },
+  { prop: 'pendingWork', label: '待办事项' },
+  { prop: 'nums', label: '数量' },
+  { prop: 'createTime', label: '创建时间', width: 180 },
+  { prop: 'updateTime', label: '更新时间', width: 180 }
+]
+
+// 列配置映射（用于图标）
+const columnConfigMap: Record<string, { icon: any }> = {
+  deptName: { icon: OfficeBuilding },
+  classNo: { icon: Grid },
+  pendingWork: { icon: Document },
+  nums: { icon: DataAnalysis },
+  createTime: { icon: Calendar },
+  updateTime: { icon: Clock }
+}
+
+// 当前显示的列
+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: '',
@@ -200,7 +327,6 @@ const handleDeptChange = () => {
 // 查看详情
 const handleView = (row: any) => {
   useMessage().warning('查看详情功能待实现')
-  console.log('查看详情', row)
 }
 
 // 获取学院列表
@@ -211,7 +337,6 @@ const getDeptListData = async () => {
       deptList.value = Array.isArray(res.data) ? res.data : []
     }
   } catch (err) {
-    console.error('获取学院列表失败', err)
     deptList.value = []
   }
 }
@@ -226,7 +351,6 @@ const getClassListData = async () => {
       classList.value = []
     }
   } catch (err) {
-    console.error('获取班级列表失败', err)
     classList.value = []
   }
 }
@@ -243,6 +367,11 @@ const filteredClassList = computed(() => {
 onMounted(() => {
   getDeptListData()
   getClassListData()
+  nextTick(() => {
+    if (visibleColumns.value.length === 0) {
+      loadSavedConfig()
+    }
+  })
 })
 </script>