add fiel

src/views/stuwork/tuitionfreeterm/index.vue

@@ -51,9 +51,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>
@@ -70,58 +87,41 @@
             <el-icon><List /></el-icon>
           </template>
         </el-table-column>
-        <el-table-column prop="title" 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="schoolYear" label="学年" show-overflow-tooltip align="center" width="120">
-          <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" width="100">
-          <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="startTime" 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>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="endTime" 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>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="type" label="类别" show-overflow-tooltip align="center" width="120">
-          <template #header>
-            <el-icon><Collection /></el-icon>
-            <span style="margin-left: 4px">类别</span>
-          </template>
-          <template #default="scope">
-            <el-tag size="small" type="info" effect="plain">
-              {{ formatType(scope.row.type) }}
-            </el-tag>
-          </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 === 'startTime'" #default="scope">
+              <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
+            </template>
+            <!-- 上报截止日期列特殊模板 -->
+            <template v-else-if="col.prop === 'endTime'" #default="scope">
+              <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
+            </template>
+            <!-- 类别列特殊模板 -->
+            <template v-else-if="col.prop === 'type'" #default="scope">
+              <el-tag size="small" type="info" effect="plain">
+                {{ formatType(scope.row.type) }}
+              </el-tag>
+            </template>
+          </el-table-column>
+        </template>
         <el-table-column label="操作" width="150" align="center" fixed="right">
           <template #header>
             <el-icon><Setting /></el-icon>
@@ -159,24 +159,152 @@
 </template>
 
 <script setup lang="ts" name="TuitionFreeTerm">
-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/tuitionfreeterm";
 import { queryAllSchoolYear } from "/@/api/basic/basicyear";
 import { getDicts } from "/@/api/admin/dict";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { parseTime } from "/@/utils/formatTime";
+import TableColumnControl from '/@/components/TableColumnControl/index.vue'
 import FormDialog from './form.vue'
-import { List, Document, Calendar, Clock, Collection, Setting } from '@element-plus/icons-vue'
+import { List, Document, Calendar, Clock, Collection, Setting, Menu } from '@element-plus/icons-vue'
 
 // 定义变量内容
+const route = useRoute()
 const formDialogRef = ref()
+const columnControlRef = ref<any>()
 const searchFormRef = ref()
 const showSearch = ref(true)
 const schoolYearList = ref<any[]>([])
 const schoolTermList = ref<any[]>([])
 const typeList = ref<any[]>([])
 
+// 表格列配置
+const tableColumns = [
+  { prop: 'title', label: '批次名称', minWidth: 200 },
+  { prop: 'schoolYear', label: '学年', width: 120 },
+  { prop: 'schoolTerm', label: '学期', width: 100 },
+  { prop: 'startTime', label: '上报开始日期', width: 120 },
+  { prop: 'endTime', label: '上报截止日期', width: 120 },
+  { prop: 'type', label: '类别', width: 120 }
+]
+
+// 列配置映射（用于图标）
+const columnConfigMap: Record<string, { icon: any }> = {
+  title: { icon: Document },
+  schoolYear: { icon: Calendar },
+  schoolTerm: { icon: Clock },
+  startTime: { icon: Calendar },
+  endTime: { icon: Calendar },
+  type: { icon: Collection }
+}
+
+// 当前显示的列
+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 tableStyle = {
   cellStyle: { padding: '8px 0' },
@@ -261,7 +389,6 @@ const getSchoolYearList = async () => {
       schoolYearList.value = []
     }
   } catch (err) {
-    console.error('获取学年列表失败', err)
     schoolYearList.value = []
   }
 }
@@ -279,7 +406,6 @@ const getSchoolTermDict = async () => {
       schoolTermList.value = []
     }
   } catch (err) {
-    console.error('获取学期字典失败', err)
     schoolTermList.value = []
   }
 }
@@ -297,7 +423,6 @@ const getTypeDict = async () => {
       typeList.value = []
     }
   } catch (err) {
-    console.error('获取类别字典失败', err)
     typeList.value = []
   }
 }
@@ -307,6 +432,11 @@ onMounted(() => {
   getSchoolYearList()
   getSchoolTermDict()
   getTypeDict()
+  nextTick(() => {
+    if (visibleColumns.value.length === 0) {
+      loadSavedConfig()
+    }
+  })
 })
 </script>