😎调整通知公告页面vxe-table

Web/src/views/system/notice/component/editNotice.vue

@@ -8,7 +8,7 @@
 				</div>
 			</template>
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
-				<el-row :gutter="35">
+				<el-row :gutter="10">
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="标题" prop="title" :rules="[{ required: true, message: '标题不能为空', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.title" placeholder="标题" clearable />

Web/src/views/system/notice/index.vue

@@ -1,72 +1,78 @@
 <template>
-	<div class="sys-notice-container">
+	<div class="sys-notice-container" v-loading="options.loading">
-		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+		<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
-			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
+			<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" :label-width="'60px'" style="flex: 1 1 0%">
-				<el-form-item label="标题">
+				<el-row :gutter="10">
-					<el-input v-model="state.queryParams.title" placeholder="标题" clearable />
+					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+						<el-form-item label="标题" prop="title">
+							<el-input v-model="state.queryParams.title" placeholder="标题" clearable @keyup.enter.native="handleQuery(true)" />
 						</el-form-item>
-				<el-form-item label="类型">
+					</el-col>
-					<el-select v-model="state.queryParams.type" placeholder="类型" clearable>
+					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+						<el-form-item label="类型" prop="type">
+							<el-select v-model="state.queryParams.type" placeholder="类型" clearable @clear="state.queryParams.type = undefined">
 								<el-option label="通知" :value="1" />
 								<el-option label="公告" :value="2" />
 							</el-select>
 						</el-form-item>
-				<el-form-item>
+					</el-col>
-					<el-button-group>
+				</el-row>
-						<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysNotice:page'"> 查询 </el-button>
-						<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					</el-button-group>
-				</el-form-item>
-				<el-form-item>
-					<el-button type="primary" icon="ele-Plus" @click="openAddNotice" v-auth="'sysNotice:add'"> 新增 </el-button>
-				</el-form-item>
 			</el-form>
+
+			<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />
+
+			<el-row>
+				<el-col>
+					<el-button-group>
+						<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" v-auth="'sysNotice:page'" :loading="options.loading"> 查询 </el-button>
+						<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
+					</el-button-group>
+				</el-col>
+			</el-row>
 		</el-card>
 
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<el-table :data="state.noticeData" v-loading="state.loading" border>
+			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @sort-change="sortChange">
-				<el-table-column type="index" label="序号" width="55" align="center" />
+				<template #toolbar_buttons>
-				<el-table-column prop="title" label="标题" header-align="center" show-overflow-tooltip />
+					<el-button type="primary" icon="ele-Plus" @click="handleAdd" v-auth="'sysNotice:add'"> 新增 </el-button>
-				<el-table-column prop="content" label="内容" header-align="center" show-overflow-tooltip>
-					<template #default="scope"> {{ removeHtml(scope.row.content) }} </template>
-				</el-table-column>
-				<el-table-column prop="type" label="类型" width="100" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag v-if="scope.row.type === 1"> 通知 </el-tag>
-						<el-tag type="warning" v-else> 公告 </el-tag>
 				</template>
-				</el-table-column>
+				<template #toolbar_tools> </template>
-				<el-table-column prop="createTime" label="创建时间" align="center" show-overflow-tooltip />
+				<template #empty>
-				<el-table-column prop="status" label="状态" width="100" align="center" show-overflow-tooltip>
+					<el-empty :image-size="200" />
-					<template #default="scope">
-						<el-tag type="info" v-if="scope.row.status === 1"> 已发布 </el-tag>
-						<el-tag type="warning" v-else> 未发布 </el-tag>
 				</template>
-				</el-table-column>
+				<template #row_type="{ row }">
-				<el-table-column prop="publicUserName" label="发布者" align="center" show-overflow-tooltip />
+					<el-tag v-if="row.type === 1" type="success">通知</el-tag>
-				<el-table-column prop="publicTime" label="发布时间" align="center" show-overflow-tooltip />
+					<el-tag v-else type="warning">公告</el-tag>
-				<el-table-column label="操作" width="200" fixed="right" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<el-button icon="ele-Position" size="small" text type="primary" @click="publicNotice(scope.row)" v-auth="'sysNotice:public'" :disabled="scope.row.status === 1"> 发布 </el-button>
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditNotice(scope.row)" v-auth="'sysNotice:update'" :disabled="scope.row.status === 1"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delNotice(scope.row)" v-auth="'sysNotice:delete'" :disabled="scope.row.status === 1"> 删除 </el-button>
 				</template>
-				</el-table-column>
+				<template #row_status="{ row }">
-			</el-table>
+					<el-tag v-if="row.status === 1" type="info">已发布</el-tag>
-			<el-pagination
+					<el-tag v-else type="warning">未发布</el-tag>
-				v-model:currentPage="state.tableParams.page"
+				</template>
+				<template #row_record="{ row }">
+					<ModifyRecord :data="row" />
+				</template>
+				<template #row_buttons="{ row }">
+					<el-tooltip content="编辑" placement="top">
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="handleEdit(row)" v-auth="'sysNotice:update'" :disabled="row.status === 1" />
+					</el-tooltip>
+					<el-tooltip content="删除" placement="top">
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="handleDelete(row)" v-auth="'sysNotice:delete'" :disabled="row.status === 1" />
+					</el-tooltip>
+					<el-button icon="ele-Position" size="small" text type="primary" @click="handlePublic(row)" v-auth="'sysNotice:public'" :disabled="row.status === 1">发布</el-button>
+				</template>
+				<template #pager>
+					<vxe-pager
+						:loading="options.loading"
+						v-model:current-page="state.tableParams.page"
 						v-model:page-size="state.tableParams.pageSize"
 						:total="state.tableParams.total"
