😎调整打印模板管理页面

2024-07-11 00:20:26 +08:00 · 2024-07-11 00:20:26 +08:00 · 1f6727b654
commit 1f6727b654
parent 80206482ad
4 changed files with 72 additions and 76 deletions
--- a/Web/src/views/system/print/index.vue
+++ b/Web/src/views/system/print/index.vue
@ -5,7 +5,7 @@
 				<el-row :gutter="10">
 					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
 						<el-form-item label="模板名称" prop="name">
-							<el-input v-model="state.queryParams.name" placeholder="模板名称" clearable @keyup.enter.native="handleQuery(true)" />
+							<el-input v-model="state.queryParams.name" placeholder="模板名称" clearable @keyup.enter.native="handleQuery" />
 						</el-form-item>
 					</el-col>
 				</el-row>
@ -16,7 +16,7 @@
 			<el-row>
 				<el-col>
 					<el-button-group>
-						<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" v-auth="'sysPrint:page'" :loading="options.loading"> 查询 </el-button>
+						<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysPrint:page'" :loading="options.loading"> 查询 </el-button>
 						<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
 					</el-button-group>
 				</el-col>
@ -24,7 +24,7 @@
 		</el-card>

 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @sort-change="sortChange">
+			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" v-on="gridEvents">
 				<template #toolbar_buttons>
 					<el-button type="primary" icon="ele-Plus" @click="handleAdd" v-auth="'sysPrint:add'"> 新增 </el-button>
 				</template>
@ -47,15 +47,6 @@
 						<el-button icon="ele-Delete" text type="danger" v-auth="'sysPrint:delete'" @click="handleDelete(row)"> </el-button>
 					</el-tooltip>
 				</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-change="pageChange"
-					/>
-				</template>
 			</vxe-grid>
 		</el-card>

@ -67,15 +58,16 @@
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { auth } from '/@/utils/authFunction';
-import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
-import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
+import { VxeGridInstance, VxeGridListeners, VxeGridPropTypes } from 'vxe-table';
+import { useVxeTable } from '/@/hooks/useVxeTableOptionsHook';
+import { Local } from '/@/utils/storage';

 import EditPrint from '/@/views/system/print/component/editPrint.vue';
 import ModifyRecord from '/@/components/table/modifyRecord.vue';

 import { getAPI } from '/@/utils/axios-utils';
 import { SysPrintApi } from '/@/api-services/api';
-import { SysPrint } from '/@/api-services/models';
+import { SysPrint, PagePrintInput } from '/@/api-services/models';

 const xGrid = ref<VxeGridInstance>();
 const editPrintRef = ref<InstanceType<typeof EditPrint>>();