-				:page-sizes="[10, 20, 50, 100]"
+						@page-change="pageChange"
-				small
-				background
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				layout="total, sizes, prev, pager, next, jumper"
 					/>
+				</template>
+			</vxe-grid>
 		</el-card>
 
-		<EditNotice ref="editNoticeRef" :title="state.editNoticeTitle" @handleQuery="handleQuery" />
+		<EditNotice ref="editNoticeRef" :title="state.title" @handleQuery="handleQuery" />
 	</div>
 </template>
 
@@ -74,64 +80,115 @@
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import commonFunction from '/@/utils/commonFunction';
+import { auth } from '/@/utils/authFunction';
+import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
+import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
+
 import EditNotice from '/@/views/system/notice/component/editNotice.vue';
+import ModifyRecord from '/@/components/table/modifyRecord.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysNoticeApi } from '/@/api-services/api';
 import { SysNotice } from '/@/api-services/models';
 
+const xGrid = ref<VxeGridInstance>();
 const editNoticeRef = ref<InstanceType<typeof EditNotice>>();
 const { removeHtml } = commonFunction();
 const state = reactive({
-	loading: false,
-	noticeData: [] as Array<SysNotice>,
 	queryParams: {
 		title: undefined,
 		type: undefined,
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 20,
+		pageSize: 50,
+		field: 'id', // 默认的排序字段
+		order: 'aes', // 排序方向
+		descStr: 'desc', // 降序排序的关键字符
 		total: 0 as any,
 	},
-	editNoticeTitle: '',
+	visible: false,
+	title: '',
 });
 
+// 表格参数配置
+const options = useVxeTable<SysNotice>({
+	id: 'sysNotice',
+	name: '通知公告',
+	columns: [
+		// { type: 'checkbox', width: 40, fixed: 'left' },
+		{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
+		{ field: 'title', title: '标题', minWidth: 200, showOverflow: 'tooltip' },
+		{ field: 'content', title: '内容', minWidth: 180, showOverflow: 'tooltip', slots: { default: (scope: any) => removeHtml(scope.row.content) } },
+		{ field: 'type', title: '类型', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_type' } },
+		{ field: 'createTime', title: '创建时间', minWidth: 150, showOverflow: 'tooltip' },
+		{ field: 'status', title: '状态', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_status' } },
+		{ field: 'publicUserName', title: '发布者', minWidth: 120, showOverflow: 'tooltip' },
+		{ field: 'publicTime', title: '发布时间', minWidth: 150, showOverflow: 'tooltip' },
+		{ field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
+		{ title: '操作', fixed: 'right', width: 180, showOverflow: true, slots: { default: 'row_buttons' } },
+	],
+	enableExport: auth('sysNotice:export'),
+	searchCallback: () => handleQuery(),
+	queryAllCallback: () => fetchData({ pageSize: 99999 }),
+});
+
+// 页面初始化
 onMounted(async () => {
-	handleQuery();
+	await handleQuery();
 });
 
 // 查询操作
-const handleQuery = async () => {
+const handleQuery = async (reset = false) => {
-	state.loading = true;
+	options.loading = true;
-	let params = Object.assign(state.queryParams, state.tableParams);
+	if (reset) state.tableParams.page = 1;
-	var res = await getAPI(SysNoticeApi).apiSysNoticePagePost(params);
+	var res = await fetchData(null);
-	state.noticeData = res.data.result?.items ?? [];
+	xGrid.value?.loadData(res.data.result?.items ?? []);
 	state.tableParams.total = res.data.result?.total;
-	state.loading = false;
+	options.loading = false;
+};
+
+// 获取表数据
+const fetchData = async (tableParams: any) => {
+	let params = Object.assign(state.queryParams, state.tableParams, tableParams);
+	return getAPI(SysNoticeApi).apiSysNoticePagePost(params);
 };
 
 // 重置操作
 const resetQuery = () => {
 	state.queryParams.title = undefined;
 	state.queryParams.type = undefined;
+	handleQuery(true);
+};
+
+// 改变页码序号或页面容量
+const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
+	state.tableParams.page = currentPage;
+	state.tableParams.pageSize = pageSize;
+	handleQuery();
+};
+
+// 列排序
+const sortChange = (options: any) => {
+	state.tableParams.field = options.field;
+	state.tableParams.order = options.order;
 	handleQuery();
 };
 
 // 打开新增页面
-const openAddNotice = () => {
+const handleAdd = () => {
-	state.editNoticeTitle = '添加通知公告';
+	state.title = '添加通知公告';
 	editNoticeRef.value?.openDialog({ type: 1 });
 };
 
 // 打开编辑页面
-const openEditNotice = (row: any) => {
+const handleEdit = (row: any) => {
-	state.editNoticeTitle = '编辑通知公告';
+	state.title = '编辑通知公告';
 	editNoticeRef.value?.openDialog(row);
 };
 
 // 删除
-const delNotice = (row: any) => {
+const handleDelete = (row: any) => {
 	ElMessageBox.confirm(`确定删除通知公告：【${row.title}】?`, '提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
@@ -146,7 +203,7 @@ const delNotice = (row: any) => {
 };
 
 // 发布
-const publicNotice = (row: any) => {
+const handlePublic = (row: any) => {
 	ElMessageBox.confirm(`确定发布通知公告：【${row.title}】，不可撤销?`, '提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
@@ -159,16 +216,4 @@ const publicNotice = (row: any) => {
 		})
 		.catch(() => {});
 };
-
-// 改变页面容量
-const handleSizeChange = (val: number) => {
-	state.tableParams.pageSize = val;
-	handleQuery();
-};
-
-// 改变页码序号
-const handleCurrentChange = (val: number) => {
-	state.tableParams.page = val;
-	handleQuery();
-};
 </script>