@ -83,78 +75,68 @@ const state = reactive({
 	queryParams: {
 		name: undefined,
 	},
-	tableParams: {
-		page: 1,
-		pageSize: 50,
-		field: 'id', // 默认的排序字段
-		order: 'aes', // 排序方向
-		descStr: 'desc', // 降序排序的关键字符
-		total: 0 as any,
+	localPageParam: {
+		pageSize: 50 as number,
+		defaultSort: { field: 'orderNo', order: 'asc', descStr: 'desc' },
 	},
 	visible: false,
 	title: '',
 });

+// 本地存储参数
+const localPageParamKey = 'localPageParam:sysPrint';
 // 表格参数配置
-const options = useVxeTable<SysPrint>({
-	id: 'sysPrint',
-	name: '打印信息',
-	columns: [
-		// { type: 'checkbox', width: 40, fixed: 'left' },
-		{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
-		{ field: 'name', title: '名称', minWidth: 250, showOverflow: 'tooltip' },
-		// { field: 'template', title: '模板', minWidth: 200, showOverflow: 'tooltip', sortable: true },
-		{ field: 'createTime', title: '修改时间', minWidth: 150, showOverflow: 'tooltip' },
-		{ field: 'remark', title: '备注', minWidth: 250, showOverflow: 'tooltip' },
-		{ field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' },
-		{ field: 'status', title: '状态', width: 100, showOverflow: 'tooltip', slots: { default: 'row_status' } },
-		{ field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
-		{ title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
-	],
-	enableExport: auth('sysPrint:export'),
-	searchCallback: () => handleQuery(),
-	queryAllCallback: () => fetchData({ pageSize: 99999 }),
-});
+const options = useVxeTable<SysPrint>(
+	{
+		id: 'sysPrint',
+		name: '打印信息',
+		columns: [
+			// { type: 'checkbox', width: 40, fixed: 'left' },
+			{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
+			{ field: 'name', title: '名称', minWidth: 250, showOverflow: 'tooltip' },
+			// { field: 'template', title: '模板', minWidth: 200, showOverflow: 'tooltip', sortable: true },
+			{ field: 'createTime', title: '修改时间', minWidth: 150, showOverflow: 'tooltip' },
+			{ field: 'remark', title: '备注', minWidth: 250, showOverflow: 'tooltip' },
+			{ field: 'orderNo', title: '排序', width: 80, showOverflow: 'tooltip' },
+			{ field: 'status', title: '状态', width: 100, showOverflow: 'tooltip', slots: { default: 'row_status' } },
+			{ field: '', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } },
+			{ title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
+		],
+	},
+	// vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档
+	{
+		// 代理配置
+		proxyConfig: { autoLoad: true, ajax: { query: ({ page, sort }) => handleQueryApi(page, sort) } },
+		// 排序配置
+		sortConfig: { defaultSort: Local.get(localPageParamKey)?.defaultSort || state.localPageParam.defaultSort },
+		// 分页配置
+		pagerConfig: { pageSize: Local.get(localPageParamKey)?.pageSize || state.localPageParam.pageSize },
+		// 工具栏配置
+		toolbarConfig: { export: false },
+	}
+);

 // 页面初始化
 onMounted(async () => {
+	state.localPageParam = Local.get(localPageParamKey) || state.localPageParam;
 	await handleQuery();
 });

-// 查询操作
-const handleQuery = async (reset = false) => {
-	options.loading = true;
-	if (reset) state.tableParams.page = 1;
-	var res = await fetchData(null);
-	xGrid.value?.loadData(res.data.result?.items ?? []);
-	state.tableParams.total = res.data.result?.total;
-	options.loading = false;
-};
-
-// 获取数据
-const fetchData = async (tableParams: any) => {
-	let params = Object.assign(state.queryParams, state.tableParams, tableParams);
+// 查询api
+const handleQueryApi = async (page: VxeGridPropTypes.ProxyAjaxQueryPageParams, sort: VxeGridPropTypes.ProxyAjaxQuerySortCheckedParams) => {
+	const params = Object.assign(state.queryParams, { page: page.currentPage, pageSize: page.pageSize, field: sort.field, order: sort.order, descStr: 'desc' }) as PagePrintInput;
 	return getAPI(SysPrintApi).apiSysPrintPagePost(params);
 };

+// 查询操作
+const handleQuery = async () => {
+	await xGrid.value?.commitProxy('query');
+};
+
 // 重置操作
-const resetQuery = () => {
+const resetQuery = async () => {
 	state.queryParams.name = 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();
+	await xGrid.value?.commitProxy('reload');
 };

 // 打开新增页面
@ -178,9 +160,23 @@ const handleDelete = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysPrintApi).apiSysPrintDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			ElMessage.success('删除成功');
 		})
 		.catch(() => {});
 };
+
+// 表格事件
+const gridEvents: VxeGridListeners<SysPrint> = {
+	// 只对 pager-config 配置时有效，分页发生改变时会触发该事件
+	async pageChange({ pageSize }) {
+		state.localPageParam.pageSize = pageSize;
+		Local.set(localPageParamKey, state.localPageParam);
+	},
+	// 当排序条件发生变化时会触发该事件
+	async sortChange({ field, order }) {
+		state.localPageParam.defaultSort = { field: field, order: order!, descStr: 'desc' };
+		Local.set(localPageParamKey, state.localPageParam);
+	},
+};
 </script>
--- a/Web/src/views/system/region/index.vue
+++ b/Web/src/views/system/region/index.vue
@ -183,7 +183,7 @@ const handleDelete = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysRegionApi).apiSysRegionDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			// 编辑删除后更新机构数据
 			regionTreeRef.value?.fetchTreeData();
 			ElMessage.success('删除成功');
@ -196,7 +196,7 @@ const handleNodeChange = async (node: any) => {
 	state.queryParams.pid = node.id;
 	state.queryParams.name = undefined;
 	state.queryParams.code = undefined;
-	handleQuery();
+	await handleQuery();
 };

 // 同步国家统计局操作
--- a/Web/src/views/system/tenant/index.vue
+++ b/Web/src/views/system/tenant/index.vue
@ -215,7 +215,7 @@ const handleDelete = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysTenantApi).apiSysTenantDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			ElMessage.success('删除成功');
 		})
 		.catch(() => {});
--- a/Web/src/views/system/user/index.vue
+++ b/Web/src/views/system/user/index.vue
@ -222,7 +222,7 @@ const handleDelete = (row: any) => {
 	})
 		.then(async () => {
 			await getAPI(SysUserApi).apiSysUserDeletePost({ id: row.id });
-			handleQuery();
+			await handleQuery();
 			ElMessage.success('删除成功');
 		})
 		.catch(() => {});
@ -280,7 +280,7 @@ const handleNodeChange = async (node: any) => {
 	state.queryParams.account = undefined;
 	state.queryParams.realName = undefined;
 	state.queryParams.phone = undefined;
-	await xGrid.value?.commitProxy('query');
+	await handleQuery();
 };

 // 表格事件