diff --git a/src/components/Select/SelectSupplier.vue b/src/components/Select/SelectSupplier.vue
index cccedf4..e3a1aa1 100644
--- a/src/components/Select/SelectSupplier.vue
+++ b/src/components/Select/SelectSupplier.vue
@@ -11,7 +11,7 @@
 		:loading="state.loading"
 		@visible-change="(e: boolean) => e && getOptions()"
 	>
-		<el-option v-for="v in state.options" :key="v.id" :label="`${v.typeName}`" :value="v.id">
+		<el-option v-for="v in state.options" :key="v.id" :label="`${v.supplierName}`" :value="v.supplierId">
 			<!-- <div class="flex items-center">
 				<div class="color-primary">{{ v.name }}</div>
 				<div class="flex items-center just ml5">
diff --git a/src/hooks/table.ts b/src/hooks/table.ts
index 48d9f7c..8ff6209 100644
--- a/src/hooks/table.ts
+++ b/src/hooks/table.ts
@@ -1,5 +1,6 @@
 import { CellStyle, ElMessage } from "element-plus"
 import other from "/@/utils/other"
+import { formatDate } from "../utils/formatTime"
 
 /**
  * 表格组件基础配置属性
@@ -220,11 +221,11 @@ export function useTable(options?: BasicTableProps) {
 	 */
 	const downBlobFile = (url: string, query: any, fileName: string) => {
 		ElMessage.info("下载中，请稍后")
-		return other.downBlobFile(url, query, fileName)
+		return other.downBlobFile(url, query, formatDate(new Date(), "YYYY年mm月dd日") + " " + fileName)
 	}
 
 	const postDownBlobFile = (url: string, data: any, fileName: string) => {
-		return other.postDownBlobFile(url, data, fileName)
+		return other.postDownBlobFile(url, data, formatDate(new Date(), "YYYY年mm月dd日") + " " + fileName)
 	}
 
 	/**
diff --git a/src/views/admin/audit/index.vue b/src/views/admin/audit/index.vue
index 6a61f6f..2f97d9f 100644
--- a/src/views/admin/audit/index.vue
+++ b/src/views/admin/audit/index.vue
@@ -14,9 +14,9 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button formDialogRef icon="search" type="primary" @click="getDataList">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button icon="Refresh" formDialogRef @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+						<el-button icon="Refresh" formDialogRef @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
@@ -32,7 +32,7 @@
 						v-auth="'sys_audit_del'"
 						@click="handleDelete(selectObjs)"
 					>
-						{{ $t('common.delBtn') }}
+						{{ $t("common.delBtn") }}
 					</el-button>
 					<right-toolbar
 						v-model:showSearch="showSearch"
@@ -48,7 +48,7 @@
 				:data="state.dataList"
 				v-loading="state.loading"
 				style="width: 100%"
-        row-key="id"
+				row-key="id"
 				@selection-change="handleSelectionChange"
 				@sort-change="sortChangeHandle"
 				border
@@ -66,7 +66,7 @@
 				<el-table-column :label="$t('common.action')" width="150">
 					<template #default="scope">
 						<el-button icon="delete" text type="primary" v-auth="'sys_audit_del'" @click="handleDelete([scope.row.id])"
-							>{{ $t('common.delBtn') }}
+							>{{ $t("common.delBtn") }}
 						</el-button>
 					</template>
 				</el-table-column>
@@ -77,61 +77,61 @@
 </template>
 
 <script setup lang="ts" name="systemSysAuditLog">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/admin/audit';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/admin/audit"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
-const { t } = useI18n();
+const { t } = useI18n()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 //  table hook
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-	descs: ['create_time'],
-});
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+	descs: ["create_time"],
+})
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/audit/export', Object.assign(state.queryForm,{ids:selectObjs}), 'audit.xlsx');
-};
+	downBlobFile("/admin/audit/export", Object.assign(state.queryForm, { ids: selectObjs }), "审计日志.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObjs(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/client/index.vue b/src/views/admin/client/index.vue
index a5ae0e7..1768db4 100644
--- a/src/views/admin/client/index.vue
+++ b/src/views/admin/client/index.vue
@@ -11,23 +11,31 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="getDataList" icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button v-auth="'sys_client_add'" @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<el-button v-auth="'sys_client_del'" plain @click="handleRefreshCache()" class="ml10" icon="refresh-left" type="primary">
-						{{ $t('common.refreshCacheBtn') }}
+						{{ $t("common.refreshCacheBtn") }}
 					</el-button>
 
-					<el-button plain :disabled="multiple" @click="handleDelete(selectObjs)" class="ml10" icon="Delete" type="primary" v-auth="'sys_client_del'">
-						{{ $t('common.delBtn') }}
+					<el-button
+						plain
+						:disabled="multiple"
+						@click="handleDelete(selectObjs)"
+						class="ml10"
+						icon="Delete"
+						type="primary"
+						v-auth="'sys_client_del'"
+					>
+						{{ $t("common.delBtn") }}
 					</el-button>
 
 					<right-toolbar
@@ -44,7 +52,7 @@
 				:data="state.dataList"
 				@selection-change="handleSelectionChange"
 				style="width: 100%"
-        row-key="id"
+				row-key="id"
 				v-loading="state.loading"
 				border
 				:cell-style="tableStyle.cellStyle"
@@ -65,10 +73,10 @@
 				<el-table-column :label="$t('common.action')" width="150">
 					<template #default="scope">
 						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.clientId)" text type="primary" v-auth="'sys_client_add'"
-							>{{ $t('common.editBtn') }}
+							>{{ $t("common.editBtn") }}
 						</el-button>
 						<el-button icon="delete" @click="handleDelete([scope.row.id])" text type="primary" v-auth="'sys_client_del'">
-							{{ $t('common.delBtn') }}
+							{{ $t("common.delBtn") }}
 						</el-button>
 					</template>
 				</el-table-column>
@@ -81,75 +89,75 @@
 </template>
 
 <script lang="ts" name="systemSysOauthClientDetails" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObj, fetchList, refreshCache } from '/@/api/admin/client';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchList, refreshCache } from "/@/api/admin/client"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义查询字典
 
-const { grant_types } = useDict('grant_types');
+const { grant_types } = useDict("grant_types")
 // 定义变量内容
-const formDialogRef = ref();
-const queryRef = ref();
+const formDialogRef = ref()
+const queryRef = ref()
 // 搜索变量
-const showSearch = ref(true);
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-	descs: ['id'],
-});
+	descs: ["id"],
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 删除缓存
 const handleRefreshCache = () => {
 	refreshCache().then(() => {
-		useMessage().success('同步成功');
-	});
-};
+		useMessage().success("同步成功")
+	})
+}
 
 const resetQuery = () => {
-	queryRef.value.resetFields();
+	queryRef.value.resetFields()
 	// state.queryForm = {};
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/client/export', Object.assign(state.queryForm,{ids:selectObjs}), 'client.xlsx');
-};
+	downBlobFile("/admin/client/export", Object.assign(state.queryForm, { ids: selectObjs }), "终端管理.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/dict/index.vue b/src/views/admin/dict/index.vue
index 01882ca..3caa3f4 100644
--- a/src/views/admin/dict/index.vue
+++ b/src/views/admin/dict/index.vue
@@ -8,10 +8,10 @@
 							<el-row>
 								<div class="mb8" style="width: 100%">
 									<el-button @click="dicDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary">
-										{{ $t('common.addBtn') }}
+										{{ $t("common.addBtn") }}
 									</el-button>
 									<el-button plain @click="handleRefreshCache()" class="ml10" icon="refresh-left" type="primary">
-										{{ $t('common.refreshCacheBtn') }}
+										{{ $t("common.refreshCacheBtn") }}
 									</el-button>
 								</div>
 							</el-row>
@@ -42,7 +42,7 @@
 							</el-scrollbar>
 							<el-footer style="height: 40px; line-height: 40px">
 								<el-button type="primary" size="small" icon="Download" style="width: 100%" @click="exportExcel">{{
-									$t('common.exportBtn')
+									$t("common.exportBtn")
 								}}</el-button>
 							</el-footer>
 						</div>
@@ -58,70 +58,70 @@
 </template>
 
 <script lang="ts" name="systemDic" setup>
-import { delObj, fetchList, refreshCache } from '/@/api/admin/dict';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
-import { downBlobFile } from '/@/utils/other';
+import { delObj, fetchList, refreshCache } from "/@/api/admin/dict"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
+import { downBlobFile } from "/@/utils/other"
 
 // 引入组件
-const DicDialog = defineAsyncComponent(() => import('./form.vue'));
-const DictItemDialog = defineAsyncComponent(() => import('./dictItem/index.vue'));
-const QueryTree = defineAsyncComponent(() => import('/@/components/QueryTree/index.vue'));
+const DicDialog = defineAsyncComponent(() => import("./form.vue"))
+const DictItemDialog = defineAsyncComponent(() => import("./dictItem/index.vue"))
+const QueryTree = defineAsyncComponent(() => import("/@/components/QueryTree/index.vue"))
 
-const { t } = useI18n();
+const { t } = useI18n()
 // 定义变量内容
-const dicDialogRef = ref();
-const dictTreeRef = ref();
-const dictItemDialogRef = ref();
+const dicDialogRef = ref()
+const dictTreeRef = ref()
+const dictItemDialogRef = ref()
 const state = reactive({
 	queryForm: {},
 	queryList: (name?: string) => {
 		return fetchList({
 			name: name,
-		});
+		})
 	},
-});
+})
 
 // 导出EXCEL
 const exportExcel = () => {
-	downBlobFile('/admin/dict/export', state.queryForm, 'dict.xlsx');
-};
+	downBlobFile("/admin/dict/export", state.queryForm, "字典管理.xlsx")
+}
 
 //刷新缓存
 const handleRefreshCache = () => {
 	refreshCache().then(() => {
-		useMessage().success('同步成功');
-	});
-};
+		useMessage().success("同步成功")
+	})
+}
 
 // 点击树
 const handleNodeClick = (data: any) => {
-	dictItemDialogRef.value.open(data);
-};
+	dictItemDialogRef.value.open(data)
+}
 
 // 刷新树
 const handleRefreshTree = async (data: any) => {
-	await dictTreeRef.value.getdeptTree();
+	await dictTreeRef.value.getdeptTree()
 	// 选择当前编辑、新增的节点
-	handleNodeClick(data);
-};
+	handleNodeClick(data)
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		useMessage().success(t('common.delSuccessText'));
-		dictTreeRef.value.getdeptTree();
+		await delObj(ids)
+		useMessage().success(t("common.delSuccessText"))
+		dictTreeRef.value.getdeptTree()
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
 
 <style scoped>
diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue
index 276e1fa..bf153f2 100644
--- a/src/views/admin/log/index.vue
+++ b/src/views/admin/log/index.vue
@@ -171,7 +171,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/admin/log/export", state.queryForm, "log.xlsx")
+	downBlobFile("/admin/log/export", state.queryForm, "操作日志.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/admin/param/index.vue b/src/views/admin/param/index.vue
index b43d54e..4c55b44 100644
--- a/src/views/admin/param/index.vue
+++ b/src/views/admin/param/index.vue
@@ -16,20 +16,20 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="getDataList" formDialogRef icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t('common.resetBtn') }} </el-button>
+						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t("common.resetBtn") }} </el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button v-auth="'sys_syspublicparam_add'" @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 
 					<el-button plain v-auth="'sys_syspublicparam_del'" @click="handleRefreshCache()" class="ml10" icon="refresh-left" type="primary">
-						{{ $t('common.refreshCacheBtn') }}
+						{{ $t("common.refreshCacheBtn") }}
 					</el-button>
 
 					<el-button
@@ -41,7 +41,7 @@
 						icon="Delete"
 						type="primary"
 					>
-						{{ $t('common.delBtn') }}
+						{{ $t("common.delBtn") }}
 					</el-button>
 
 					<right-toolbar
@@ -58,7 +58,7 @@
 				:data="state.dataList"
 				@selection-change="handleSelectionChange"
 				style="width: 100%"
-        row-key="publicId"
+				row-key="publicId"
 				v-loading="state.loading"
 				border
 				:cell-style="tableStyle.cellStyle"
@@ -83,7 +83,7 @@
 				<el-table-column :label="$t('common.action')" width="150">
 					<template #default="scope">
 						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.publicId)" text type="primary"
-							>{{ $t('common.editBtn') }}
+							>{{ $t("common.editBtn") }}
 						</el-button>
 
 						<el-tooltip :content="$t('sysdict.deleteDisabledTip')" :disabled="scope.row.systemFlag === '0'" placement="top">
@@ -96,7 +96,7 @@
 									text
 									type="primary"
 								>
-									{{ $t('common.delBtn') }}
+									{{ $t("common.delBtn") }}
 								</el-button>
 							</span>
 						</el-tooltip>
@@ -112,81 +112,81 @@
 </template>
 
 <script lang="ts" name="systemSysPublicParam" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObj, fetchList, refreshCache } from '/@/api/admin/param';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchList, refreshCache } from "/@/api/admin/param"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义查询字典
 
-const { dict_type, status_type } = useDict('dict_type', 'status_type');
+const { dict_type, status_type } = useDict("dict_type", "status_type")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
-		systemFlag: '',
+		systemFlag: "",
 	},
 	pageList: fetchList,
-	descs: ['create_time'],
-});
+	descs: ["create_time"],
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 是否可以多选
 const handleSelectable = (row: any) => {
 	// 系统类不可多选删除
-	return row.systemFlag !== '1';
-};
+	return row.systemFlag !== "1"
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/param/export', Object.assign(state.queryForm,{ids:selectObjs}), 'param.xlsx');
-};
+	downBlobFile("/admin/param/export", Object.assign(state.queryForm, { ids: selectObjs }), "参数管理.xlsx")
+}
 
 const handleRefreshCache = () => {
 	refreshCache().then(() => {
-		useMessage().success('同步成功');
-	});
-};
+		useMessage().success("同步成功")
+	})
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { publicId: string }[]) => {
-	selectObjs.value = objs.map(({ publicId }) => publicId);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ publicId }) => publicId)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/sensitive/index.vue b/src/views/admin/sensitive/index.vue
index 54f6b5c..a321f91 100644
--- a/src/views/admin/sensitive/index.vue
+++ b/src/views/admin/sensitive/index.vue
@@ -1,95 +1,122 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-          <el-form-item label="敏感词" prop="sensitiveWord">
-            <el-input placeholder="请输入敏感词" v-model="state.queryForm.sensitiveWord"/>
-          </el-form-item>
-          <el-form-item label="类型" prop="sensitiveType">
-            <el-radio-group v-model="state.queryForm.sensitiveType">
-              <el-radio :label="item.value" v-for="(item, index) in sensitive_type" border :key="index">{{ item.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              查询
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-                     v-auth="'admin_sysSensitiveWord_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-                     v-auth="'admin_sysSensitiveWord_del'" @click="handleDelete(selectObjs)">
-            删 除
-          </el-button>
-          <el-button plain icon="Check" type="primary"
-                     v-auth="'admin_sysSensitiveWord_del'" @click="matchDialogRef.openDialog()">
-            匹配测试
-          </el-button>
-          <el-button plain @click="handleRefreshCache()" class="ml10" icon="refresh-left" type="primary">
-            {{ $t('common.refreshCacheBtn') }}
-          </el-button>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="敏感词" prop="sensitiveWord">
+						<el-input placeholder="请输入敏感词" v-model="state.queryForm.sensitiveWord" />
+					</el-form-item>
+					<el-form-item label="类型" prop="sensitiveType">
+						<el-radio-group v-model="state.queryForm.sensitiveType">
+							<el-radio :label="item.value" v-for="(item, index) in sensitive_type" border :key="index">{{ item.label }} </el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+						<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'admin_sysSensitiveWord_add'"
+					>
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'admin_sysSensitiveWord_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删 除
+					</el-button>
+					<el-button plain icon="Check" type="primary" v-auth="'admin_sysSensitiveWord_del'" @click="matchDialogRef.openDialog()">
+						匹配测试
+					</el-button>
+					<el-button plain @click="handleRefreshCache()" class="ml10" icon="refresh-left" type="primary">
+						{{ $t("common.refreshCacheBtn") }}
+					</el-button>
 
-          <right-toolbar v-model:showSearch="showSearch" :export="'admin_sysSensitiveWord_export'"
-                         @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-                         @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-                :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-                @selection-change="selectionChangHandle"
-                @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center"/>
-        <el-table-column type="index" label="#" width="40"/>
-        <el-table-column prop="sensitiveWord" label="敏感词" show-overflow-tooltip/>
-        <el-table-column prop="sensitiveType" label="类型" show-overflow-tooltip>
-          <template #default="scope">
-            <dict-tag :options="sensitive_type" :value="scope.row.sensitiveType"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="remark" label="备注" width="200" show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'admin_sysSensitiveWord_edit'"
-                       @click="formDialogRef.openDialog(scope.row.sensitiveId)">编辑
-            </el-button>
-            <el-button icon="delete" text type="primary" v-auth="'admin_sysSensitiveWord_del'"
-                       @click="handleDelete([scope.row.sensitiveId])">删除
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
-    </div>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'admin_sysSensitiveWord_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="sensitiveWord" label="敏感词" show-overflow-tooltip />
+				<el-table-column prop="sensitiveType" label="类型" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="sensitive_type" :value="scope.row.sensitiveType"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="remark" label="备注" width="200" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'admin_sysSensitiveWord_edit'"
+							@click="formDialogRef.openDialog(scope.row.sensitiveId)"
+							>编辑
+						</el-button>
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'admin_sysSensitiveWord_del'"
+							@click="handleDelete([scope.row.sensitiveId])"
+							>删除
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-    <!-- 匹配测试 -->
-    <match-dialog ref="matchDialogRef" @refresh="getDataList(false)"/>
-  </div>
+		<!-- 匹配测试 -->
+		<match-dialog ref="matchDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemSysSensitiveWord">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {fetchList, delObjs, refreshObj} from "/@/api/admin/sensitive";
-import {useMessage, useMessageBox} from "/@/hooks/message";
-import {useDict} from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs, refreshObj } from "/@/api/admin/sensitive"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const MatchDialog = defineAsyncComponent(() => import('./match.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const MatchDialog = defineAsyncComponent(() => import("./match.vue"))
 // 定义查询字典
 
-const {sensitive_type} = useDict('sensitive_type')
+const { sensitive_type } = useDict("sensitive_type")
 // 定义变量内容
 const formDialogRef = ref()
 const matchDialogRef = ref()
@@ -101,65 +128,58 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/admin/sysSensitiveWord/export', Object.assign(state.queryForm, {ids: selectObjs}), 'sysSensitiveWord.xlsx')
+	downBlobFile("/admin/sysSensitiveWord/export", Object.assign(state.queryForm, { ids: selectObjs }), "敏感词管理.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { sensitiveId: string }[]) => {
-  selectObjs.value = objs.map(({sensitiveId}) => sensitiveId);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ sensitiveId }) => sensitiveId)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 刷新缓存
 const handleRefreshCache = async () => {
-  try {
-    await refreshObj();
-    getDataList();
-    useMessage().success('刷新成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
+	try {
+		await refreshObj()
+		getDataList()
+		useMessage().success("刷新成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
 }
 </script>
diff --git a/src/views/admin/social/index.vue b/src/views/admin/social/index.vue
index 69a448c..8923c95 100644
--- a/src/views/admin/social/index.vue
+++ b/src/views/admin/social/index.vue
@@ -10,16 +10,16 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button formDialogRef icon="search" type="primary" @click="getDataList">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button formDialogRef icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+						<el-button formDialogRef icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button v-auth="'sys_social_details_add'" class="ml10" icon="folder-add" type="primary" @click="formDialogRef.openDialog()">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<el-button
 						v-auth="'sys_social_details_del'"
@@ -29,7 +29,7 @@
 						type="primary"
 						@click="handleDelete(selectObjs)"
 					>
-						{{ $t('common.delBtn') }}
+						{{ $t("common.delBtn") }}
 					</el-button>
 					<right-toolbar
 						:export="'sys_social_details_del'"
@@ -45,7 +45,7 @@
 				v-loading="state.loading"
 				:data="state.dataList"
 				style="width: 100%"
-        row-key="id"
+				row-key="id"
 				@selection-change="handleSelectionChange"
 				border
 				:cell-style="tableStyle.cellStyle"
@@ -64,11 +64,16 @@
 				<el-table-column :label="t('social.createTime')" prop="createTime" show-overflow-tooltip />
 				<el-table-column :label="$t('common.action')" width="150">
 					<template #default="scope">
-						<el-button icon="edit-pen" v-auth="'sys_social_details_edit'" text type="primary" @click="formDialogRef.openDialog(scope.row.id)"
-							>{{ $t('common.editBtn') }}
+						<el-button
+							icon="edit-pen"
+							v-auth="'sys_social_details_edit'"
+							text
+							type="primary"
+							@click="formDialogRef.openDialog(scope.row.id)"
+							>{{ $t("common.editBtn") }}
 						</el-button>
 						<el-button icon="delete" v-auth="'sys_social_details_del'" text type="primary" @click="handleDelete([scope.row.id])"
-							>{{ $t('common.delBtn') }}
+							>{{ $t("common.delBtn") }}
 						</el-button>
 					</template>
 				</el-table-column>
@@ -82,67 +87,67 @@
 </template>
 
 <script lang="ts" name="systemAppSocialDetails" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObj, fetchList } from '/@/api/admin/social';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchList } from "/@/api/admin/social"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义查询字典
 
-const { social_type } = useDict('social_type');
+const { social_type } = useDict("social_type")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-	descs: ['create_time'],
-});
+	descs: ["create_time"],
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/social/export', Object.assign(state.queryForm,{ids:selectObjs}), 'social.xlsx');
-};
+	downBlobFile("/admin/social/export", Object.assign(state.queryForm, { ids: selectObjs }), "密钥管理.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/sysArea/index.vue b/src/views/admin/sysArea/index.vue
index 5f5901e..1ebfd63 100644
--- a/src/views/admin/sysArea/index.vue
+++ b/src/views/admin/sysArea/index.vue
@@ -1,103 +1,109 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-          <el-form-item :label="t('area.pid')" prop="adcode">
-            <china-area :type="3" :placeholder="t('area.inputPidByTip')" v-model="pid" :plus="true" @change="handleChange"/>
-          </el-form-item>
-          <el-form-item :label="t('area.name')" prop="name">
-            <el-input :placeholder="t('area.inputNameByTip')" v-model="state.queryForm.name"/>
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              {{ $t('common.queryBtn') }}
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-                     v-auth="'sys_sysArea_add'">
-            {{ $t('common.addBtn') }}
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-                     v-auth="'sys_sysArea_del'" @click="handleDelete(selectObjs)">
-            {{ $t('common.delBtn') }}
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'sys_sysArea_export'"
-                         @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-                         @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" border
-                :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-                @selection-change="selectionChangHandle"
-                @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center"/>
-        <el-table-column type="index" label="#" width="40"/>
-        <el-table-column prop="name" :label="t('area.name')" show-overflow-tooltip/>
-        <el-table-column prop="adcode" :label="t('area.adcode')" show-overflow-tooltip/>
-        <el-table-column prop="areaType" :label="t('area.areaType')" show-overflow-tooltip>
-          <template #default="scope">
-            <dict-tag :options="area_type_dict" :value="scope.row.areaType"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="hot" :label="t('area.hot')" show-overflow-tooltip>
-          <template #default="scope">
-            <dict-tag :options="yes_no_type" :value="scope.row.hot"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="areaStatus" :label="t('area.areaStatus')" show-overflow-tooltip>
-          <template #default="scope">
-            <dict-tag :options="yes_no_type" :value="scope.row.areaStatus"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column prop="areaSort" :label="t('area.areaSort')" width="100" sortable="custom"
-                         show-overflow-tooltip/>
-        <el-table-column :label="$t('common.action')" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'sys_sysArea_edit'"
-                       @click="formDialogRef.openDialog(scope.row.id)">{{ $t('common.editBtn') }}
-            </el-button>
-            <el-button icon="delete" text type="primary" v-auth="'sys_sysArea_del'"
-                       @click="handleDelete([scope.row.id])">{{ $t('common.delBtn') }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
-    </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item :label="t('area.pid')" prop="adcode">
+						<china-area :type="3" :placeholder="t('area.inputPidByTip')" v-model="pid" :plus="true" @change="handleChange" />
+					</el-form-item>
+					<el-form-item :label="t('area.name')" prop="name">
+						<el-input :placeholder="t('area.inputNameByTip')" v-model="state.queryForm.name" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'sys_sysArea_add'">
+						{{ $t("common.addBtn") }}
+					</el-button>
+					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'sys_sysArea_del'" @click="handleDelete(selectObjs)">
+						{{ $t("common.delBtn") }}
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'sys_sysArea_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="name" :label="t('area.name')" show-overflow-tooltip />
+				<el-table-column prop="adcode" :label="t('area.adcode')" show-overflow-tooltip />
+				<el-table-column prop="areaType" :label="t('area.areaType')" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="area_type_dict" :value="scope.row.areaType"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="hot" :label="t('area.hot')" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="yes_no_type" :value="scope.row.hot"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="areaStatus" :label="t('area.areaStatus')" show-overflow-tooltip>
+					<template #default="scope">
+						<dict-tag :options="yes_no_type" :value="scope.row.areaStatus"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="areaSort" :label="t('area.areaSort')" width="100" sortable="custom" show-overflow-tooltip />
+				<el-table-column :label="$t('common.action')" width="150">
+					<template #default="scope">
+						<el-button icon="edit-pen" text type="primary" v-auth="'sys_sysArea_edit'" @click="formDialogRef.openDialog(scope.row.id)"
+							>{{ $t("common.editBtn") }}
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'sys_sysArea_del'" @click="handleDelete([scope.row.id])"
+							>{{ $t("common.delBtn") }}
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemSysArea">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {delObjs, fetchList} from "/@/api/admin/sysArea";
-import {useMessage, useMessageBox} from "/@/hooks/message";
-import {useDict} from '/@/hooks/dict';
-import {useI18n} from "vue-i18n";
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList } from "/@/api/admin/sysArea"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { useI18n } from "vue-i18n"
 
-const {t} = useI18n();
+const { t } = useI18n()
 
 // 省市区查询组件
-const ChinaArea = defineAsyncComponent(() => import("/@/components/ChinaArea/index.vue"));
+const ChinaArea = defineAsyncComponent(() => import("/@/components/ChinaArea/index.vue"))
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
-const {yes_no_type} = useDict('yes_no_type');
+const { yes_no_type } = useDict("yes_no_type")
 const area_type_dict = [
-  {value: '0', label: '国家'},
-  {value: '1', label: '省份'},
-  {value: '2', label: '城市'},
-  {value: '3', label: '县区'},
-  {value: '4', label: '街道'}
+	{ value: "0", label: "国家" },
+	{ value: "1", label: "省份" },
+	{ value: "2", label: "城市" },
+	{ value: "3", label: "县区" },
+	{ value: "4", label: "街道" },
 ]
 // 定义变量内容
 const formDialogRef = ref()
@@ -110,65 +116,58 @@ const multiple = ref(true)
 const pid = ref()
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {
-    adcode: '',
-    name: ''
-  },
-  ascs: ['adcode'],
-  pageList: fetchList
+	queryForm: {
+		adcode: "",
+		name: "",
+	},
+	ascs: ["adcode"],
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  pid.value = ''
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	pid.value = ""
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/admin/sysArea/export', Object.assign(state.queryForm, {ids: selectObjs}), 'sysArea.xlsx')
+	downBlobFile("/admin/sysArea/export", Object.assign(state.queryForm, { ids: selectObjs }), "行政区域.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm(t('common.delConfirmText'));
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm(t("common.delConfirmText"))
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success(t('common.delSuccessText'));
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 地区查询
 const handleChange = (data: string) => {
-  let dataArray = data.split(",");
-  state.queryForm.adcode = dataArray[dataArray.length - 1];
+	let dataArray = data.split(",")
+	state.queryForm.adcode = dataArray[dataArray.length - 1]
 }
 </script>
diff --git a/src/views/admin/system/dept/index.vue b/src/views/admin/system/dept/index.vue
index 2e7f6ee..b5899ea 100644
--- a/src/views/admin/system/dept/index.vue
+++ b/src/views/admin/system/dept/index.vue
@@ -4,11 +4,7 @@
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
 				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="filter">
 					<el-form-item prop="deptName" :label="$t('sysdept.name')">
-						<el-input
-							:placeholder="$t('sysdept.inputdeptNameTip')"
-							style="max-width: 180px"
-							v-model="state.queryForm.deptName"
-						></el-input>
+						<el-input :placeholder="$t('sysdept.inputdeptNameTip')" style="max-width: 180px" v-model="state.queryForm.deptName"></el-input>
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="filter">
@@ -121,7 +117,7 @@ const handleExpand = () => {
  * 导出Excel
  */
 const exportExcel = () => {
-	downBlobFile("/admin/dept/export", state.queryForm, "dept.xlsx")
+	downBlobFile("/admin/dept/export", state.queryForm, "部门管理.xlsx")
 }
 
 const getDataList = () => {
diff --git a/src/views/admin/system/menu/index.vue b/src/views/admin/system/menu/index.vue
index dbb86b6..fab17be 100644
--- a/src/views/admin/system/menu/index.vue
+++ b/src/views/admin/system/menu/index.vue
@@ -2,7 +2,7 @@
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row shadow="hover" v-show="showSearch" class="ml10">
-				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+				<el-form :inline="true" :model="state.queryForm" ref="queryRef">
 					<el-form-item :label="$t('sysmenu.name')" prop="menuName">
 						<el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px" v-model="state.queryForm.menuName" />
 					</el-form-item>
diff --git a/src/views/admin/system/post/index.vue b/src/views/admin/system/post/index.vue
index e404a7d..f15823a 100644
--- a/src/views/admin/system/post/index.vue
+++ b/src/views/admin/system/post/index.vue
@@ -8,22 +8,30 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="getDataList" icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary" v-auth="'sys_post_add'">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<el-button plain @click="excelUploadRef.show()" class="ml10" icon="upload-filled" type="primary" v-auth="'sys_post_add'">
-						{{ $t('common.importBtn') }}
+						{{ $t("common.importBtn") }}
 					</el-button>
-					<el-button plain :disabled="multiple" @click="handleDelete(selectObjs)" class="ml10" icon="Delete" type="primary" v-auth="'sys_post_del'">
-						{{ $t('common.delBtn') }}
+					<el-button
+						plain
+						:disabled="multiple"
+						@click="handleDelete(selectObjs)"
+						class="ml10"
+						icon="Delete"
+						type="primary"
+						v-auth="'sys_post_del'"
+					>
+						{{ $t("common.delBtn") }}
 					</el-button>
 					<right-toolbar
 						:export="'sys_post_export'"
@@ -40,7 +48,7 @@
 				@selection-change="handleSelectionChange"
 				style="width: 100%"
 				v-loading="state.loading"
-        row-key="postId"
+				row-key="postId"
 				border
 				:cell-style="tableStyle?.cellStyle"
 				:header-cell-style="tableStyle?.headerCellStyle"
@@ -54,11 +62,11 @@
 				<el-table-column :label="$t('common.action')" width="200">
 					<template #default="scope">
 						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.postId)" text type="primary" v-auth="'sys_post_edit'"
-							>{{ $t('common.editBtn') }}
+							>{{ $t("common.editBtn") }}
 						</el-button>
 
 						<el-button icon="delete" @click="handleDelete([scope.row.postId])" text type="primary" v-auth="'sys_post_del'"
-							>{{ $t('common.delBtn') }}
+							>{{ $t("common.delBtn") }}
 						</el-button>
 					</template>
 				</el-table-column>
@@ -80,64 +88,64 @@
 </template>
 
 <script lang="ts" name="systemPost" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObj, fetchList } from '/@/api/admin/post';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchList } from "/@/api/admin/post"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 
 // 定义变量内容
-const formDialogRef = ref();
-const excelUploadRef = ref();
+const formDialogRef = ref()
+const excelUploadRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/post/export', Object.assign(state.queryForm,{ids:selectObjs}), 'post.xlsx');
-};
+	downBlobFile("/admin/post/export", Object.assign(state.queryForm, { ids: selectObjs }), "岗位管理.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { postId: string }[]) => {
-	selectObjs.value = objs.map(({ postId }) => postId);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ postId }) => postId)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/system/role/index.vue b/src/views/admin/system/role/index.vue
index 111da38..abeaa9e 100644
--- a/src/views/admin/system/role/index.vue
+++ b/src/views/admin/system/role/index.vue
@@ -8,22 +8,30 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="search" type="primary" @click="getDataList">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button icon="folder-add" type="primary" class="ml10" @click="roleDialogRef.openDialog()" v-auth="'sys_role_add'">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<el-button plain icon="upload-filled" type="primary" class="ml10" @click="excelUploadRef.show()" v-auth="'sys_user_add'">
-						{{ $t('common.importBtn') }}
+						{{ $t("common.importBtn") }}
 					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" class="ml10" v-auth="'sys_user_del'" @click="handleDelete(selectObjs)">
-						{{ $t('common.delBtn') }}
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						class="ml10"
+						v-auth="'sys_user_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						{{ $t("common.delBtn") }}
 					</el-button>
 					<right-toolbar
 						v-model:showSearch="showSearch"
@@ -39,8 +47,8 @@
 				:data="state.dataList"
 				v-loading="state.loading"
 				style="width: 100%"
-        row-key="roleId"
-        @selection-change="handleSelectionChange"
+				row-key="roleId"
+				@selection-change="handleSelectionChange"
 				border
 				:cell-style="tableStyle.cellStyle"
 				:header-cell-style="tableStyle.headerCellStyle"
@@ -59,11 +67,11 @@
 				<el-table-column :label="$t('common.action')" width="250">
 					<template #default="scope">
 						<el-button text type="primary" icon="edit-pen" v-auth="'sys_role_edit'" @click="roleDialogRef.openDialog(scope.row.roleId)">{{
-							$t('common.editBtn')
+							$t("common.editBtn")
 						}}</el-button>
 
 						<el-button text type="primary" icon="turn-off" v-auth="'sys_role_perm'" @click="permessionRef.openDialog(scope.row)">{{
-							$t('sysrole.permissionTip')
+							$t("sysrole.permissionTip")
 						}}</el-button>
 
 						<el-tooltip :content="$t('sysrole.deleteDisabledTip')" :disabled="scope.row.roleId !== '1'" placement="top">
@@ -75,7 +83,7 @@
 									:disabled="scope.row.roleId === '1'"
 									v-auth="'sys_role_del'"
 									@click="handleDelete([scope.row.roleId])"
-									>{{ $t('common.delBtn') }}
+									>{{ $t("common.delBtn") }}
 								</el-button>
 							</span>
 						</el-tooltip>
@@ -101,97 +109,97 @@
 </template>
 
 <script setup lang="ts" name="systemRole">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { pageList, delObj } from '/@/api/admin/role';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { pageList, delObj } from "/@/api/admin/role"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const RoleDialog = defineAsyncComponent(() => import('./form.vue'));
-const Permession = defineAsyncComponent(() => import('./permession.vue'));
-const { t } = useI18n();
+const RoleDialog = defineAsyncComponent(() => import("./form.vue"))
+const Permession = defineAsyncComponent(() => import("./permession.vue"))
+const { t } = useI18n()
 
 // 定义变量内容
-const roleDialogRef = ref();
-const permessionRef = ref();
-const excelUploadRef = ref();
-const queryRef = ref();
-const showSearch = ref(true);
+const roleDialogRef = ref()
+const permessionRef = ref()
+const excelUploadRef = ref()
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选rows
-const selectObjs = ref([]) as any;
+const selectObjs = ref([]) as any
 // 是否可以多选
-const multiple = ref(true);
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {
-		roleName: '',
+		roleName: "",
 	},
 	pageList: pageList, // H
-	descs: ['create_time'],
-});
+	descs: ["create_time"],
+})
 
 const dictType = ref([
 	{
-		label: '全部',
-		value: '0',
+		label: "全部",
+		value: "0",
 	},
 	{
-		label: '自定义',
-		value: '1',
+		label: "自定义",
+		value: "1",
 	},
 	{
-		label: '本级及子级',
-		value: '2',
+		label: "本级及子级",
+		value: "2",
 	},
 	{
-		label: '本级',
-		value: '3',
+		label: "本级",
+		value: "3",
 	},
-  {
-    label: '本人',
-    value: '4',
-  },
-]);
+	{
+		label: "本人",
+		value: "4",
+	},
+])
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/role/export',Object.assign(state.queryForm,{ids:selectObjs}), 'role.xlsx');
-};
+	downBlobFile("/admin/role/export", Object.assign(state.queryForm, { ids: selectObjs }), "角色管理.xlsx")
+}
 
 // 是否可以多选
 const handleSelectable = (row: any) => {
-	return row.roleId !== '1';
-};
+	return row.roleId !== "1"
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { roleId: string }[]) => {
-	selectObjs.value = objs.map(({ roleId }) => roleId);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ roleId }) => roleId)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/admin/system/tenant/index.vue b/src/views/admin/system/tenant/index.vue
index 1c80b9c..aa18d3c 100644
--- a/src/views/admin/system/tenant/index.vue
+++ b/src/views/admin/system/tenant/index.vue
@@ -8,20 +8,20 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="getDataList" icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary" v-auth="'sys_systenant_add'">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 
 					<el-button plain @click="handleRefreshCache()" class="ml10" icon="refresh-left" type="primary">
-						{{ $t('common.refreshCacheBtn') }}
+						{{ $t("common.refreshCacheBtn") }}
 					</el-button>
 
 					<el-button
@@ -33,7 +33,7 @@
 						type="primary"
 						v-auth="'sys_systenant_del'"
 					>
-						{{ $t('common.delBtn') }}
+						{{ $t("common.delBtn") }}
 					</el-button>
 
 					<right-toolbar
@@ -113,7 +113,7 @@
 											text
 											type="primary"
 											v-auth="'sys_systenant_edit'"
-											>{{ $t('tenant.individuationBtn') }}
+											>{{ $t("tenant.individuationBtn") }}
 										</el-button>
 										<el-button
 											class="!p-0"
@@ -122,7 +122,7 @@
 											text
 											type="primary"
 											v-auth="'sys_systenant_edit'"
-											>{{ $t('common.editBtn') }}
+											>{{ $t("common.editBtn") }}
 										</el-button>
 										<el-button
 											class="!p-0"
@@ -132,7 +132,7 @@
 											text
 											type="primary"
 											v-auth="'sys_systenant_del'"
-											>{{ $t('common.delBtn') }}
+											>{{ $t("common.delBtn") }}
 										</el-button>
 									</div>
 								</div>
@@ -163,31 +163,31 @@
 </template>
 
 <script lang="ts" name="systemTenant" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObj, fetchPage, fetchList } from '/@/api/admin/tenant';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchPage, fetchList } from "/@/api/admin/tenant"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const Individuation = defineAsyncComponent(() => import('./individuation.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const Individuation = defineAsyncComponent(() => import("./individuation.vue"))
+const { t } = useI18n()
 
 // 定义变量内容
-const formDialogRef = ref();
-const individuationRef = ref();
-const excelUploadRef = ref();
-const tenantMenuRef = ref();
+const formDialogRef = ref()
+const individuationRef = ref()
+const excelUploadRef = ref()
+const tenantMenuRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 // 字典
-const { status_type } = useDict('status_type');
+const { status_type } = useDict("status_type")
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
@@ -196,45 +196,45 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 		size: 6,
 		pageSizes: [3, 6, 9, 12],
 	},
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/admin/tenant/export', Object.assign(state.queryForm, { ids: selectObjs }), 'tenant.xlsx');
-};
+	downBlobFile("/admin/tenant/export", Object.assign(state.queryForm, { ids: selectObjs }), "租户管理.xlsx")
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	} finally {
-		handleRefreshCache();
+		handleRefreshCache()
 	}
-};
+}
 
 //刷新缓存
 const handleRefreshCache = () => {
 	fetchList().then(() => {
-		useMessage().success('同步成功');
-	});
-};
+		useMessage().success("同步成功")
+	})
+}
 </script>
diff --git a/src/views/admin/system/user/index.vue b/src/views/admin/system/user/index.vue
index c22c465..ef8f843 100644
--- a/src/views/admin/system/user/index.vue
+++ b/src/views/admin/system/user/index.vue
@@ -243,7 +243,7 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT
 
 // 导出excel
 const exportExcel = () => {
-	postDownBlobFile("/admin/user/export", Object.assign(state.queryForm, { ids: selectObjs }), "users.xlsx")
+	postDownBlobFile("/admin/user/export", Object.assign(state.queryForm, { ids: selectObjs }), "用户管理.xlsx")
 }
 
 // 是否可以多选
diff --git a/src/views/canteen/boxesAvailability/index.vue b/src/views/canteen/boxesAvailability/index.vue
index 9e4e538..f8821ee 100644
--- a/src/views/canteen/boxesAvailability/index.vue
+++ b/src/views/canteen/boxesAvailability/index.vue
@@ -16,7 +16,13 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'canteen_boxesAvailability_add'">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						@click="formDialogRef.openDialog()"
+						v-auth="'canteen_boxesAvailability_add'"
+					>
 						新 增
 					</el-button>
 					<el-button
@@ -63,7 +69,13 @@
 				<el-table-column prop="hourIndex" label="时间索引（0-24）" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'canteen_boxesAvailability_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'canteen_boxesAvailability_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
 							编辑
 						</el-button>
 						<el-button icon="delete" text type="primary" v-auth="'canteen_boxesAvailability_del'" @click="handleDelete([scope.row.id])">
@@ -81,67 +93,67 @@
 </template>
 
 <script setup lang="ts" name="systemBoxesAvailability">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/canteen/boxesAvailability';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/boxesAvailability"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { booking_status } = useDict('booking_status');
+const { booking_status } = useDict("booking_status")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/canteen/boxesAvailability/export', Object.assign(state.queryForm, { ids: selectObjs }), 'boxesAvailability.xlsx');
-};
+	downBlobFile("/canteen/boxesAvailability/export", Object.assign(state.queryForm, { ids: selectObjs }), "包厢时间段管理.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/canteen/boxesBooking/index.vue b/src/views/canteen/boxesBooking/index.vue
index c678846..5cf0905 100644
--- a/src/views/canteen/boxesBooking/index.vue
+++ b/src/views/canteen/boxesBooking/index.vue
@@ -23,7 +23,14 @@
 					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'canteen_boxesBooking_add'">
 						新 增
 					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'canteen_boxesBooking_del'" @click="handleDelete(selectObjs)">
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'canteen_boxesBooking_del'"
+						@click="handleDelete(selectObjs)"
+					>
 						删 除
 					</el-button>
 					<right-toolbar
@@ -66,10 +73,18 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip min-width="160" />
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'canteen_boxesBooking_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'canteen_boxesBooking_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'canteen_boxesBooking_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_boxesBooking_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -82,67 +97,67 @@
 </template>
 
 <script setup lang="ts" name="systemBoxesBooking">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/canteen/boxesBooking';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/boxesBooking"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { check_status } = useDict('check_status');
+const { check_status } = useDict("check_status")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/canteen/boxesBooking/export', Object.assign(state.queryForm, { ids: selectObjs }), 'boxesBooking.xlsx');
-};
+	downBlobFile("/canteen/boxesBooking/export", Object.assign(state.queryForm, { ids: selectObjs }), "包厢预约管理.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/canteen/boxesInfo/index.vue b/src/views/canteen/boxesInfo/index.vue
index a59bd3b..17356bb 100644
--- a/src/views/canteen/boxesInfo/index.vue
+++ b/src/views/canteen/boxesInfo/index.vue
@@ -17,7 +17,14 @@
 					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'canteen_boxesInfo_add'">
 						新 增
 					</el-button>
-					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'canteen_boxesInfo_del'" @click="handleDelete(selectObjs)">
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'canteen_boxesInfo_del'"
+						@click="handleDelete(selectObjs)"
+					>
 						删 除
 					</el-button>
 					<right-toolbar
@@ -59,10 +66,18 @@
 				<el-table-column prop="merchantId" label="商户id" show-overflow-tooltip />
 				<el-table-column label="操作" width="150" fixed="right">
 					<template #default="scope">
-						<el-button icon="edit-pen" text type="primary" v-auth="'canteen_boxesInfo_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'canteen_boxesInfo_edit'"
+							@click="formDialogRef.openDialog(scope.row.id)"
+						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'canteen_boxesInfo_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_boxesInfo_del'" @click="handleDelete([scope.row.id])"
+							>删除</el-button
+						>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -75,67 +90,67 @@
 </template>
 
 <script setup lang="ts" name="systemBoxesInfo">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/canteen/boxesInfo';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/canteen/boxesInfo"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
-const { boxes_status } = useDict('boxes_status');
+const { boxes_status } = useDict("boxes_status")
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/canteen/boxesInfo/export', Object.assign(state.queryForm, { ids: selectObjs }), 'boxesInfo.xlsx');
-};
+	downBlobFile("/canteen/boxesInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "包厢列表.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index ad45669..fe4f0b5 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -7,9 +7,7 @@
 						<el-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenCategory_view'">
-							查询
-						</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenCategory_view'"> 查询 </el-button>
 						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenCategory_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
@@ -81,13 +79,7 @@
 						>
 							编辑
 						</el-button>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'canteen_canteenCategory_del'"
-							@click="handleDelete([scope.row.id])"
-						>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenCategory_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
 					</template>
@@ -126,8 +118,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -140,11 +131,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
-		"/canteen/canteenCategory/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"canteenCategory.xlsx",
-	)
+	downBlobFile("/canteen/canteenCategory/export", Object.assign(state.queryForm, { ids: selectObjs }), "每日菜品分类.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/canteen/canteenOnlineCategory/index.vue b/src/views/canteen/canteenOnlineCategory/index.vue
index 50c8e93..228a219 100644
--- a/src/views/canteen/canteenOnlineCategory/index.vue
+++ b/src/views/canteen/canteenOnlineCategory/index.vue
@@ -7,9 +7,7 @@
 						<el-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenOnlineCategory_view'">
-							查询
-						</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenOnlineCategory_view'"> 查询 </el-button>
 						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenOnlineCategory_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
@@ -75,13 +73,7 @@
 						>
 							编辑
 						</el-button>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'canteen_canteenOnlineCategory_del'"
-							@click="handleDelete([scope.row.id])"
-						>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenOnlineCategory_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
 					</template>
@@ -118,8 +110,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -132,11 +123,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
-		"/canteen/canteenOnlineCategory/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"canteenOnlineCategory.xlsx",
-	)
+	downBlobFile("/canteen/canteenOnlineCategory/export", Object.assign(state.queryForm, { ids: selectObjs }), "线上菜品分类.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/canteen/canteenOnlineSpu/index.vue b/src/views/canteen/canteenOnlineSpu/index.vue
index 2dfede9..0a1f9f0 100644
--- a/src/views/canteen/canteenOnlineSpu/index.vue
+++ b/src/views/canteen/canteenOnlineSpu/index.vue
@@ -10,9 +10,7 @@
 						<select-ctcgol v-model="state.queryForm.categoryId" style="width: 200px" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenOnlineSpu_view'">
-							查询
-						</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenOnlineSpu_view'"> 查询 </el-button>
 						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenOnlineSpu_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
@@ -100,13 +98,7 @@
 						>
 							编辑
 						</el-button>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'canteen_canteenOnlineSpu_del'"
-							@click="handleDelete([scope.row.id])"
-						>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenOnlineSpu_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
 					</template>
@@ -156,8 +148,7 @@ onMounted(async () => {
 })
 
 // table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -170,11 +161,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
-		"/canteen/canteenOnlineSpu/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"canteenOnlineSpu.xlsx",
-	)
+	downBlobFile("/canteen/canteenOnlineSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "线上菜品列表.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/canteen/canteenSpu/index.vue b/src/views/canteen/canteenSpu/index.vue
index 4f36d18..9fd4172 100644
--- a/src/views/canteen/canteenSpu/index.vue
+++ b/src/views/canteen/canteenSpu/index.vue
@@ -10,22 +10,14 @@
 						<select-ctcg v-model="state.queryForm.categoryId" style="width: 200px" />
 					</el-form-item>
 					<el-form-item>
-						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenSpu_view'">
-							查询
-						</el-button>
+						<el-button icon="search" type="primary" @click="getDataList" v-auth="'canteen_canteenSpu_view'"> 查询 </el-button>
 						<el-button icon="Refresh" @click="resetQuery" v-auth="'canteen_canteenSpu_view'">重置</el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'canteen_canteenSpu_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'canteen_canteenSpu_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -104,13 +96,7 @@
 						>
 							编辑
 						</el-button>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'canteen_canteenSpu_del'"
-							@click="handleDelete([scope.row.id])"
-						>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenSpu_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
 					</template>
@@ -161,8 +147,7 @@ onMounted(async () => {
 })
 
 // table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -175,7 +160,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/canteen/canteenSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "canteenSpu.xlsx")
+	downBlobFile("/canteen/canteenSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "菜品列表.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/gen/create-table/index.vue b/src/views/gen/create-table/index.vue
index ac155a6..25886b8 100644
--- a/src/views/gen/create-table/index.vue
+++ b/src/views/gen/create-table/index.vue
@@ -1,100 +1,121 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row v-show="showSearch">
-        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-          <el-form-item label="数据源" prop="name">
-            <el-select @change="getDataList" placeholder="请选择数据源" v-model="state.queryForm.dsName">
-              <el-option label="默认数据源" value="master"></el-option>
-              <el-option :key="ds.id" :label="ds.name" :value="ds.name" v-for="ds in datasourceList"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('createTable.tableName')" prop="tableName">
-            <el-input :placeholder="t('createTable.inputTableNameTip')" v-model="state.queryForm.tableName"/>
-          </el-form-item>
-          <el-form-item>
-            <el-button icon="search" type="primary" @click="getDataList">
-              {{ $t('common.queryBtn') }}
-            </el-button>
-            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" v-auth="'codegen_table_add'"
-                     @click="formDialogRef.openDialog('add',null,state.queryForm.dsName)">
-            {{ $t('common.addBtn') }}
-          </el-button>
-          <el-button plain :disabled="multiple" v-auth="'codegen_table_add'" icon="Delete" type="primary" class="ml10"
-                     @click="handleDelete(selectObjs)">
-            {{ $t('common.delBtn') }}
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'order_createtable_export'"
-                         @exportExcel="exportExcel" class="ml10" style="float: right;margin-right: 20px"
-                         @queryTable="getDataList"></right-toolbar>
-        </div>
-      </el-row>
-      <el-table :data="state.dataList" v-loading="state.loading" style="width: 100%"
-                :cell-style="tableStyle.cellStyle"
-                border
-                :header-cell-style="tableStyle.headerCellStyle"
-                @selection-change="handleSelectionChange" @sort-change="sortChangeHandle">
-        <el-table-column type="selection" width="40" align="center"/>
-        <el-table-column type="index" fixed="left" :label="t('createTable.index')" width="40"/>
-        <el-table-column prop="tableName" :label="t('createTable.tableName')" show-overflow-tooltip/>
-        <el-table-column prop="comments" :label="t('createTable.comments')" show-overflow-tooltip/>
-        <el-table-column prop="primary" :label="t('createTable.primary')" show-overflow-tooltip>
-          <template #default="scope">
-            <!--  获取主键列名称-->
-            {{ JSON.parse(scope.row.columnInfo).find(col => col.primary === 1)?.name }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="createTime" :label="t('createTable.createTime')" show-overflow-tooltip/>
-        <el-table-column :label="$t('common.action')" fixed="right" width="200">
-          <template #default="scope">
-            <el-button text type="primary" icon="view" @click="formDialogRef.openDialog('view', scope.row.id)">
-              {{ $t('common.viewBtn') }}
-            </el-button>
-            <el-button icon="FolderOpened" @click="openGen(scope.row)" text type="primary">{{
-                $t('gen.genBtn')
-              }}
-            </el-button>
-            <el-button icon="edit-pen" text type="primary" v-auth="'order_createtable_edit'"
-                       @click="formDialogRef.openDialog('edit', scope.row.id)">{{ $t('common.editBtn') }}
-            </el-button>
-            <el-button icon="delete" text type="primary" @click="handleDelete([scope.row.id])">{{
-                $t('common.delBtn')
-              }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
-    </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row v-show="showSearch">
+				<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+					<el-form-item label="数据源" prop="name">
+						<el-select @change="getDataList" placeholder="请选择数据源" v-model="state.queryForm.dsName">
+							<el-option label="默认数据源" value="master"></el-option>
+							<el-option :key="ds.id" :label="ds.name" :value="ds.name" v-for="ds in datasourceList"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="$t('createTable.tableName')" prop="tableName">
+						<el-input :placeholder="t('createTable.inputTableNameTip')" v-model="state.queryForm.tableName" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button
+						icon="folder-add"
+						type="primary"
+						class="ml10"
+						v-auth="'codegen_table_add'"
+						@click="formDialogRef.openDialog('add', null, state.queryForm.dsName)"
+					>
+						{{ $t("common.addBtn") }}
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						v-auth="'codegen_table_add'"
+						icon="Delete"
+						type="primary"
+						class="ml10"
+						@click="handleDelete(selectObjs)"
+					>
+						{{ $t("common.delBtn") }}
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'order_createtable_export'"
+						@exportExcel="exportExcel"
+						class="ml10"
+						style="float: right; margin-right: 20px"
+						@queryTable="getDataList"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				style="width: 100%"
+				:cell-style="tableStyle.cellStyle"
+				border
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="handleSelectionChange"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" fixed="left" :label="t('createTable.index')" width="40" />
+				<el-table-column prop="tableName" :label="t('createTable.tableName')" show-overflow-tooltip />
+				<el-table-column prop="comments" :label="t('createTable.comments')" show-overflow-tooltip />
+				<el-table-column prop="primary" :label="t('createTable.primary')" show-overflow-tooltip>
+					<template #default="scope">
+						<!--  获取主键列名称-->
+						{{ JSON.parse(scope.row.columnInfo).find((col) => col.primary === 1)?.name }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="createTime" :label="t('createTable.createTime')" show-overflow-tooltip />
+				<el-table-column :label="$t('common.action')" fixed="right" width="200">
+					<template #default="scope">
+						<el-button text type="primary" icon="view" @click="formDialogRef.openDialog('view', scope.row.id)">
+							{{ $t("common.viewBtn") }}
+						</el-button>
+						<el-button icon="FolderOpened" @click="openGen(scope.row)" text type="primary">{{ $t("gen.genBtn") }} </el-button>
+						<el-button
+							icon="edit-pen"
+							text
+							type="primary"
+							v-auth="'order_createtable_edit'"
+							@click="formDialogRef.openDialog('edit', scope.row.id)"
+							>{{ $t("common.editBtn") }}
+						</el-button>
+						<el-button icon="delete" text type="primary" @click="handleDelete([scope.row.id])">{{ $t("common.delBtn") }} </el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemCreateTable">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {fetchList, delObjs} from "/@/api/gen/create-table";
-import {useMessage, useMessageBox} from "/@/hooks/message";
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/gen/create-table"
+import { useMessage, useMessageBox } from "/@/hooks/message"
 
-import {useI18n} from "vue-i18n";
-import {list} from "/@/api/gen/datasource";
-import {useSyncTableApi, useTableApi} from "/@/api/gen/table";
-import {validateNull} from "/@/utils/validate";
+import { useI18n } from "vue-i18n"
+import { list } from "/@/api/gen/datasource"
+import { useSyncTableApi, useTableApi } from "/@/api/gen/table"
+import { validateNull } from "/@/utils/validate"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const {t} = useI18n()
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义变量内容
 const formDialogRef = ref()
-const datasourceList = ref();
-const router = useRouter();
+const datasourceList = ref()
+const router = useRouter()
 
 // 搜索变量
 const queryRef = ref()
@@ -104,88 +125,80 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {
-  },
-  pageList: fetchList,
-  descs: ["create_time"]
+	queryForm: {},
+	pageList: fetchList,
+	descs: ["create_time"],
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/order/create-table/export', state.queryForm, 'create-table.xlsx')
+	downBlobFile("/order/create-table/export", state.queryForm, "数据表管理.xlsx")
 }
 
 // 多选事件
 const handleSelectionChange = (objs: any) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm(t('common.delConfirmText'));
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm(t("common.delConfirmText"))
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success(t('common.delSuccessText'));
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 /**
  * 打开生成代码页面
  * @param row
  */
 const openGen = (row: { tableName: string }) => {
-  useTableApi(state.queryForm.dsName, row.tableName)
-      .then((res) => {
-        if (validateNull(res.data.fieldList)) {
-          useSyncTableApi(state.queryForm.dsName, row.tableName);
-        }
-      })
-      .finally(() => {
-        router.push({
-          path: '/gen/gener/index',
-          query: {
-            tableName: row.tableName,
-            dsName: state.queryForm.dsName,
-          },
-        });
-      });
-};
+	useTableApi(state.queryForm.dsName, row.tableName)
+		.then((res) => {
+			if (validateNull(res.data.fieldList)) {
+				useSyncTableApi(state.queryForm.dsName, row.tableName)
+			}
+		})
+		.finally(() => {
+			router.push({
+				path: "/gen/gener/index",
+				query: {
+					tableName: row.tableName,
+					dsName: state.queryForm.dsName,
+				},
+			})
+		})
+}
 
 // 初始化数据
 onMounted(() => {
-  list().then((res) => {
-    datasourceList.value = res.data;
-    // 默认去第一个数据源
-    state.queryForm.dsName = datasourceList.value[0]?.name || 'master';
-    getDataList();
-  });
-});
+	list().then((res) => {
+		datasourceList.value = res.data
+		// 默认去第一个数据源
+		state.queryForm.dsName = datasourceList.value[0]?.name || "master"
+		getDataList()
+	})
+})
 </script>
diff --git a/src/views/gen/field-type/index.vue b/src/views/gen/field-type/index.vue
index c5eed55..39f7b44 100644
--- a/src/views/gen/field-type/index.vue
+++ b/src/views/gen/field-type/index.vue
@@ -4,23 +4,28 @@
 			<el-row class="ml10" v-show="showSearch">
 				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
 					<el-form-item :label="$t('fieldtype.columnType')" prop="columnType">
-						<el-input :placeholder="$t('fieldtype.inputcolumnTypeTip')" formDialogRef style="max-width: 180px" v-model="state.queryForm.columnType" />
+						<el-input
+							:placeholder="$t('fieldtype.inputcolumnTypeTip')"
+							formDialogRef
+							style="max-width: 180px"
+							v-model="state.queryForm.columnType"
+						/>
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="getDataList" icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t('common.resetBtn') }} </el-button>
+						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t("common.resetBtn") }} </el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary">
-						{{ $t('common.addBtn') }}
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<el-button plain :disabled="multiple" @click="handleDelete(selectObjs)" class="ml10" icon="Delete" type="primary">
-						{{ $t('common.delBtn') }}
+						{{ $t("common.delBtn") }}
 					</el-button>
 					<right-toolbar
 						:export="true"
@@ -49,9 +54,11 @@
 				<el-table-column :label="t('fieldtype.createTime')" prop="createTime" show-overflow-tooltip />
 				<el-table-column :label="$t('common.action')" width="150">
 					<template #default="scope">
-						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.id)" text type="primary">{{ $t('common.editBtn') }} </el-button>
+						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.id)" text type="primary"
+							>{{ $t("common.editBtn") }}
+						</el-button>
 
-						<el-button icon="delete" @click="handleDelete([scope.row.id])" text type="primary">{{ $t('common.delBtn') }} </el-button>
+						<el-button icon="delete" @click="handleDelete([scope.row.id])" text type="primary">{{ $t("common.delBtn") }} </el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -64,63 +71,63 @@
 </template>
 
 <script lang="ts" name="systemFieldType" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObj, fetchList } from '/@/api/gen/fieldtype';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchList } from "/@/api/gen/fieldtype"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选rows
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-	descs: ['create_time'],
-});
+	descs: ["create_time"],
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-	queryRef.value.resetFields();
-	getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/gen/fieldtype/export', state.queryForm, 'fieldtype.xlsx');
-};
+	downBlobFile("/gen/fieldtype/export", state.queryForm, "字段管理.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObj(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObj(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/gen/group/index.vue b/src/views/gen/group/index.vue
index ea908fb..c4f7fdb 100644
--- a/src/views/gen/group/index.vue
+++ b/src/views/gen/group/index.vue
@@ -8,16 +8,23 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="getDataList" formDialogRef icon="search" type="primary">
-							{{ $t('common.queryBtn') }}
+							{{ $t("common.queryBtn") }}
 						</el-button>
-						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t('common.resetBtn') }} </el-button>
+						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t("common.resetBtn") }} </el-button>
 					</el-form-item>
 				</el-form>
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button @click="formDialogRef.openDialog()" class="ml10" formDialogRef icon="folder-add" type="primary" v-auth="'codegen_group_add'">
-						{{ $t('common.addBtn') }}
+					<el-button
+						@click="formDialogRef.openDialog()"
+						class="ml10"
+						formDialogRef
+						icon="folder-add"
+						type="primary"
+						v-auth="'codegen_group_add'"
+					>
+						{{ $t("common.addBtn") }}
 					</el-button>
 					<el-button
 						plain
@@ -29,7 +36,7 @@
 						type="primary"
 						v-auth="'codegen_group_del'"
 					>
-						{{ $t('common.delBtn') }}
+						{{ $t("common.delBtn") }}
 					</el-button>
 					<right-toolbar
 						:export="'codegen_group_export'"
@@ -59,10 +66,10 @@
 				<el-table-column :label="$t('common.action')" width="200">
 					<template #default="scope">
 						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.id)" text type="primary" v-auth="'codegen_group_edit'"
-							>{{ $t('common.editBtn') }}
+							>{{ $t("common.editBtn") }}
 						</el-button>
 						<el-button icon="delete" @click="handleDelete([scope.row.id])" text type="primary" v-auth="'codegen_group_del'"
-							>{{ $t('common.delBtn') }}
+							>{{ $t("common.delBtn") }}
 						</el-button>
 					</template>
 				</el-table-column>
@@ -76,68 +83,68 @@
 </template>
 
 <script lang="ts" name="systemGenGroup" setup>
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { delObjs, fetchList } from '/@/api/gen/group';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useI18n } from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList } from "/@/api/gen/group"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const { t } = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义查询字典
 
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-	descs: ['create_time'],
-});
+	descs: ["create_time"],
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value.resetFields();
+	queryRef.value.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/gen/group/export', state.queryForm, 'group.xlsx');
-};
+	downBlobFile("/gen/group/export", state.queryForm, "模板分组.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm(t('common.delConfirmText'));
+		await useMessageBox().confirm(t("common.delConfirmText"))
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success(t('common.delSuccessText'));
+		await delObjs(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/gen/table/index.vue b/src/views/gen/table/index.vue
index e53eef5..831bdb5 100644
--- a/src/views/gen/table/index.vue
+++ b/src/views/gen/table/index.vue
@@ -1,154 +1,148 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row class="ml10" v-show="showSearch">
-        <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
-          <el-form-item label="数据源" prop="name">
-            <el-select @change="getDataList" placeholder="请选择数据源" v-model="state.queryForm.dsName">
-              <el-option label="默认数据源" value="master"></el-option>
-              <el-option :key="ds.id" :label="ds.name" :value="ds.name" v-for="ds in datasourceList"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="$t('table.tableName')" prop="tableName">
-            <el-input :placeholder="$t('table.inputtableNameTip')" v-model="state.queryForm.tableName"/>
-          </el-form-item>
-          <el-form-item>
-            <el-button @click="getDataList" icon="search" type="primary">
-              {{ $t('common.queryBtn') }}
-            </el-button>
-            <el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <right-toolbar
-              :export="true"
-              @exportExcel="exportExcel"
-              @queryTable="getDataList"
-              class="ml10"
-              style="float: right; margin-right: 20px"
-              v-model:showSearch="showSearch"
-          ></right-toolbar>
-        </div>
-      </el-row>
-      <el-table
-          :data="state.dataList"
-          style="width: 100%"
-          v-loading="state.loading"
-          border
-          :cell-style="tableStyle.cellStyle"
-          :header-cell-style="tableStyle.headerCellStyle"
-      >
-        <el-table-column :label="t('table.index')" type="index" width="60"/>
-        <el-table-column :label="t('table.tableName')" prop="name" show-overflow-tooltip/>
-        <el-table-column :label="t('table.tableDesc')" prop="comment" show-overflow-tooltip/>
-        <el-table-column :label="t('table.createTime')" prop="createTime" show-overflow-tooltip/>
-        <el-table-column :label="$t('common.action')" width="250">
-          <template #default="scope">
-            <el-button icon="Refresh" @click="syncTable(scope.row)" text type="primary">
-              {{ $t('gen.syncBtn') }}
-            </el-button>
-            <el-button icon="FolderOpened" @click="openGen(scope.row)" text type="primary">{{
-                $t('gen.genBtn')
-              }}
-            </el-button>
-            <el-button icon="MagicStick" @click="openDesign(scope.row)" text type="primary">{{
-                $t('gen.designBtn')
-              }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"/>
-    </div>
-  </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row class="ml10" v-show="showSearch">
+				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+					<el-form-item label="数据源" prop="name">
+						<el-select @change="getDataList" placeholder="请选择数据源" v-model="state.queryForm.dsName">
+							<el-option label="默认数据源" value="master"></el-option>
+							<el-option :key="ds.id" :label="ds.name" :value="ds.name" v-for="ds in datasourceList"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="$t('table.tableName')" prop="tableName">
+						<el-input :placeholder="$t('table.inputtableNameTip')" v-model="state.queryForm.tableName" />
+					</el-form-item>
+					<el-form-item>
+						<el-button @click="getDataList" icon="search" type="primary">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<right-toolbar
+						:export="true"
+						@exportExcel="exportExcel"
+						@queryTable="getDataList"
+						class="ml10"
+						style="float: right; margin-right: 20px"
+						v-model:showSearch="showSearch"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				style="width: 100%"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+			>
+				<el-table-column :label="t('table.index')" type="index" width="60" />
+				<el-table-column :label="t('table.tableName')" prop="name" show-overflow-tooltip />
+				<el-table-column :label="t('table.tableDesc')" prop="comment" show-overflow-tooltip />
+				<el-table-column :label="t('table.createTime')" prop="createTime" show-overflow-tooltip />
+				<el-table-column :label="$t('common.action')" width="250">
+					<template #default="scope">
+						<el-button icon="Refresh" @click="syncTable(scope.row)" text type="primary">
+							{{ $t("gen.syncBtn") }}
+						</el-button>
+						<el-button icon="FolderOpened" @click="openGen(scope.row)" text type="primary">{{ $t("gen.genBtn") }} </el-button>
+						<el-button icon="MagicStick" @click="openDesign(scope.row)" text type="primary">{{ $t("gen.designBtn") }} </el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination" />
+		</div>
+	</div>
 </template>
 
 <script lang="ts" name="systemTable" setup>
-import {BasicTableProps, useTable} from '/@/hooks/table';
-import {fetchList, useSyncTableApi, useTableApi} from '/@/api/gen/table';
-import {list} from '/@/api/gen/datasource';
-import {useMessage} from '/@/hooks/message';
-import {useI18n} from 'vue-i18n';
-import {validateNull} from '/@/utils/validate';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, useSyncTableApi, useTableApi } from "/@/api/gen/table"
+import { list } from "/@/api/gen/datasource"
+import { useMessage } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
+import { validateNull } from "/@/utils/validate"
 
 // 定义变量内容
-const router = useRouter();
+const router = useRouter()
 // 引入组件
-const {t} = useI18n();
+const { t } = useI18n()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const datasourceList = ref();
+const datasourceList = ref()
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {
-    dsName: 'master',
-  },
-  pageList: fetchList,
-  createdIsNeed: false,
-});
+	queryForm: {
+		dsName: "master",
+	},
+	pageList: fetchList,
+	createdIsNeed: false,
+})
 
 //  table hook
-const {getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle} = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 初始化数据
 onMounted(() => {
-  list().then((res) => {
-    datasourceList.value = res.data;
-    // 默认去第一个数据源
-    if (datasourceList.value.length > 0) {
-      state.queryForm.dsName = datasourceList.value[0].name;
-    }
-    getDataList();
-  });
-});
+	list().then((res) => {
+		datasourceList.value = res.data
+		// 默认去第一个数据源
+		if (datasourceList.value.length > 0) {
+			state.queryForm.dsName = datasourceList.value[0].name
+		}
+		getDataList()
+	})
+})
 
 const openGen = (row) => {
-  useTableApi(state.queryForm.dsName, row.name)
-      .then((res) => {
-        if (validateNull(res.data.fieldList)) {
-          syncTable(row);
-        }
-      })
-      .finally(() => {
-        router.push({
-          path: '/gen/gener/index',
-          query: {
-            tableName: row.name,
-            dsName: state.queryForm.dsName,
-          },
-        });
-      });
-};
+	useTableApi(state.queryForm.dsName, row.name)
+		.then((res) => {
+			if (validateNull(res.data.fieldList)) {
+				syncTable(row)
+			}
+		})
+		.finally(() => {
+			router.push({
+				path: "/gen/gener/index",
+				query: {
+					tableName: row.name,
+					dsName: state.queryForm.dsName,
+				},
+			})
+		})
+}
 
 const openDesign = (row) => {
-  router.push({
-    path: '/gen/design/index',
-    query: {
-      tableName: row.name,
-      dsName: state.queryForm.dsName,
-    },
-  });
-};
+	router.push({
+		path: "/gen/design/index",
+		query: {
+			tableName: row.name,
+			dsName: state.queryForm.dsName,
+		},
+	})
+}
 
 // 同步表数据
 const syncTable = (row) => {
-  useSyncTableApi(state.queryForm.dsName, row.name).then(() => {
-    useMessage().success(t('common.optSuccessText'));
-  });
-};
+	useSyncTableApi(state.queryForm.dsName, row.name).then(() => {
+		useMessage().success(t("common.optSuccessText"))
+	})
+}
 
 // 清空搜索条件
 const resetQuery = () => {
-  queryRef.value.resetFields();
-  getDataList();
-};
+	queryRef.value.resetFields()
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/gen/table/export', state.queryForm, 'table.xlsx');
-};
+	downBlobFile("/gen/table/export", state.queryForm, "代码生成.xlsx")
+}
 </script>
diff --git a/src/views/gen/template/index.vue b/src/views/gen/template/index.vue
index 8ac7b7e..d556a5d 100644
--- a/src/views/gen/template/index.vue
+++ b/src/views/gen/template/index.vue
@@ -1,164 +1,159 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row class="ml10" v-show="showSearch">
-        <el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
-          <el-form-item :label="$t('template.templateName')" prop="templateName">
-            <el-input :placeholder="t('template.inputTemplateNameTip')" style="max-width: 180px"
-                      v-model="state.queryForm.templateName"/>
-          </el-form-item>
-          <el-form-item>
-            <el-button @click="getDataList" formDialogRef icon="search" type="primary">
-              {{ $t('common.queryBtn') }}
-            </el-button>
-            <el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary"
-                     v-auth="'codegen_template_add'">
-            {{ $t('common.addBtn') }}
-          </el-button>
-          <el-button
-              plain
-              :disabled="multiple"
-              @click="handleDelete(selectObjs)"
-              class="ml10"
-              icon="Delete"
-              type="primary"
-              v-auth="'codegen_template_del'"
-          >
-            {{ $t('common.delBtn') }}
-          </el-button>
-          <el-button @click="onlineUpdate" class="ml10" icon="download" plain :disabled="updateDisabled"
-                     v-auth="'codegen_template_add'">
-            更新
-          </el-button>
-          <right-toolbar
-              :export="'codegen_template_export'"
-              @exportExcel="exportExcel"
-              @queryTable="getDataList"
-              class="ml10"
-              style="float: right; margin-right: 20px"
-              v-model:showSearch="showSearch"
-          ></right-toolbar>
-        </div>
-      </el-row>
-      <el-table
-          :data="state.dataList"
-          @selection-change="handleSelectionChange"
-          style="width: 100%"
-          v-loading="state.loading"
-          border
-          :cell-style="tableStyle.cellStyle"
-          :header-cell-style="tableStyle.headerCellStyle"
-      >
-        <el-table-column align="center" type="selection" width="40"/>
-        <el-table-column :label="t('template.index')" type="index" width="60"/>
-        <el-table-column :label="t('template.templateName')" prop="templateName" show-overflow-tooltip/>
-        <el-table-column :label="t('template.generatorPath')" prop="generatorPath" show-overflow-tooltip/>
-        <el-table-column :label="t('template.desc')" prop="templateDesc" show-overflow-tooltip/>
-        <el-table-column :label="t('template.createTime')" prop="createTime" show-overflow-tooltip/>
-        <el-table-column :label="$t('common.action')" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.id)" text type="primary"
-                       v-auth="'codegen_template_edit'"
-            >{{ $t('common.editBtn') }}
-            </el-button>
-            <el-button icon="delete" @click="handleDelete([scope.row.id])" text type="primary"
-                       v-auth="'codegen_template_del'"
-            >{{ $t('common.delBtn') }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"/>
-    </div>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row class="ml10" v-show="showSearch">
+				<el-form :inline="true" :model="state.queryForm" @keyup.enter="getDataList" ref="queryRef">
+					<el-form-item :label="$t('template.templateName')" prop="templateName">
+						<el-input :placeholder="t('template.inputTemplateNameTip')" style="max-width: 180px" v-model="state.queryForm.templateName" />
+					</el-form-item>
+					<el-form-item>
+						<el-button @click="getDataList" formDialogRef icon="search" type="primary">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button @click="resetQuery" formDialogRef icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary" v-auth="'codegen_template_add'">
+						{{ $t("common.addBtn") }}
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						@click="handleDelete(selectObjs)"
+						class="ml10"
+						icon="Delete"
+						type="primary"
+						v-auth="'codegen_template_del'"
+					>
+						{{ $t("common.delBtn") }}
+					</el-button>
+					<el-button @click="onlineUpdate" class="ml10" icon="download" plain :disabled="updateDisabled" v-auth="'codegen_template_add'">
+						更新
+					</el-button>
+					<right-toolbar
+						:export="'codegen_template_export'"
+						@exportExcel="exportExcel"
+						@queryTable="getDataList"
+						class="ml10"
+						style="float: right; margin-right: 20px"
+						v-model:showSearch="showSearch"
+					></right-toolbar>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				@selection-change="handleSelectionChange"
+				style="width: 100%"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+			>
+				<el-table-column align="center" type="selection" width="40" />
+				<el-table-column :label="t('template.index')" type="index" width="60" />
+				<el-table-column :label="t('template.templateName')" prop="templateName" show-overflow-tooltip />
+				<el-table-column :label="t('template.generatorPath')" prop="generatorPath" show-overflow-tooltip />
+				<el-table-column :label="t('template.desc')" prop="templateDesc" show-overflow-tooltip />
+				<el-table-column :label="t('template.createTime')" prop="createTime" show-overflow-tooltip />
+				<el-table-column :label="$t('common.action')" width="150">
+					<template #default="scope">
+						<el-button icon="edit-pen" @click="formDialogRef.openDialog(scope.row.id)" text type="primary" v-auth="'codegen_template_edit'"
+							>{{ $t("common.editBtn") }}
+						</el-button>
+						<el-button icon="delete" @click="handleDelete([scope.row.id])" text type="primary" v-auth="'codegen_template_del'"
+							>{{ $t("common.delBtn") }}
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination" />
+		</div>
 
-    <!-- 编辑、新增  -->
-    <form-dialog @refresh="getDataList()" ref="formDialogRef"/>
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog @refresh="getDataList()" ref="formDialogRef" />
+	</div>
 </template>
 
 <script lang="ts" name="systemGenTemplate" setup>
-import {BasicTableProps, useTable} from '/@/hooks/table';
-import {delObjs, fetchList, online} from '/@/api/gen/template';
-import {useMessage, useMessageBox} from '/@/hooks/message';
-import {useI18n} from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList, online } from "/@/api/gen/template"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const {t} = useI18n();
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const { t } = useI18n()
 // 定义查询字典
 
 // 定义变量内容
-const formDialogRef = ref();
-const updateDisabled = ref(false);
+const formDialogRef = ref()
+const updateDisabled = ref(false)
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList,
-  descs: ['create_time'],
-});
+	queryForm: {},
+	pageList: fetchList,
+	descs: ["create_time"],
+})
 
 //  table hook
-const {getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle} = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value.resetFields();
-  // 清空多选
-  selectObjs.value = [];
-  getDataList();
-};
+	// 清空搜索条件
+	queryRef.value.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/gen/template/export', state.queryForm, 'template.xlsx');
-};
+	downBlobFile("/gen/template/export", state.queryForm, "模板管理.xlsx")
+}
 
 // 多选事件
 const handleSelectionChange = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm(t('common.delConfirmText'));
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm(t("common.delConfirmText"))
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success(t('common.delSuccessText'));
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 const onlineUpdate = async () => {
-  try {
-    updateDisabled.value = true;
-    const {data} = await online();
-    getDataList();
-    useMessage().success(data);
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  } finally {
-    updateDisabled.value = false;
-  }
-};
+	try {
+		updateDisabled.value = true
+		const { data } = await online()
+		getDataList()
+		useMessage().success(data)
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		updateDisabled.value = false
+	}
+}
 </script>
diff --git a/src/views/hard/hard-after-sale/index.vue b/src/views/hard/hard-after-sale/index.vue
index 3cd7656..fb25434 100644
--- a/src/views/hard/hard-after-sale/index.vue
+++ b/src/views/hard/hard-after-sale/index.vue
@@ -131,7 +131,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hardAfterSale/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardAfterSale.xlsx")
+	downBlobFile("/hard/hardAfterSale/export", Object.assign(state.queryForm, { ids: selectObjs }), "售后订单.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/hard/hard-group/index.vue b/src/views/hard/hard-group/index.vue
index 71d5a4a..dd6ef9f 100644
--- a/src/views/hard/hard-group/index.vue
+++ b/src/views/hard/hard-group/index.vue
@@ -107,7 +107,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hardGroup/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardGroup.xlsx")
+	downBlobFile("/hard/hardGroup/export", Object.assign(state.queryForm, { ids: selectObjs }), "设备分组.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/hard/hard-invoice/index.vue b/src/views/hard/hard-invoice/index.vue
index 869ce68..f41cccd 100644
--- a/src/views/hard/hard-invoice/index.vue
+++ b/src/views/hard/hard-invoice/index.vue
@@ -169,7 +169,7 @@ const doRefund = (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hardInvoice/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardInvoice.xlsx")
+	downBlobFile("/hard/hardInvoice/export", Object.assign(state.queryForm, { ids: selectObjs }), "开票记录.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/hard/hard-manager/index.vue b/src/views/hard/hard-manager/index.vue
index 1c60502..29c2b83 100644
--- a/src/views/hard/hard-manager/index.vue
+++ b/src/views/hard/hard-manager/index.vue
@@ -158,7 +158,7 @@ const changeTakeFood = async (e: any, row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hardManager/export", Object.assign(state.queryForm, { ids: selectObjs }), "hardManager.xlsx")
+	downBlobFile("/hard/hardManager/export", Object.assign(state.queryForm, { ids: selectObjs }), "设备列表.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index 59aec02..bb29371 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -49,7 +49,7 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
-				:show-summary="false"
+				show-summary
 				:summary-method="getSummaries"
 			>
 				<el-table-column type="selection" width="60" align="center" />
@@ -186,10 +186,25 @@
 				<el-table-column fixed="right" label="操作" width="200">
 					<template #default="{ row }">
 						<div class="grid grid-cols-2 justify-between">
-							<el-button icon="Printer" text type="primary" @click="print(row)" v-auth="'hard_hardInvoice_admin_print'">
+							<el-button
+								v-if="row.orderType !== '5'"
+								icon="Printer"
+								text
+								type="primary"
+								@click="print(row)"
+								v-auth="'hard_hardInvoice_admin_print'"
+							>
 								打印发票
 							</el-button>
-							<el-button icon="ShoppingCartFull" text type="primary" @click="shopCarDialogRef.openDialog(row.id)"> 购物车 </el-button>
+							<el-button
+								v-if="row.orderType !== '5'"
+								icon="ShoppingCartFull"
+								text
+								type="primary"
+								@click="shopCarDialogRef.openDialog(row.id)"
+							>
+								购物车
+							</el-button>
 							<el-button icon="Money" link type="primary" @click="transactionListRef.openDialog(row.walletId)"> 钱包明细 </el-button>
 							<el-button icon="InfoFilled" link type="primary" v-auth="'wallet_walletTransaction_update_balance'" @click="doRefund(row)">
 								订单详情
@@ -204,19 +219,21 @@
 							@click="formDialogRef.openDialog(row.id)"
 							>编辑
 						</el-button>
-						<el-button
-							v-if="!row.payRefundId"
-							icon="stamp"
-							text
-							type="primary"
-							v-auth="'hard_hardAfterSale_adminRefund'"
-							@click="adminRefundDailogRef.openDialog(row.id)"
-						>
-							退款
+						<div v-if="row.orderType !== '5'">
+							<el-button
+								v-if="!row.payRefundId"
+								icon="stamp"
+								text
+								type="primary"
+								v-auth="'hard_hardAfterSale_adminRefund'"
+								@click="adminRefundDailogRef.openDialog(row.id)"
+							>
+								退款
+							</el-button>
+						</div>
+						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'" @click="handleDelete([row.id])">
+							删除
 						</el-button>
-						<el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardwareOrder_del'" @click="handleDelete([row.id])"
-							>删除</el-button
-						>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -351,7 +368,7 @@ const handleGetSelectNode = (curClickedNode: any, checkedTreeNodes: any, isDeepT
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/hard/hard-order/export", Object.assign(state.queryForm, { ids: selectObjs }), "订单.xlsx")
+	downBlobFile("/hard/hard-order/export", Object.assign(state.queryForm, { ids: selectObjs }), "订单记录.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index a280d64..3d318d1 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -51,66 +51,66 @@
 </template>
 
 <script setup lang="ts" name="systemMchManage">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '../../../api/mch/mch-manage';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "../../../api/mch/mch-manage"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/mch/mchManage/export', Object.assign(state.queryForm, { ids: selectObjs }), 'mchManage.xlsx');
-};
+	downBlobFile("/mch/mchManage/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/supermarket/smSpu/index.vue b/src/views/supermarket/smSpu/index.vue
index e130b9c..5010628 100644
--- a/src/views/supermarket/smSpu/index.vue
+++ b/src/views/supermarket/smSpu/index.vue
@@ -16,13 +16,7 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'supermarket_smSpu_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'supermarket_smSpu_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -74,20 +68,10 @@
 				<el-table-column prop="salesCount" label="销量" show-overflow-tooltip />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'supermarket_smSpu_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_smSpu_edit'" @click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
 						>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'supermarket_smSpu_del'"
-							@click="handleDelete([scope.row.id])"
+						<el-button icon="delete" text type="primary" v-auth="'supermarket_smSpu_del'" @click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
 					</template>
@@ -127,8 +111,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -141,7 +124,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "smSpu.xlsx")
+	downBlobFile("/supermarket/smSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "线上超市商品.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/components/linkCodeDialog.vue b/src/views/supermarketerp/components/linkCodeDialog.vue
index 5b10d8e..569c625 100644
--- a/src/views/supermarketerp/components/linkCodeDialog.vue
+++ b/src/views/supermarketerp/components/linkCodeDialog.vue
@@ -17,7 +17,11 @@
 			<vxe-column field="planDate" title="单据日期" align="center" width="200"></vxe-column>
       <vxe-column field="productName" title="商品名称" align="center" width="200"></vxe-column>
 			<vxe-column field="handlerUserId" title="经办人" align="center" width="100"></vxe-column>
-<!--			<vxe-column field="checkStatus" title="审批状态" align="center" width="100"></vxe-column>-->
+			<vxe-column field="checkStatus" title="审批状态" align="center" width="100">
+				<template #default="{ row }">
+					<dict-tag :options="check_status" :value="row.checkStatus" />
+				</template>
+			</vxe-column>
 			<vxe-column field="remark" title="备注" show-overflow align="center" min-width="100"></vxe-column>
 		</vxe-table>
 		<!-- <pagination
@@ -57,7 +61,9 @@
 <script setup lang="ts" name="linkCgCodeDialog">
 import { ref } from "vue"
 import { VxeTableEvents } from "vxe-table"
+import { useDict } from "/@/hooks/dict"
 
+const { check_status } = useDict("check_status")
 const linkCodeDialogVisible = defineModel()
 const emit = defineEmits(["getSelectedLinkCode"])
 const props = withDefaults(
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
index 204e5e5..cd0f36a 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgBack/index.vue
@@ -149,7 +149,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpCgInventory.xlsx")
+	// downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购退货.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
index b162d90..5f06037 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgDd/index.vue
@@ -105,7 +105,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpCgDd/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpCgDd.xlsx")
+	downBlobFile("/supermarket/smErpCgDd/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购订单.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
index f5fb5c7..5f0d23a 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgInventory/index.vue
@@ -149,7 +149,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpCgInventory.xlsx")
+	downBlobFile("/supermarket/smErpInventoryRecords/export", Object.assign(state.queryForm, { ids: selectObjs }), "采购入库.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
index 8dde4b3..0d7160b 100644
--- a/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
+++ b/src/views/supermarketerp/purchaseManagement/smErpCgPlan/index.vue
@@ -120,7 +120,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpCgPlan/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpCgPlan.xlsx")
+	downBlobFile("/supermarket/smErpCgPlan/export", Object.assign(state.queryForm, { ids: selectObjs }), "补货申请.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
index d2119c1..f319a00 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailBack/index.vue
@@ -147,7 +147,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpRetailBack/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpRetailBack.xlsx")
+	downBlobFile("/supermarket/smErpRetailBack/export", Object.assign(state.queryForm, { ids: selectObjs }), "零售退货.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
index 5c78ec7..2cee503 100644
--- a/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
+++ b/src/views/supermarketerp/retailManagement/smErpRetailDelivery/index.vue
@@ -149,7 +149,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/smErpRetailDelivery/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpRetailDelivery.xlsx")
+	downBlobFile("/supermarket/smErpRetailDelivery/export", Object.assign(state.queryForm, { ids: selectObjs }), "零售出库.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/smErpInventoryWarning/index.vue b/src/views/supermarketerp/smErpInventoryWarning/index.vue
index d146a1b..d9ecfe9 100644
--- a/src/views/supermarketerp/smErpInventoryWarning/index.vue
+++ b/src/views/supermarketerp/smErpInventoryWarning/index.vue
@@ -53,21 +53,21 @@
 						<el-tag type="danger" v-if="scope.row.warnType == 2">库存超额</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="160" />
-				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip>
+				<el-table-column prop="barcode" label="条码" show-overflow-tooltip min-width="120" />
+				<el-table-column prop="categoryId" label="分类" show-overflow-tooltip min-width="100">
 					<template #default="scope">
 						{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
 					</template>
 				</el-table-column>
-				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="100" />
-				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="100" />
+				<el-table-column prop="inventoryLowerLimit" label="库存下限" show-overflow-tooltip min-width="90" />
+				<el-table-column prop="inventoryUpperLimit" label="库存上限" show-overflow-tooltip min-width="90" />
+				<el-table-column prop="packageNum" label="内装数量" show-overflow-tooltip min-width="90" />
 				<el-table-column prop="picUrl" label="商品图" show-overflow-tooltip>
 					<template #default="scope">
 						<preview-image :src="scope.row.picUrl" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="160" />
+				<el-table-column prop="productCode" label="货号" show-overflow-tooltip min-width="120" />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
@@ -106,7 +106,7 @@ const selectionChangHandle = (objs: { supplierId: string }[]) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarketerp/smErpInventoryWarning/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpSupplier.xlsx")
+	downBlobFile("/supermarketerp/smErpInventoryWarning/export", Object.assign(state.queryForm, { ids: selectObjs }), "库存预警.xlsx")
 }
 
 onMounted(async () => {
diff --git a/src/views/supermarketerp/smErpSupplier/index.vue b/src/views/supermarketerp/smErpSupplier/index.vue
index 2a9a113..93568db 100644
--- a/src/views/supermarketerp/smErpSupplier/index.vue
+++ b/src/views/supermarketerp/smErpSupplier/index.vue
@@ -168,7 +168,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarketerp/smErpSupplier/export", Object.assign(state.queryForm, { ids: selectObjs }), "smErpSupplier.xlsx")
+	downBlobFile("/supermarketerp/smErpSupplier/export", Object.assign(state.queryForm, { ids: selectObjs }), "货商管理.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/smErpSupplierType/index.vue b/src/views/supermarketerp/smErpSupplierType/index.vue
index ef2ecca..d0266a0 100644
--- a/src/views/supermarketerp/smErpSupplierType/index.vue
+++ b/src/views/supermarketerp/smErpSupplierType/index.vue
@@ -73,7 +73,13 @@
 						>
 							编辑
 						</el-button>
-						<el-button icon="delete" text type="primary" v-auth="'supermarketerp_smErpSupplierType_del'" @click="handleDelete([scope.row.id])">
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'supermarketerp_smErpSupplierType_del'"
+							@click="handleDelete([scope.row.id])"
+						>
 							删除
 						</el-button>
 					</template>
@@ -88,66 +94,66 @@
 </template>
 
 <script setup lang="ts" name="systemSmErpSupplierType">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/@/api/supermarketerp/smErpSupplierType';
-import { useMessage, useMessageBox } from '/@/hooks/message';
-import { useDict } from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/@/api/supermarketerp/smErpSupplierType"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 // 定义查询字典
 
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/supermarketerp/smErpSupplierType/export', Object.assign(state.queryForm, { ids: selectObjs }), 'smErpSupplierType.xlsx');
-};
+	downBlobFile("/supermarketerp/smErpSupplierType/export", Object.assign(state.queryForm, { ids: selectObjs }), "货商类别.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/supermarketerp/supermarketAuxiliaryCode/index.vue b/src/views/supermarketerp/supermarketAuxiliaryCode/index.vue
index c4e0776..75f3f96 100644
--- a/src/views/supermarketerp/supermarketAuxiliaryCode/index.vue
+++ b/src/views/supermarketerp/supermarketAuxiliaryCode/index.vue
@@ -71,7 +71,12 @@
 							@click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
 						>
-						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketAuxiliaryCode_del'" @click="handleDelete([scope.row.id])"
+						<el-button
+							icon="delete"
+							text
+							type="primary"
+							v-auth="'supermarket_supermarketAuxiliaryCode_del'"
+							@click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
 					</template>
@@ -86,64 +91,64 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketAuxiliaryCode">
-import { BasicTableProps, useTable } from '/@/hooks/table';
-import { fetchList, delObjs } from '/src/api/supermarketerp/supermarketAuxiliaryCode';
-import { useMessage, useMessageBox } from '/@/hooks/message';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { fetchList, delObjs } from "/src/api/supermarketerp/supermarketAuxiliaryCode"
+import { useMessage, useMessageBox } from "/@/hooks/message"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/supermarket/supermarketAuxiliaryCode/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketAuxiliaryCode.xlsx');
-};
+	downBlobFile("/supermarket/supermarketAuxiliaryCode/export", Object.assign(state.queryForm, { ids: selectObjs }), "辅助条码管理.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/supermarketerp/supermarketBrand/index.vue b/src/views/supermarketerp/supermarketBrand/index.vue
index d700249..5b46939 100644
--- a/src/views/supermarketerp/supermarketBrand/index.vue
+++ b/src/views/supermarketerp/supermarketBrand/index.vue
@@ -78,13 +78,7 @@
 						>
 							编辑
 						</el-button>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'supermarket_supermarketBrand_del'"
-							@click="handleDelete([scope.row.id])"
-						>
+						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketBrand_del'" @click="handleDelete([scope.row.id])">
 							删除
 						</el-button>
 					</template>
@@ -123,8 +117,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -137,11 +130,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
-		"/supermarket/supermarketBrand/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"supermarketBrand.xlsx",
-	)
+	downBlobFile("/supermarket/supermarketBrand/export", Object.assign(state.queryForm, { ids: selectObjs }), "商品品牌.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/supermarketCategory/index.vue b/src/views/supermarketerp/supermarketCategory/index.vue
index 5b726e6..22ab7a1 100644
--- a/src/views/supermarketerp/supermarketCategory/index.vue
+++ b/src/views/supermarketerp/supermarketCategory/index.vue
@@ -125,8 +125,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -139,11 +138,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile(
-		"/supermarket/supermarketCategory/export",
-		Object.assign(state.queryForm, { ids: selectObjs }),
-		"supermarketCategory.xlsx",
-	)
+	downBlobFile("/supermarket/supermarketCategory/export", Object.assign(state.queryForm, { ids: selectObjs }), "商品分类.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue b/src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
similarity index 69%
rename from src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue
rename to src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
index 96ade3b..51580da 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketAuxiliaryCode.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/auxiliaryCode.vue
@@ -13,7 +13,7 @@
 			:column-config="{ resizable: true }"
 			:row-config="{ isHover: true }"
 			:resizable-config="{ dragMode: 'fixed' }"
-			:data="supermarketAuxiliaryCodeEntityList"
+			:data="auxiliaryCodeList"
 			:edit-config="{
 					trigger: 'click',
 					mode: 'cell',
@@ -32,20 +32,20 @@
 			<vxe-column type="seq" width="50" fixed="left" />
 			<vxe-column field="unit" title="单位" :edit-render="{}">
 				<template #edit="{ row }">
-					<el-select v-model="row.unit">
+					<el-select v-model="row.unitId">
 						<div v-for="item in smErpUnitEntityList">
-							<el-option v-if="item.unit !== ''" :label="item.unit" :value="item.unit" />
+							<el-option :label="item.unit" :value="item.id" />
 						</div>
 					</el-select>
 				</template>
 				<template #default="{ row }">
-					<span v-if="row.unit">{{ row.unit }}</span>
+					<span v-if="row.unitId">{{ smErpUnitEntityList?.find((item) => item.id === row.unitId)?.unit }}</span>
 					<span v-else style="color: #c0c4cf">请选择</span>
 				</template>
 			</vxe-column>
 			<vxe-column field="barCode" title="条码">
 				<template #default="{ row }">
-					{{ smErpUnitEntityList?.find((item: any) => item.unit == row.unit)?.barCode }}
+					{{ smErpUnitEntityList?.find((item) => item.id == row.unitId)?.barCode }}
 				</template>
 			</vxe-column>
 		</vxe-table>
@@ -54,36 +54,53 @@
 
 <script setup lang="ts">
 import { nanoid } from "nanoid"
+import { useMessage } from "/@/hooks/message"
+import { rowVU } from "./packageUnit.vue"
 
-const supermarketAuxiliaryCodeEntityList = defineModel("supermarketAuxiliaryCodeEntityList", {
+export interface rowVC {
+	id: string
+	unitId: string
+	barCode: string
+	isNew?: boolean
+}
+
+const auxiliaryCodeList = defineModel("modelValue", {
 	default: [
 		{
 			id: nanoid(5),
-			unit: "",
+			unitId: "",
 			barCode: "",
 		},
 	],
 })
 
-defineProps<{
-	smErpUnitEntityList: any[]
-}>()
+const props = withDefaults(
+	defineProps<{
+		smErpUnitEntityList?: rowVU[]
+	}>(),
+	{
+		smErpUnitEntityList: [] as any,
+	},
+)
 
 const editableTableRef = ref()
+
 // const validRules = {
 // 	unit: [{ required: true, message: "包装单位不能为空", trigger: "blur" }],
-// 	// barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
+// 	barCode: [{ required: true, message: "条码不能为空", trigger: "blur" }],
 // }
 
 // 底部表格行新增
 const pushEvent = () => {
-	const newRow: any = {
+	if (props.smErpUnitEntityList?.length === 0) return useMessage().warning("请先添加包装单位")
+
+	const newRow: rowVC = {
 		id: nanoid(5),
-		unit: "",
+		unitId: "",
 		barCode: "",
 		isNew: true,
 	}
-	supermarketAuxiliaryCodeEntityList.value.push(newRow)
+	auxiliaryCodeList.value.push(newRow)
 	nextTick(() => {
 		const $table = editableTableRef.value
 		if ($table) {
@@ -98,9 +115,7 @@ const removeSelectRowEvent = () => {
 	if ($table) {
 		const selectRecords = $table.getCheckboxRecords()
 		if (selectRecords.length > 0) {
-			supermarketAuxiliaryCodeEntityList.value = supermarketAuxiliaryCodeEntityList.value.filter(
-				(item: any) => !selectRecords.some((row: any) => row.id === item.id),
-			)
+			auxiliaryCodeList.value = auxiliaryCodeList.value.filter((item: rowVC) => !selectRecords.some((row: rowVC) => row.id === item.id))
 		}
 	}
 }
diff --git a/src/views/supermarketerp/supermarketSpu/components/baseInfo.vue b/src/views/supermarketerp/supermarketSpu/components/baseInfo.vue
new file mode 100644
index 0000000..38e6995
--- /dev/null
+++ b/src/views/supermarketerp/supermarketSpu/components/baseInfo.vue
@@ -0,0 +1,142 @@
+<template>
+	<el-row>
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="商户" prop="merchantId">-->
+		<!--								<select-mch v-model="form.merchantId" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<el-col :span="12" class="mb20">
+			<el-form-item label="货号" prop="productCode">
+				<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
+			</el-form-item>
+		</el-col>
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="自编码/条码" prop="barcode">-->
+		<!--								<el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<el-col :span="12" class="mb20">
+			<el-form-item label="商品名称" prop="productName">
+				<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
+			</el-form-item>
+		</el-col>
+		<el-col :span="12" class="mb20">
+			<el-form-item label="货商" prop="supplierId">
+				<select-supplier v-model="form.supplierId" />
+			</el-form-item>
+		</el-col>
+		<el-col :span="12" class="mb20">
+			<el-form-item label="商品分类" prop="categoryId">
+				<el-select v-model="form.categoryId" placeholder="请选择商品分类">
+					<el-option v-for="item in categoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
+				</el-select>
+			</el-form-item>
+		</el-col>
+		<el-col :span="12" class="mb20">
+			<el-form-item label="品牌" prop="brandId">
+				<el-select v-model="form.brandId" placeholder="请选择品牌">
+					<el-option v-for="item in brandOptions" :key="item.id" :label="item.name" :value="item.id" />
+				</el-select>
+			</el-form-item>
+		</el-col>
+		<el-col :span="12" class="mb20">
+			<el-form-item label="商品性质" prop="productNature">
+				<el-select v-model="form.productNature" placeholder="请选择商品性质">
+					<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
+				</el-select>
+			</el-form-item>
+		</el-col>
+		<el-col :span="24" class="mb20">
+			<el-form-item label="商品封面图" prop="picUrl">
+				<upload-img v-model:imageUrl="form.picUrl"></upload-img>
+			</el-form-item>
+		</el-col>
+
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="单位" prop="unit">-->
+		<!--								&lt;!&ndash;                <el-alert type="warning" show-icon>&ndash;&gt;-->
+		<!--								&lt;!&ndash;                  <p>最小售卖的基本单位</p>&ndash;&gt;-->
+		<!--								&lt;!&ndash;                </el-alert>&ndash;&gt;-->
+		<!--								<el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<!--						<el-col :span="14" class="mb20">-->
+		<!--							<el-form-item label="内装数" prop="packageNum">-->
+		<!--								&lt;!&ndash;                <el-alert type="warning" show-icon >&ndash;&gt;-->
+		<!--								&lt;!&ndash;                  <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
+		<!--								&lt;!&ndash;                    例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
+		<!--								&lt;!&ndash;                </el-alert>&ndash;&gt;-->
+		<!--								<el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="零售价" prop="retailPrice">-->
+		<!--								<el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="进价" prop="purchasePrice">-->
+		<!--								<el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="促销价" prop="promotionPrice">-->
+		<!--								<el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="成本价" prop="costPrice">-->
+		<!--								<el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<el-col :span="24" class="mb20">
+			<el-form-item label="商品状态" prop="status">
+				<el-radio-group v-model="form.status">
+					<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }}</el-radio>
+				</el-radio-group>
+			</el-form-item>
+		</el-col>
+		<!--						<el-col :span="12" class="mb20">-->
+		<!--							<el-form-item label="规格" prop="spec">-->
+		<!--								<el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
+		<!--							</el-form-item>-->
+		<!--						</el-col>-->
+		<el-col :span="12" class="mb20">
+			<el-form-item label="产地" prop="origin">
+				<el-input v-model.trim="form.origin" placeholder="请输入产地" />
+			</el-form-item>
+		</el-col>
+		<el-col :span="12" class="mb20">
+			<el-form-item label="排序字段" prop="sort">
+				<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
+			</el-form-item>
+		</el-col>
+		<el-col :span="12" class="mb20">
+			<el-form-item label="毛利率" prop="grossMargin">
+				<el-input-number v-model="form.grossMargin" :min="0" :precision="2" />
+			</el-form-item>
+		</el-col>
+	</el-row>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from "vue"
+import { useDict } from "/@/hooks/dict"
+import { getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
+
+const form = defineModel<any>("modelValue")
+
+const { supermarket_nature, status } = useDict("supermarket_nature", "status")
+const categoryOptions = ref<any>([]) // 商品分类的下拉选项
+const brandOptions = ref<any>([]) // 超市品牌的下拉选项
+
+onMounted(async () => {
+	// 获取分类下拉选项 & 获取品牌下拉选项
+	const [categoryDict, brandDict] = await Promise.allSettled([getSupermarketCategory(), getSupermarketBrand()]).then((results) =>
+		results.map((result) => (result.status === "fulfilled" ? result.value : null)),
+	)
+
+	categoryDict && categoryDict.code === 0 && (categoryOptions.value = categoryDict.data)
+	brandDict && brandDict.code === 0 && (brandOptions.value = brandDict.data)
+})
+</script>
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue b/src/views/supermarketerp/supermarketSpu/components/packageUnit.vue
similarity index 88%
rename from src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue
rename to src/views/supermarketerp/supermarketSpu/components/packageUnit.vue
index 1f28f04..4439283 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketUnit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/packageUnit.vue
@@ -25,7 +25,7 @@
 			:column-config="{ resizable: true }"
 			:row-config="{ isHover: true }"
 			:resizable-config="{ dragMode: 'fixed' }"
-			:data="supermarketUnitEntityList"
+			:data="packageUnitList"
 			:edit-rules="validRules"
 			:edit-config="{
 					trigger: 'click',
@@ -92,11 +92,7 @@
 					<el-input-number v-model="row.promotionPrice" controls-position="right" :min="0" :precision="2" />
 				</template>
 			</vxe-column>
-			<vxe-column field="costPrice" title="成本价(元)" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
-				<template #edit="{ row }">
-					<el-input-number v-model="row.costPrice" controls-position="right" :min="0" :precision="2" />
-				</template>
-			</vxe-column>
+			<vxe-column field="costPrice" title="成本价(元)" />
 		</vxe-table>
 	</div>
 </template>
@@ -104,7 +100,22 @@
 <script setup lang="ts">
 import { nanoid } from "nanoid"
 
-const supermarketUnitEntityList = defineModel("supermarketUnitEntityList", {
+export interface rowVU {
+	id: string
+	barCode: string
+	spec: string
+	unit: string
+	status: string
+	packageNum: number
+	purchasePrice: number
+	retailPrice: number
+	promotionPrice: number
+	costPrice: number
+	isNew?: boolean
+	isBase?: boolean | null
+}
+
+const packageUnitList = defineModel<rowVU[]>("modelValue", {
 	default: [
 		{
 			id: nanoid(5),
@@ -131,12 +142,11 @@ const validRules = {
 	retailPrice: [{ required: true, message: "零售价不能为空", trigger: "blur" }],
 	purchasePrice: [{ required: true, message: "进价不能为空", trigger: "blur" }],
 	promotionPrice: [{ required: true, message: "促销价不能为空", trigger: "blur" }],
-	// costPrice: [{ required: true, message: "成本价不能为空", trigger: "blur" }],
 }
 
 // 底部表格行新增
 const pushEvent = () => {
-	const newRow: any = {
+	const newRow: rowVU = {
 		id: nanoid(5),
 		barCode: "",
 		spec: "",
@@ -149,7 +159,7 @@ const pushEvent = () => {
 		costPrice: 0,
 		isNew: true,
 	}
-	supermarketUnitEntityList.value.push(newRow)
+	packageUnitList.value.push(newRow)
 	nextTick(() => {
 		const $table = editableTableRef.value
 		if ($table) {
@@ -164,9 +174,7 @@ const removeSelectRowEvent = () => {
 	if ($table) {
 		const selectRecords = $table.getCheckboxRecords()
 		if (selectRecords.length > 0) {
-			supermarketUnitEntityList.value = supermarketUnitEntityList.value.filter(
-				(item: any) => !selectRecords.some((row: any) => row.id === item.id),
-			)
+			packageUnitList.value = packageUnitList.value.filter((item: rowVU) => !selectRecords.some((row: rowVU) => row.id === item.id))
 		}
 	}
 }
@@ -184,7 +192,7 @@ const getRadioEvent = () => {
 const setRadioRow = (index: number) => {
 	const $table = editableTableRef.value
 	if ($table) {
-		$table.setRadioRow(supermarketUnitEntityList.value[index])
+		$table.setRadioRow(packageUnitList.value[index])
 	}
 }
 
diff --git a/src/views/supermarketerp/supermarketSpu/components/productInventory.vue b/src/views/supermarketerp/supermarketSpu/components/productInventory.vue
new file mode 100644
index 0000000..e5d5ad0
--- /dev/null
+++ b/src/views/supermarketerp/supermarketSpu/components/productInventory.vue
@@ -0,0 +1,31 @@
+<template>
+	<el-row>
+		<el-col :span="24" class="mb20">
+			<el-form-item label="总库存" prop="stock" class="flex w-full h-full">
+				<el-input-number v-model="stock" :min="0" :precision="0" />
+			</el-form-item>
+		</el-col>
+
+		<el-col :span="12" class="mb20">
+			<el-form-item label="库存上限" prop="inventoryUpperLimit">
+				<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="0" />
+			</el-form-item>
+		</el-col>
+
+		<el-col :span="12" class="mb20">
+			<el-form-item label="库存下限" prop="inventoryLowerLimit">
+				<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="0" />
+			</el-form-item>
+		</el-col>
+
+		<el-alert type="warning" show-icon :closable="false">
+			注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖
+		</el-alert>
+	</el-row>
+</template>
+
+<script setup lang="ts">
+const stock = defineModel<number | null>("stock", { default: 0 })
+const inventoryUpperLimit = defineModel<number | null>("inventoryUpperLimit", { default: 0 })
+const inventoryLowerLimit = defineModel<number | null>("inventoryLowerLimit", { default: 0 })
+</script>
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue
deleted file mode 100644
index 6f504b7..0000000
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-	<div class="w-full h-full">
-		<el-tooltip effect="light" placement="right">
-			<template #content>
-				<el-alert class="w-[500px] h-24" type="warning" show-icon :closable="false">
-					<p>注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖</p>
-				</el-alert>
-			</template>
-			<el-icon class="text-xl my-auto ml-4 text-yellow-600"><WarningFilled /></el-icon>
-		</el-tooltip>
-
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px">
-			<el-row>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="总库存" prop="stock" class="flex w-full h-full">
-						<el-input-number v-model="stock" :min="0" :precision="0" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="库存上限" prop="inventoryUpperLimit">
-						<el-input-number v-model="inventoryUpperLimit" :min="0" :precision="0" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="库存下限" prop="inventoryLowerLimit">
-						<el-input-number v-model="inventoryLowerLimit" :min="0" :precision="0" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { ref } from "vue"
-const stock = defineModel<number | null>("stock")
-const inventoryUpperLimit = defineModel<number | null>("inventoryUpperLimit")
-const inventoryLowerLimit = defineModel<number | null>("inventoryLowerLimit")
-
-const dataFormRef = ref()
-const form = reactive<{
-	stock: number | null | undefined
-	inventoryUpperLimit: number | null | undefined
-	inventoryLowerLimit: number | null | undefined
-}>({
-	stock: null,
-	inventoryUpperLimit: null,
-	inventoryLowerLimit: null,
-})
-
-watch(
-	() => stock.value,
-	(val) => {
-		form.stock = val
-	},
-	{
-		immediate: true,
-	},
-)
-watch(
-	() => inventoryUpperLimit.value,
-	(val) => {
-		form.inventoryUpperLimit = val
-	},
-	{
-		immediate: true,
-	},
-)
-watch(
-	() => inventoryLowerLimit.value,
-	(val) => {
-		form.inventoryLowerLimit = val
-	},
-	{
-		immediate: true,
-	},
-)
-
-const dataRules = ref({
-	stock: [{ required: true, message: "总库存不能为空", trigger: "blur" }],
-	inventoryUpperLimit: [{ required: true, message: "库存上限不能为空", trigger: "blur" }],
-	inventoryLowerLimit: [{ required: true, message: "库存下限不能为空", trigger: "blur" }],
-})
-
-// 库存校验
-const stockValidate = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
-	return valid
-}
-
-defineExpose({
-	stockValidate,
-})
-</script>
diff --git a/src/views/supermarketerp/supermarketSpu/form.vue b/src/views/supermarketerp/supermarketSpu/form.vue
index 65ad2eb..6234197 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -1,144 +1,22 @@
 <template>
-	<el-dialog width="80%" :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+	<el-dialog width="95%" :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
 		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="auto" v-loading="loading">
 			<el-tabs v-model="tabPaneActiveName" @tab-change="handleTabChange">
-				<el-tab-pane label="基础信息" name="基础信息" style="overflow-y: auto; height: 60vh">
-					<el-row>
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="商户" prop="merchantId">-->
-						<!--								<select-mch v-model="form.merchantId" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<el-col :span="12" class="mb20">
-							<el-form-item label="货号" prop="productCode">
-								<el-input v-model.trim="form.productCode" placeholder="请输入货号" />
-							</el-form-item>
-						</el-col>
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="自编码/条码" prop="barcode">-->
-						<!--								<el-input v-model.trim="form.barcode" placeholder="请输入自编码/条码" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<el-col :span="12" class="mb20">
-							<el-form-item label="商品名称" prop="productName">
-								<el-input v-model.trim="form.productName" placeholder="请输入商品名称" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="货商" prop="supplierId">
-								<select-supplier v-model="form.supplierId" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="商品分类" prop="categoryId">
-								<el-select v-model="form.categoryId" placeholder="请选择商品分类">
-									<el-option v-for="item in categoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="品牌" prop="brandId">
-								<el-select v-model="form.brandId" placeholder="请选择品牌">
-									<el-option v-for="item in brandOptions" :key="item.id" :label="item.name" :value="item.id" />
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="商品性质" prop="productNature">
-								<el-select v-model="form.productNature" placeholder="请选择商品性质">
-									<el-option :value="item.value" :label="item.label" v-for="(item, index) in supermarket_nature" :key="index"></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
-						<el-col :span="24" class="mb20">
-							<el-form-item label="商品封面图" prop="picUrl">
-								<upload-img v-model:imageUrl="form.picUrl"></upload-img>
-							</el-form-item>
-						</el-col>
-
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="单位" prop="unit">-->
-						<!--								&lt;!&ndash;                <el-alert type="warning" show-icon>&ndash;&gt;-->
-						<!--								&lt;!&ndash;                  <p>最小售卖的基本单位</p>&ndash;&gt;-->
-						<!--								&lt;!&ndash;                </el-alert>&ndash;&gt;-->
-						<!--								<el-input placeholder="请输入单位" v-model.trim="form.unit" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="14" class="mb20">-->
-						<!--							<el-form-item label="内装数" prop="packageNum">-->
-						<!--								&lt;!&ndash;                <el-alert type="warning" show-icon >&ndash;&gt;-->
-						<!--								&lt;!&ndash;                  <p>注：内装数据必须为该商品的基本单位的内装数,否则无法完成库存数量转换。&ndash;&gt;-->
-						<!--								&lt;!&ndash;                    例如：零售一瓶矿泉水内装数为1，按一箱售卖矿泉水内装填'24'</p>&ndash;&gt;-->
-						<!--								&lt;!&ndash;                </el-alert>&ndash;&gt;-->
-						<!--								<el-input-number v-model="form.packageNum" :min="0" :precision="0" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="零售价" prop="retailPrice">-->
-						<!--								<el-input-number v-model="form.retailPrice" :min="0" :precision="2" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="进价" prop="purchasePrice">-->
-						<!--								<el-input-number v-model="form.purchasePrice" :min="0" :precision="2" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="促销价" prop="promotionPrice">-->
-						<!--								<el-input-number v-model="form.promotionPrice" :min="0" :precision="2" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="成本价" prop="costPrice">-->
-						<!--								<el-input-number v-model="form.costPrice" :min="0" :precision="2" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<el-col :span="24" class="mb20">
-							<el-form-item label="商品状态" prop="status">
-								<el-radio-group v-model="form.status">
-									<el-radio :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
-								</el-radio-group>
-							</el-form-item>
-						</el-col>
-						<!--						<el-col :span="12" class="mb20">-->
-						<!--							<el-form-item label="规格" prop="spec">-->
-						<!--								<el-input placeholder="请输入规格" v-model.trim="form.spec" />-->
-						<!--							</el-form-item>-->
-						<!--						</el-col>-->
-						<el-col :span="12" class="mb20">
-							<el-form-item label="产地" prop="origin">
-								<el-input v-model.trim="form.origin" placeholder="请输入产地" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="排序字段" prop="sort">
-								<el-input-number :min="0" :max="1000" :precision="0" v-model="form.sort" />
-							</el-form-item>
-						</el-col>
-						<el-col :span="12" class="mb20">
-							<el-form-item label="毛利率" prop="grossMargin">
-								<el-input-number v-model="form.grossMargin" :min="0" :precision="2" />
-							</el-form-item>
-						</el-col>
-					</el-row>
+				<el-tab-pane class="el-tab-pane" label="基础信息" name="基础信息">
+					<base-info v-model="form" />
 				</el-tab-pane>
-				<el-tab-pane label="包装单位" name="包装单位" style="overflow-y: auto; height: 60vh">
-					<supermarket-unit ref="supermarketUnitEntityListRef" v-model:supermarketUnitEntityList="form.smErpUnitEntityList" />
+				<el-tab-pane class="el-tab-pane" label="包装单位" name="包装单位">
+					<package-unit ref="packageUnitRef" v-model="form.smErpUnitEntityList" />
 				</el-tab-pane>
-				<el-tab-pane label="库存" name="库存" style="overflow-y: auto; height: 60vh">
-					<supermarket-inventory
-						ref="supermarketInventoryRef"
+				<el-tab-pane class="el-tab-pane" label="库存" name="库存">
+					<product-inventory
 						v-model:stock="form.stock"
 						v-model:inventoryUpperLimit="form.inventoryUpperLimit"
 						v-model:inventoryLowerLimit="form.inventoryLowerLimit"
 					/>
 				</el-tab-pane>
-				<el-tab-pane label="辅助条码" name="辅助条码" style="overflow-y: auto; height: 60vh">
-					<supermarket-auxiliaryCode
-						ref="supermarketAuxiliaryCodeEntityList"
-						:smErpUnitEntityList="form.smErpUnitEntityList"
-						v-model:supermarketAuxiliaryCodeEntityList="form.smErpAuxiliaryCodeEntityList"
-					/>
+				<el-tab-pane class="el-tab-pane" label="辅助条码" name="辅助条码">
+					<auxiliary-code :smErpUnitEntityList="form.smErpUnitEntityList" v-model="form.smErpAuxiliaryCodeEntityList" />
 				</el-tab-pane>
 			</el-tabs>
 		</el-form>
@@ -153,27 +31,25 @@
 </template>
 
 <script setup lang="ts">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } from "/@/api/supermarketerp/supermarketSpu"
-import { rule } from "/@/utils/validate"
-import SupermarketUnit from "./components/supermarketUnit.vue"
-import supermarketInventory from "./components/supermarketInventory.vue"
-import SupermarketAuxiliaryCode from "./components/supermarketAuxiliaryCode.vue"
+import baseInfo from "./components/baseInfo.vue"
+import packageUnit, { type rowVU } from "./components/packageUnit.vue"
+import productInventory from "./components/productInventory.vue"
+import auxiliaryCode, { rowVC } from "./components/auxiliaryCode.vue"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketSpu"
 import { TabPaneName } from "element-plus"
+import { useMessage } from "/@/hooks/message"
 import { displayPrice, storePrice } from "/@/utils/formatMoney"
 
 const emit = defineEmits(["refresh"])
 
-const supermarketUnitEntityListRef = ref()
-const supermarketInventoryRef = ref()
-const supermarketAuxiliaryCodeEntityList = ref()
-const tabPaneEnum = ["基础信息", "包装单位", "库存", "辅助条码"]
 const dataFormRef = ref()
+const packageUnitRef = ref()
 const visible = ref(false)
 const loading = ref(false)
+const tabPaneEnum = ["基础信息", "包装单位", "库存", "辅助条码"]
 const currentTabPaneIndex = ref(0)
 const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value])
+
 // 提交表单数据
 const form = reactive<any>({
 	id: "",
@@ -224,17 +100,17 @@ const dataRules = {
 	promotionPrice: [{ required: true, message: "促销价不能为空", trigger: "blur" }],
 	costPrice: [{ required: true, message: "成本价不能为空", trigger: "blur" }],
 	packageNum: [{ required: true, message: "内装数不能为空", trigger: "blur" }],
+
+	stock: [{ required: true, message: "总库存不能为空", trigger: "blur" }],
+	inventoryUpperLimit: [{ required: true, message: "库存上限不能为空", trigger: "blur" }],
+	inventoryLowerLimit: [{ required: true, message: "库存下限不能为空", trigger: "blur" }],
 }
-const { supermarket_nature, status } = useDict("supermarket_nature", "status")
-const categoryOptions = ref<any>([]) // 商品分类的下拉选项
-const brandOptions = ref<any>([]) // 超市品牌的下拉选项
 
 // 打开弹窗
 const openDialog = async (id: string) => {
 	visible.value = true
 	currentTabPaneIndex.value = 0
 	form.id = ""
-
 	// 重置表单数据
 	resetForm()
 
@@ -243,47 +119,35 @@ const openDialog = async (id: string) => {
 		form.id = id
 		await getsupermarketSpuData(id)
 
-		// 设置基础包装单位单选行
-		supermarketUnitEntityListRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
+		// 设置基础包装单位的单选行
+		packageUnitRef.value.setRadioRow(form.smErpUnitEntityList.findIndex((item: any) => item.isBase))
 	}
-
-	// 获取分类下拉选项 & 获取品牌下拉选项
-	const [categoryDict, brandDict] = await Promise.allSettled([getSupermarketCategory(), getSupermarketBrand()]).then((results) =>
-		results.map((result) => (result.status === "fulfilled" ? result.value : null)),
-	)
-
-	categoryDict && categoryDict.code === 0 && (categoryOptions.value = categoryDict.data)
-	brandDict && brandDict.code === 0 && (brandOptions.value = brandDict.data)
 }
 
 // 初始化表单数据
 const getsupermarketSpuData = async (id: string) => {
-	// 获取数据
 	loading.value = true
 	try {
 		const res = await getObj(id).finally(() => (loading.value = false))
 		if (res.code === 0) {
-			res.data.smErpUnitEntityList = res.data.smErpUnitEntityList.map((item: any) => {
-				// 格式化数据
-				item.retailPrice = parseFloat(displayPrice(item.retailPrice, ""))
-				item.promotionPrice = parseFloat(displayPrice(item.promotionPrice, ""))
-				item.purchasePrice = parseFloat(displayPrice(item.purchasePrice, ""))
-				item.costPrice = parseFloat(displayPrice(item.costPrice, ""))
+			res.data.smErpUnitEntityList = res.data.smErpUnitEntityList.map((item: rowVU) => {
+				// 格式化金额数据
+				item.retailPrice = parseFloat(displayPrice(item.retailPrice, "", 2))
+				item.promotionPrice = parseFloat(displayPrice(item.promotionPrice, "", 2))
+				item.purchasePrice = parseFloat(displayPrice(item.purchasePrice, "", 2))
+				item.costPrice = parseFloat(displayPrice(item.costPrice, "", 2))
 				return item
 			})
 
 			Object.assign(form, {
 				...res.data,
-				costPrice: parseFloat(displayPrice(res.data.costPrice, "")),
-				purchasePrice: parseFloat(displayPrice(res.data.purchasePrice, "")),
-				retailPrice: parseFloat(displayPrice(res.data.retailPrice, "")),
+				grossMargin: parseFloat(displayPrice(res.data.grossMargin, "", 2)),
 			})
-
-			console.log("获取的商品详情：", res.data)
 		}
 	} catch (error: any) {
-		loading.value = false
 		useMessage().error(error.msg)
+	} finally {
+		loading.value = false
 	}
 }
 
@@ -292,19 +156,16 @@ const resetForm = () => {
 	dataFormRef.value?.resetFields()
 	form.smErpUnitEntityList = []
 	form.smErpAuxiliaryCodeEntityList = []
-	form.stock = null
-	form.inventoryUpperLimit = null
-	form.inventoryLowerLimit = null
 }
 
 // tab栏切换
 const handleTabChange = (name: TabPaneName) => (currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name))
 
 // 整理包装单位列表
-const useHandleUnit = () => {
-	const curRadioRow = supermarketUnitEntityListRef.value.getRadioEvent()
-	return form.smErpUnitEntityList.map((item: any) => {
-		if (item.id === curRadioRow.id) {
+const usePackageUnitList = () => {
+	const curRadioRowUnit = packageUnitRef.value.getRadioEvent()
+	return form.smErpUnitEntityList.map((item: rowVU) => {
+		if (item.id === curRadioRowUnit.id) {
 			item.isBase = true
 		} else {
 			item.isBase = null
@@ -322,10 +183,10 @@ const useHandleUnit = () => {
 }
 
 // 整理辅助条码列表
-const useHandleAuxiliaryCode = () => {
-	return form.smErpAuxiliaryCodeEntityList.map((item: any) => {
-		const barCode = form.smErpUnitEntityList.find((item2: any) => item2.unit === item.unit).barCode
-		item.barCode = barCode
+const useAuxiliaryCode = () => {
+	return form.smErpAuxiliaryCodeEntityList.map((item: rowVC) => {
+		const barCode = form.smErpUnitEntityList.find((unitItem: any) => unitItem.id === item.unitId)?.barCode
+		if (barCode) item.barCode = barCode
 		if (item.isNew) {
 			item.id = ""
 			delete item.isNew
@@ -337,25 +198,39 @@ const useHandleAuxiliaryCode = () => {
 // 提交
 const onSubmit = async () => {
 	const valid = await dataFormRef.value.validate().catch(() => {})
-	if (!valid) return useMessage().warning("基础信息必填项未填写完整")
+	if (!valid) return useMessage().warning("基础信息和库存必填项未填写完整")
 	if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
-	if (!(await supermarketUnitEntityListRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
-	if (!supermarketUnitEntityListRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位")
-	if (!(await supermarketInventoryRef.value.stockValidate())) return useMessage().warning("库存必填项未填写完整")
+	if (!(await packageUnitRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
+	if (!packageUnitRef.value.getRadioEvent()) return useMessage().warning("请选择基础包装单位")
+	// if (!form.stock || !form.inventoryUpperLimit || !form.inventoryLowerLimit) return useMessage().warning("库存必填项未填写完整")
 	// if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码")
-	// if (!(await supermarketAuxiliaryCodeEntityList.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
+	// if (!(await auxiliaryCodeRef.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
 
-	const handleUnit = useHandleUnit()
-	const handleAuxiliaryCode = useHandleAuxiliaryCode()
-	console.log("提交的数据", { ...form, smErpUnitEntityList: handleUnit, smErpAuxiliaryCodeEntityList: handleAuxiliaryCode })
+	const handlePackageUnit = usePackageUnitList()
+	const handleAuxiliaryCode = useAuxiliaryCode()
+	console.log("提交的数据", {
+		...form,
+		grossMargin: storePrice(form.grossMargin),
+		smErpUnitEntityList: handlePackageUnit,
+		smErpAuxiliaryCodeEntityList: handleAuxiliaryCode,
+	})
 
 	try {
 		loading.value = true
-		const _pa = { ...form, smErpUnitEntityList: handleUnit, smErpAuxiliaryCodeEntityList: handleAuxiliaryCode }
-		form.id ? await putObj(_pa) : await addObj(_pa)
-		useMessage().success(form.id ? "修改成功" : "添加成功")
-		visible.value = false
-		emit("refresh")
+		const _pa = {
+			...form,
+			grossMargin: storePrice(form.grossMargin),
+			smErpUnitEntityList: handlePackageUnit,
+			smErpAuxiliaryCodeEntityList: handleAuxiliaryCode,
+		}
+		const res = form.id ? await putObj(_pa) : await addObj(_pa)
+		if (res.code === 0) {
+			useMessage().success(form.id ? "修改成功" : "添加成功")
+			visible.value = false
+			emit("refresh")
+		} else {
+			useMessage().error(res.msg ?? "修改失败")
+		}
 	} catch (err: any) {
 		useMessage().error(err.msg)
 	} finally {
@@ -367,3 +242,10 @@ defineExpose({
 	openDialog,
 })
 </script>
+
+<style scoped>
+.el-tab-pane {
+	overflow-y: auto;
+	height: 60vh;
+}
+</style>
diff --git a/src/views/supermarketerp/supermarketSpu/index.vue b/src/views/supermarketerp/supermarketSpu/index.vue
index f6a8ce5..63ddfba 100644
--- a/src/views/supermarketerp/supermarketSpu/index.vue
+++ b/src/views/supermarketerp/supermarketSpu/index.vue
@@ -48,9 +48,16 @@
 						style="float: right"
 						@queryTable="getDataList"
 					/>
-          <el-button plain v-auth="'supermarket_supermarketSpu_export'" class="ml10" icon="upload-filled" type="primary" @click="excelUploadRef.show()">
-            {{ $t("common.importBtn") }}
-          </el-button>
+					<el-button
+						plain
+						v-auth="'supermarket_supermarketSpu_export'"
+						class="ml10"
+						icon="upload-filled"
+						type="primary"
+						@click="excelUploadRef.show()"
+					>
+						{{ $t("common.importBtn") }}
+					</el-button>
 				</div>
 			</el-row>
 			<el-table
@@ -65,7 +72,7 @@
 				<el-table-column type="selection" width="40" fixed="left" />
 				<el-table-column type="index" label="#" width="50" fixed="left" />
 				<el-table-column prop="productCode" label="货号" show-overflow-tooltip />
-<!--				<el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" />-->
+				<!-- <el-table-column prop="barcode" label="自编码/条码" show-overflow-tooltip width="100" /> -->
 				<el-table-column prop="productName" label="商品名称" show-overflow-tooltip width="100" />
 				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
 				<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">
@@ -73,11 +80,11 @@
 						{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
 					</template>
 				</el-table-column>
-<!--				<el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
+				<!-- <el-table-column prop="brandId" label="品牌" show-overflow-tooltip>
 					<template #default="scope">
 						{{ supermarketBrand?.find((item: any) => item.id === scope.row.brandId)?.name }}
 					</template>
-				</el-table-column>-->
+				</el-table-column> -->
 				<el-table-column prop="picUrl" label="封面图" width="100">
 					<template #default="scope">
 						<preview-image :src="scope.row.picUrl" />
@@ -128,12 +135,12 @@
 
 		<!-- 编辑、新增 -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-    <upload-excel
-        ref="excelUploadRef"
-        :title="$t('supermarket.importErpSpuTip')"
-        url="/supermarket/supermarketSpu/import"
-        @refreshDataList="getDataList"
-    />
+		<upload-excel
+			ref="excelUploadRef"
+			:title="$t('supermarket.importErpSpuTip')"
+			url="/supermarket/supermarketSpu/import"
+			@refreshDataList="getDataList"
+		/>
 	</div>
 </template>
 
@@ -160,7 +167,6 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 	pageList: fetchList,
 })
 
-//  table hook
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
@@ -174,7 +180,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/supermarket/supermarketSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "supermarketSpu.xlsx")
+	downBlobFile("/supermarket/supermarketSpu/export", Object.assign(state.queryForm, { ids: selectObjs }), "库存商品.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/supermarketerp/supermarketUnit/index.vue b/src/views/supermarketerp/supermarketUnit/index.vue
index 41443b6..9fcfa2a 100644
--- a/src/views/supermarketerp/supermarketUnit/index.vue
+++ b/src/views/supermarketerp/supermarketUnit/index.vue
@@ -86,64 +86,64 @@
 </template>
 
 <script setup lang="ts" name="systemSupermarketAuxiliaryCode">
-import { BasicTableProps, useTable } from '/src/hooks/table';
-import { fetchList, delObjs } from '/src/api/supermarketerp/supermarketUnit';
-import { useMessage, useMessageBox } from '/src/hooks/message';
+import { BasicTableProps, useTable } from "/src/hooks/table"
+import { fetchList, delObjs } from "/src/api/supermarketerp/supermarketUnit"
+import { useMessage, useMessageBox } from "/src/hooks/message"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
 
 // 定义变量内容
-const formDialogRef = ref();
+const formDialogRef = ref()
 // 搜索变量
-const queryRef = ref();
-const showSearch = ref(true);
+const queryRef = ref()
+const showSearch = ref(true)
 // 多选变量
-const selectObjs = ref([]) as any;
-const multiple = ref(true);
+const selectObjs = ref([]) as any
+const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: fetchList,
-});
+})
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
 	// 清空搜索条件
-	queryRef.value?.resetFields();
+	queryRef.value?.resetFields()
 	// 清空多选
-	selectObjs.value = [];
-	getDataList();
-};
+	selectObjs.value = []
+	getDataList()
+}
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile('/supermarket/supermarketUnit/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketUnit.xlsx');
-};
+	downBlobFile("/supermarket/supermarketUnit/export", Object.assign(state.queryForm, { ids: selectObjs }), "商品包装单位.xlsx")
+}
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id);
-	multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
 	try {
-		await useMessageBox().confirm('此操作将永久删除');
+		await useMessageBox().confirm("此操作将永久删除")
 	} catch {
-		return;
+		return
 	}
 
 	try {
-		await delObjs(ids);
-		getDataList();
-		useMessage().success('删除成功');
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
 	} catch (err: any) {
-		useMessage().error(err.msg);
+		useMessage().error(err.msg)
 	}
-};
+}
 </script>
diff --git a/src/views/tools/job-manage/index.vue b/src/views/tools/job-manage/index.vue
index 24a68bd..01c39fc 100644
--- a/src/views/tools/job-manage/index.vue
+++ b/src/views/tools/job-manage/index.vue
@@ -1,427 +1,451 @@
 <template>
-  <div class="layout-padding">
-    <div class="layout-padding-auto layout-padding-view">
-      <el-row class="ml10" v-show="showSearch">
-        <el-form :inline="true" :model="state.queryForm" ref="queryRef">
-          <el-form-item :label="$t('job.jobName')" prop="jobName">
-            <el-input :placeholder="$t('job.inputjobNameTip')" @keyup.enter="getDataList" clearable
-                      v-model="state.queryForm.jobName"/>
-          </el-form-item>
-          <el-form-item :label="t('job.jobStatus')" prop="jobStatus">
-            <el-select :placeholder="t('job.inputjobStatusTip')" v-model="state.queryForm.jobStatus">
-              <el-option :key="index" :label="item.label" :value="item.value"
-                         v-for="(item, index) in job_status"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="t('job.jobExecuteStatus')" prop="jobExecuteStatus">
-            <el-select :placeholder="t('job.inputjobExecuteStatusTip')" v-model="state.queryForm.jobExecuteStatus">
-              <el-option :key="index" :label="item.label" :value="item.value"
-                         v-for="(item, index) in job_execute_status"></el-option>
-            </el-select>
-          </el-form-item>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-row class="ml10" v-show="showSearch">
+				<el-form :inline="true" :model="state.queryForm" ref="queryRef">
+					<el-form-item :label="$t('job.jobName')" prop="jobName">
+						<el-input :placeholder="$t('job.inputjobNameTip')" @keyup.enter="getDataList" clearable v-model="state.queryForm.jobName" />
+					</el-form-item>
+					<el-form-item :label="t('job.jobStatus')" prop="jobStatus">
+						<el-select :placeholder="t('job.inputjobStatusTip')" v-model="state.queryForm.jobStatus">
+							<el-option :key="index" :label="item.label" :value="item.value" v-for="(item, index) in job_status"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="t('job.jobExecuteStatus')" prop="jobExecuteStatus">
+						<el-select :placeholder="t('job.inputjobExecuteStatusTip')" v-model="state.queryForm.jobExecuteStatus">
+							<el-option :key="index" :label="item.label" :value="item.value" v-for="(item, index) in job_execute_status"></el-option>
+						</el-select>
+					</el-form-item>
 
-          <el-form-item>
-            <el-button @click="getDataList" icon="Search" type="primary">{{ $t('common.queryBtn') }}</el-button>
-            <el-button @click="resetQuery" icon="Refresh">{{ $t('common.resetBtn') }}</el-button>
-          </el-form-item>
-        </el-form>
-      </el-row>
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button v-auth="'job_sys_job_add'" @click="formDialogRef.openDialog()" class="ml10" icon="folder-add"
-                     type="primary">
-            {{ $t('common.addBtn') }}
-          </el-button>
-          <el-button plain v-auth="'job_sys_job_del'" :disabled="multiple" @click="handleDelete(undefined)" class="ml10"
-                     icon="Delete" type="primary">
-            {{ $t('common.delBtn') }}
-          </el-button>
-          <right-toolbar
-              :export="'job_sys_job_add'"
-              @exportExcel="exportExcel"
-              @queryTable="getDataList"
-              class="ml10"
-              style="float: right; margin-right: 20px"
-              v-model:showSearch="showSearch"
-          >
-            <el-tooltip class="item" effect="dark" :content="$t('queryTree.view')" placement="top">
-              <el-button circle icon="Grid" @click="tableViewRef = !tableViewRef"></el-button>
-            </el-tooltip>
-          </right-toolbar>
-        </div>
-      </el-row>
+					<el-form-item>
+						<el-button @click="getDataList" icon="Search" type="primary">{{ $t("common.queryBtn") }}</el-button>
+						<el-button @click="resetQuery" icon="Refresh">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-form>
+			</el-row>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button v-auth="'job_sys_job_add'" @click="formDialogRef.openDialog()" class="ml10" icon="folder-add" type="primary">
+						{{ $t("common.addBtn") }}
+					</el-button>
+					<el-button
+						plain
+						v-auth="'job_sys_job_del'"
+						:disabled="multiple"
+						@click="handleDelete(undefined)"
+						class="ml10"
+						icon="Delete"
+						type="primary"
+					>
+						{{ $t("common.delBtn") }}
+					</el-button>
+					<right-toolbar
+						:export="'job_sys_job_add'"
+						@exportExcel="exportExcel"
+						@queryTable="getDataList"
+						class="ml10"
+						style="float: right; margin-right: 20px"
+						v-model:showSearch="showSearch"
+					>
+						<el-tooltip class="item" effect="dark" :content="$t('queryTree.view')" placement="top">
+							<el-button circle icon="Grid" @click="tableViewRef = !tableViewRef"></el-button>
+						</el-tooltip>
+					</right-toolbar>
+				</div>
+			</el-row>
 
-      <!-- 表格视图  -->
-      <el-table
-          v-if="tableViewRef"
-          :data="state.dataList"
-          @selection-change="handleSelectionChange"
-          style="width: 100%"
-          row-key="jobId"
-          v-loading="state.loading"
-          border
-          :cell-style="tableStyle.cellStyle"
-          :header-cell-style="tableStyle.headerCellStyle"
-      >
-        <el-table-column align="center" type="selection" width="40"/>
-        <el-table-column :label="t('job.index')" fixed="left" type="index" width="60"/>
-        <el-table-column :label="t('job.jobName')" fixed="left" prop="jobName" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.jobGroup')" prop="jobGroup" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.jobStatus')" prop="jobStatus" show-overflow-tooltip width="120">
-          <template #default="scope">
-            <dict-tag :options="job_status" :value="scope.row.jobStatus"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('job.jobExecuteStatus')" prop="jobExecuteStatus" show-overflow-tooltip width="120">
-          <template #default="scope">
-            <dict-tag :options="job_execute_status" :value="scope.row.jobExecuteStatus"></dict-tag>
-          </template>
-        </el-table-column>
+			<!-- 表格视图  -->
+			<el-table
+				v-if="tableViewRef"
+				:data="state.dataList"
+				@selection-change="handleSelectionChange"
+				style="width: 100%"
+				row-key="jobId"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+			>
+				<el-table-column align="center" type="selection" width="40" />
+				<el-table-column :label="t('job.index')" fixed="left" type="index" width="60" />
+				<el-table-column :label="t('job.jobName')" fixed="left" prop="jobName" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.jobGroup')" prop="jobGroup" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.jobStatus')" prop="jobStatus" show-overflow-tooltip width="120">
+					<template #default="scope">
+						<dict-tag :options="job_status" :value="scope.row.jobStatus"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column :label="t('job.jobExecuteStatus')" prop="jobExecuteStatus" show-overflow-tooltip width="120">
+					<template #default="scope">
+						<dict-tag :options="job_execute_status" :value="scope.row.jobExecuteStatus"></dict-tag>
+					</template>
+				</el-table-column>
 
-        <el-table-column :label="t('job.startTime')" prop="startTime" show-overflow-tooltip width="120"/>
+				<el-table-column :label="t('job.startTime')" prop="startTime" show-overflow-tooltip width="120" />
 
-        <el-table-column :label="t('job.previousTime')" prop="previousTime" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.nextTime')" prop="nextTime" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.jobType')" prop="jobType" show-overflow-tooltip width="120">
-          <template #default="scope">
-            <dict-tag :options="job_type" :value="scope.row.jobType"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="t('job.executePath')" prop="executePath" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.className')" prop="className" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.methodName')" prop="methodName" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.methodParamsValue')" prop="methodParamsValue" show-overflow-tooltip
-                         width="120"/>
-        <el-table-column :label="t('job.cronExpression')" prop="cronExpression" show-overflow-tooltip width="120"/>
-        <el-table-column :label="t('job.misfirePolicy')" prop="misfirePolicy" show-overflow-tooltip width="200">
-          <template #default="scope">
-            <dict-tag :options="misfire_policy" :value="scope.row.misfirePolicy"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('common.action')" fixed="right" width="300">
-          <template #default="scope">
-            <el-button @click="handleJobLog(scope.row)" text type="primary">{{ $t('job.jobLogBtn') }}</el-button>
+				<el-table-column :label="t('job.previousTime')" prop="previousTime" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.nextTime')" prop="nextTime" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.jobType')" prop="jobType" show-overflow-tooltip width="120">
+					<template #default="scope">
+						<dict-tag :options="job_type" :value="scope.row.jobType"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column :label="t('job.executePath')" prop="executePath" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.className')" prop="className" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.methodName')" prop="methodName" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.methodParamsValue')" prop="methodParamsValue" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.cronExpression')" prop="cronExpression" show-overflow-tooltip width="120" />
+				<el-table-column :label="t('job.misfirePolicy')" prop="misfirePolicy" show-overflow-tooltip width="200">
+					<template #default="scope">
+						<dict-tag :options="misfire_policy" :value="scope.row.misfirePolicy"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column :label="$t('common.action')" fixed="right" width="300">
+					<template #default="scope">
+						<el-button @click="handleJobLog(scope.row)" text type="primary">{{ $t("job.jobLogBtn") }}</el-button>
 
-            <el-button v-auth="'job_sys_job_start_job'" @click="handleStartJob(scope.row)" text type="primary"
-                       v-if="scope.row.jobStatus !== '2'"
-            >
-              {{ $t('job.jobStartBtn') }}
-            </el-button>
+						<el-button
+							v-auth="'job_sys_job_start_job'"
+							@click="handleStartJob(scope.row)"
+							text
+							type="primary"
+							v-if="scope.row.jobStatus !== '2'"
+						>
+							{{ $t("job.jobStartBtn") }}
+						</el-button>
 
-            <el-button
-                v-auth="'job_sys_job_shutdown_job'"
-                @click="handleShutDownJob(scope.row)"
-                text
-                type="primary"
-                v-if="scope.row.jobStatus === '2'"
-            >
-              {{ $t('job.jobPauseBtn') }}
-            </el-button>
+						<el-button
+							v-auth="'job_sys_job_shutdown_job'"
+							@click="handleShutDownJob(scope.row)"
+							text
+							type="primary"
+							v-if="scope.row.jobStatus === '2'"
+						>
+							{{ $t("job.jobPauseBtn") }}
+						</el-button>
 
-            <el-button v-auth="'job_sys_job_edit'" @click="handleEditJob(scope.row)" text type="primary">
-              {{ $t('common.editBtn') }}
-            </el-button>
+						<el-button v-auth="'job_sys_job_edit'" @click="handleEditJob(scope.row)" text type="primary">
+							{{ $t("common.editBtn") }}
+						</el-button>
 
-            <el-button v-auth="'job_sys_job_start_job'" @click="handleRunJob(scope.row)" text type="primary">
-              {{ $t('job.jobRunBtn') }}
-            </el-button>
+						<el-button v-auth="'job_sys_job_start_job'" @click="handleRunJob(scope.row)" text type="primary">
+							{{ $t("job.jobRunBtn") }}
+						</el-button>
 
-            <el-button v-auth="'job_sys_job_del'" @click="handleDelete(scope.row)" text type="primary"
-                       :disabled="scope.row.jobStatus === '2'">{{ $t('common.delBtn') }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 卡片视图  -->
-      <el-scrollbar v-if="!tableViewRef">
-        <div class="p-4">
-          <div class="mx-auto">
-            <!-- Main -->
-            <div class="grid grid-cols-4 gap-x-4 gap-y-6">
-              <div
-                  v-for="job in state.dataList"
-                  :key="job.jobId"
-                  class="w-full max-w-sm mt-2 bg-gray-100 dark:bg-[#1d1e1f] rounded-lg border dark:border-[#303030]"
-              >
-                <div aria-label="header" class="flex items-center p-4 space-x-4">
-                  <div aria-label="avatar" class="flex items-center mr-auto space-x-4">
-                    <div class="flex flex-col flex-1 space-y-2">
-                      <div class="text-lg font-bold text-gray-900 dark:text-gray-100">
-                        {{ job.jobName }}
-                      </div>
-                      <p class="text-base font-normal text-gray-500 truncate dark:text-gray-400">
-                        {{ job.jobGroup }} / {{ job_type.find((item: any) => item.value === job.jobType)?.label }}
-                      </p>
-                    </div>
-                  </div>
-                </div>
-                <div aria-label="navigation" class="py-2">
-                  <nav class="grid gap-1">
-                    <div class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md">
-                      <span class="font-medium">{{ $t('job.jobStatus') }}:</span>
-                      <span>{{ job_status.find((item: any) => item.value === job.jobStatus)?.label }}</span>
-                    </div>
-                    <div class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md">
-                      <span class="font-medium">{{ $t('job.cronExpression') }}:</span>
-                      <span>{{ job.cronExpression }}</span>
-                    </div>
-                    <div class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md">
-                      <span class="font-medium">{{ $t('job.previousTime') }}:</span>
-                      <span>{{ job.previousTime }}</span>
-                    </div>
-                    <div class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md">
-                      <span class="font-medium">{{ $t('job.nextTime') }}:</span>
-                      <span>{{ job.nextTime }}</span>
-                    </div>
-                    <div class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md">
-                      <span class="font-medium">{{ $t('job.jobExecuteStatus') }}:</span>
-                      <span>
-                          <el-icon v-if="job.jobExecuteStatus === '1'"><CircleCloseFilled/></el-icon>
-                          <el-icon v-if="job.jobExecuteStatus === '0'"><CircleCheckFilled/></el-icon>
-                      </span>
-                    </div>
-                  </nav>
-                </div>
-                <div aria-label="footer" class="pt-2 border-t dark:border-[#303030]">
-                  <div class="flex items-center justify-center min-w-full">
-                    <nav class="flex">
-                      <a
-                          @click="handleJobLog(job)"
-                          href="javascript:;"
-                          class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
-                      >
-                        <span>{{ $t('job.jobLogBtn') }}</span>
-                      </a>
-                      <a
-                          v-auth="'job_sys_job_start_job'"
-                          @click="handleStartJob(job)"
-                          v-if="job.jobStatus !== '2'"
-                          href="javascript:;"
-                          class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
-                      >
-                        <span>{{ $t('job.jobStartBtn') }}</span>
-                      </a>
-                      <a
-                          v-auth="'job_sys_job_shutdown_job'"
-                          @click="handleShutDownJob(job)"
-                          v-if="job.jobStatus === '2'"
-                          href="javascript:;"
-                          class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
-                      >
-                        <span>{{ $t('job.jobPauseBtn') }}</span>
-                      </a>
-                      <a
-                          v-auth="'job_sys_job_edit'" @click="handleEditJob(job)"
-                          href="javascript:;"
-                          class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
-                      >
-                        <span> {{ $t('common.editBtn') }}</span>
-                      </a>
-                      <a
-                          v-auth="'job_sys_job_start_job'" @click="handleRunJob(job)"
-                          href="javascript:;"
-                          class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
-                      >
-                        <span>{{ $t('job.jobRunBtn') }}</span>
-                      </a>
+						<el-button
+							v-auth="'job_sys_job_del'"
+							@click="handleDelete(scope.row)"
+							text
+							type="primary"
+							:disabled="scope.row.jobStatus === '2'"
+							>{{ $t("common.delBtn") }}
+						</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<!-- 卡片视图  -->
+			<el-scrollbar v-if="!tableViewRef">
+				<div class="p-4">
+					<div class="mx-auto">
+						<!-- Main -->
+						<div class="grid grid-cols-4 gap-x-4 gap-y-6">
+							<div
+								v-for="job in state.dataList"
+								:key="job.jobId"
+								class="w-full max-w-sm mt-2 bg-gray-100 dark:bg-[#1d1e1f] rounded-lg border dark:border-[#303030]"
+							>
+								<div aria-label="header" class="flex items-center p-4 space-x-4">
+									<div aria-label="avatar" class="flex items-center mr-auto space-x-4">
+										<div class="flex flex-col flex-1 space-y-2">
+											<div class="text-lg font-bold text-gray-900 dark:text-gray-100">
+												{{ job.jobName }}
+											</div>
+											<p class="text-base font-normal text-gray-500 truncate dark:text-gray-400">
+												{{ job.jobGroup }} / {{ job_type.find((item: any) => item.value === job.jobType)?.label }}
+											</p>
+										</div>
+									</div>
+								</div>
+								<div aria-label="navigation" class="py-2">
+									<nav class="grid gap-1">
+										<div
+											class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md"
+										>
+											<span class="font-medium">{{ $t("job.jobStatus") }}:</span>
+											<span>{{ job_status.find((item: any) => item.value === job.jobStatus)?.label }}</span>
+										</div>
+										<div
+											class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md"
+										>
+											<span class="font-medium">{{ $t("job.cronExpression") }}:</span>
+											<span>{{ job.cronExpression }}</span>
+										</div>
+										<div
+											class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md"
+										>
+											<span class="font-medium">{{ $t("job.previousTime") }}:</span>
+											<span>{{ job.previousTime }}</span>
+										</div>
+										<div
+											class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md"
+										>
+											<span class="font-medium">{{ $t("job.nextTime") }}:</span>
+											<span>{{ job.nextTime }}</span>
+										</div>
+										<div
+											class="flex items-center w-full px-4 py-1 space-x-3 leading-6 text-gray-600 dark:text-gray-300 hover:bg-white dark:hover:bg-[#303030] rounded-md"
+										>
+											<span class="font-medium">{{ $t("job.jobExecuteStatus") }}:</span>
+											<span>
+												<el-icon v-if="job.jobExecuteStatus === '1'"><CircleCloseFilled /></el-icon>
+												<el-icon v-if="job.jobExecuteStatus === '0'"><CircleCheckFilled /></el-icon>
+											</span>
+										</div>
+									</nav>
+								</div>
+								<div aria-label="footer" class="pt-2 border-t dark:border-[#303030]">
+									<div class="flex items-center justify-center min-w-full">
+										<nav class="flex">
+											<a
+												@click="handleJobLog(job)"
+												href="javascript:;"
+												class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
+											>
+												<span>{{ $t("job.jobLogBtn") }}</span>
+											</a>
+											<a
+												v-auth="'job_sys_job_start_job'"
+												@click="handleStartJob(job)"
+												v-if="job.jobStatus !== '2'"
+												href="javascript:;"
+												class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
+											>
+												<span>{{ $t("job.jobStartBtn") }}</span>
+											</a>
+											<a
+												v-auth="'job_sys_job_shutdown_job'"
+												@click="handleShutDownJob(job)"
+												v-if="job.jobStatus === '2'"
+												href="javascript:;"
+												class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
+											>
+												<span>{{ $t("job.jobPauseBtn") }}</span>
+											</a>
+											<a
+												v-auth="'job_sys_job_edit'"
+												@click="handleEditJob(job)"
+												href="javascript:;"
+												class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
+											>
+												<span> {{ $t("common.editBtn") }}</span>
+											</a>
+											<a
+												v-auth="'job_sys_job_start_job'"
+												@click="handleRunJob(job)"
+												href="javascript:;"
+												class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
+											>
+												<span>{{ $t("job.jobRunBtn") }}</span>
+											</a>
 
-                      <a
-                          v-auth="'job_sys_job_del'" @click="handleDelete(job)" type="primary"
-                          v-if="job.jobStatus !== '2'"
-                          href="javascript:;"
-                          class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
-                      >
-                        <span>{{ $t('common.delBtn') }}</span>
-                      </a>
-                    </nav>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
+											<a
+												v-auth="'job_sys_job_del'"
+												@click="handleDelete(job)"
+												type="primary"
+												v-if="job.jobStatus !== '2'"
+												href="javascript:;"
+												class="px-2 py-2 text-primary hover:text-primary-400 dark:text-primary-300"
+											>
+												<span>{{ $t("common.delBtn") }}</span>
+											</a>
+										</nav>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</el-scrollbar>
 
-        </div>
-      </el-scrollbar>
+			<pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination" />
+		</div>
 
-      <pagination @current-change="currentChangeHandle" @size-change="sizeChangeHandle" v-bind="state.pagination"/>
-    </div>
-
-    <!-- 编辑、新增  -->
-    <form-dialog @refresh="getDataList()" ref="formDialogRef"/>
-    <job-log ref="jobLogRef"></job-log>
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog @refresh="getDataList()" ref="formDialogRef" />
+		<job-log ref="jobLogRef"></job-log>
+	</div>
 </template>
 
 <script lang="ts" name="systemSysJob" setup>
-import {BasicTableProps, useTable} from '/@/hooks/table';
-import {delObj, fetchList, runJobRa, shutDownJobRa, startJobRa} from '/@/api/daemon/job';
-import {useMessage, useMessageBox} from '/@/hooks/message';
-import {useDict} from '/@/hooks/dict';
-import {useI18n} from 'vue-i18n';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObj, fetchList, runJobRa, shutDownJobRa, startJobRa } from "/@/api/daemon/job"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { useI18n } from "vue-i18n"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const JobLog = defineAsyncComponent(() => import('./job-log.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const JobLog = defineAsyncComponent(() => import("./job-log.vue"))
 
 // 获取国际化方法
-const {t} = useI18n();
+const { t } = useI18n()
 
 /** 表单弹窗引用 */
-const formDialogRef = ref();
+const formDialogRef = ref()
 /** 作业日志引用 */
-const jobLogRef = ref();
+const jobLogRef = ref()
 /** 表格视图 */
 const tableViewRef = ref(false)
 /** 搜索表单信息 */
 const queryForm = reactive({
-  jobName: '',
-  jobGroup: '',
-  jobStatus: '',
-  jobExecuteStatus: '',
-});
+	jobName: "",
+	jobGroup: "",
+	jobStatus: "",
+	jobExecuteStatus: "",
+})
 /** 是否展示搜索表单 */
-const showSearch = ref(true);
+const showSearch = ref(true)
 
 // 多选变量
 /** 选中的行 */
-const selectedRows = ref([]);
+const selectedRows = ref([])
 /** 是否可以多选 */
-const multiple = ref(true);
+const multiple = ref(true)
 
 /** 查询字典 */
-const {
-  job_status,
-  job_execute_status,
-  misfire_policy,
-  job_type
-} = useDict('job_status', 'job_execute_status', 'misfire_policy', 'job_type');
+const { job_status, job_execute_status, misfire_policy, job_type } = useDict(
+	"job_status",
+	"job_execute_status",
+	"misfire_policy",
+	"job_type",
+)
 
 /** 表格状态变量 */
 const state = reactive<BasicTableProps>({
-  queryForm,
-  pageList: fetchList,
-  pagination: {
-    size: 8,
-    pageSizes: [4, 8, 12]
-  }
-});
+	queryForm,
+	pageList: fetchList,
+	pagination: {
+		size: 8,
+		pageSizes: [4, 8, 12],
+	},
+})
 
 /** 获取表格数据方法 */
-const {getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle} = useTable(state);
+const { getDataList, currentChangeHandle, sizeChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 /** 重置查询表单 */
 const resetQuery = () => {
-  Object.keys(queryForm).forEach((key) => (queryForm[key] = ''));
-  getDataList();
-};
+	Object.keys(queryForm).forEach((key) => (queryForm[key] = ""))
+	getDataList()
+}
 
 /** 行选中事件 */
 const handleSelectionChange = (rows: any) => {
-  selectedRows.value = rows;
-  multiple.value = !rows.length;
-};
+	selectedRows.value = rows
+	multiple.value = !rows.length
+}
 
 /** 导出Excel */
 const exportExcel = () => {
-  downBlobFile('/job/sys-job/export', Object.assign(state.queryForm, {ids: selectedRows}), 'job.xlsx');
-};
+	downBlobFile("/job/sys-job/export", Object.assign(state.queryForm, { ids: selectedRows }), "Quartz管理.xlsx")
+}
 
 /** 查看作业日志 */
 const handleJobLog = (row) => {
-  jobLogRef.value.openDialog(row.jobId);
-};
+	jobLogRef.value.openDialog(row.jobId)
+}
 
 /** 编辑作业 */
 const handleEditJob = (row) => {
-  const jobStatus = row.jobStatus;
-  if (jobStatus === '1' || jobStatus === '3') {
-    formDialogRef.value.openDialog(row.jobId);
-  } else {
-    useMessage().error('运行中定时任务不可修改，请先暂停后操作');
-  }
-};
+	const jobStatus = row.jobStatus
+	if (jobStatus === "1" || jobStatus === "3") {
+		formDialogRef.value.openDialog(row.jobId)
+	} else {
+		useMessage().error("运行中定时任务不可修改，请先暂停后操作")
+	}
+}
 
 /** 启动作业 */
 const handleStartJob = async (row) => {
-  const jobStatus = row.jobStatus;
-  if (jobStatus === '1' || jobStatus === '3') {
-    try {
-      await useMessageBox().confirm(`即将发布或启动(任务名称: ${row.jobName}), 是否继续?`);
-    } catch {
-      return;
-    }
+	const jobStatus = row.jobStatus
+	if (jobStatus === "1" || jobStatus === "3") {
+		try {
+			await useMessageBox().confirm(`即将发布或启动(任务名称: ${row.jobName}), 是否继续?`)
+		} catch {
+			return
+		}
 
-    try {
-      await startJobRa(row.jobId);
-      getDataList();
-      useMessage().success(t('common.optSuccessText'));
-    } catch (err: any) {
-      useMessage().error(err.msg);
-    }
-  } else {
-    useMessage().error('定时任务已运行');
-  }
-};
+		try {
+			await startJobRa(row.jobId)
+			getDataList()
+			useMessage().success(t("common.optSuccessText"))
+		} catch (err: any) {
+			useMessage().error(err.msg)
+		}
+	} else {
+		useMessage().error("定时任务已运行")
+	}
+}
 
 /** 暂停作业 */
 const handleShutDownJob = async (row) => {
-  const jobStatus = row.jobStatus;
-  if (jobStatus === '2') {
-    try {
-      await useMessageBox().confirm(`即将暂停(任务名称: ${row.jobName}), 是否继续?`);
-    } catch {
-      return;
-    }
+	const jobStatus = row.jobStatus
+	if (jobStatus === "2") {
+		try {
+			await useMessageBox().confirm(`即将暂停(任务名称: ${row.jobName}), 是否继续?`)
+		} catch {
+			return
+		}
 
-    try {
-      await shutDownJobRa(row.jobId);
-      getDataList();
-      useMessage().success(t('common.optSuccessText'));
-    } catch (err: any) {
-      useMessage().error(err.msg);
-    }
-  } else {
-    useMessage().error('已暂停，不要重复操作');
-  }
-};
+		try {
+			await shutDownJobRa(row.jobId)
+			getDataList()
+			useMessage().success(t("common.optSuccessText"))
+		} catch (err: any) {
+			useMessage().error(err.msg)
+		}
+	} else {
+		useMessage().error("已暂停，不要重复操作")
+	}
+}
 
 /** 运行作业 */
 const handleRunJob = async (row) => {
-  try {
-    await useMessageBox().confirm(`立刻执行一次任务(任务名称: ${row.jobName}), 是否继续?`);
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm(`立刻执行一次任务(任务名称: ${row.jobName}), 是否继续?`)
+	} catch {
+		return
+	}
 
-  try {
-    await runJobRa(row.jobId);
-    getDataList();
-    useMessage().success(t('common.optSuccessText'));
-  } catch (err: any) {
-    useMessage().error('运行失败');
-  }
-};
+	try {
+		await runJobRa(row.jobId)
+		getDataList()
+		useMessage().success(t("common.optSuccessText"))
+	} catch (err: any) {
+		useMessage().error("运行失败")
+	}
+}
 
 /** 删除操作 */
 const handleDelete = async (row) => {
-  if (!row) {
-    selectedRows.value.forEach(handleDelete);
-    return;
-  }
+	if (!row) {
+		selectedRows.value.forEach(handleDelete)
+		return
+	}
 
-  const {jobId, jobName} = row;
-  try {
-    await useMessageBox().confirm(`${t('common.delConfirmText')}(任务名称:${jobName})`);
-  } catch {
-    return;
-  }
+	const { jobId, jobName } = row
+	try {
+		await useMessageBox().confirm(`${t("common.delConfirmText")}(任务名称:${jobName})`)
+	} catch {
+		return
+	}
 
-  try {
-    await delObj(jobId);
-    getDataList();
-    useMessage().success(t('common.delSuccessText'));
-  } catch (error: any) {
-    useMessage().error('删除失败');
-  }
-};
+	try {
+		await delObj(jobId)
+		getDataList()
+		useMessage().success(t("common.delSuccessText"))
+	} catch (error: any) {
+		useMessage().error("删除失败")
+	}
+}
 </script>
diff --git a/src/views/tools/message/email/index.vue b/src/views/tools/message/email/index.vue
index 9b13cc9..dc5b1e8 100644
--- a/src/views/tools/message/email/index.vue
+++ b/src/views/tools/message/email/index.vue
@@ -1,89 +1,90 @@
 <template>
-  <div>
-    <el-row v-show="showSearch">
-      <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-        <el-form-item label="业务名称" prop="configName">
-          <el-input placeholder="请输入业务名称" v-model="state.queryForm.configName"/>
-        </el-form-item>
-        <el-form-item>
-          <el-button icon="search" type="primary" @click="getDataList">
-            查询
-          </el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <el-row>
-      <div class="mb8" style="width: 100%">
-        <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-                   v-auth="'sys_message_add'">
-          新 增
-        </el-button>
-        <el-button plain :disabled="multiple" icon="Delete" type="primary"
-                   v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
-          删除
-        </el-button>
-        <right-toolbar v-model:showSearch="showSearch" :export="'admin_sysMessage_export'"
-                       @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-                       @queryTable="getDataList"></right-toolbar>
-      </div>
-    </el-row>
-    <el-table :data="state.dataList" v-loading="state.loading" border
-              :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-              @selection-change="selectionChangHandle"
-              @sort-change="sortChangeHandle">
-      <el-table-column type="selection" width="40" align="center"/>
-      <el-table-column type="index" label="#" width="40"/>
-      <el-table-column prop="configName" label="业务名称" show-overflow-tooltip/>
-      <el-table-column prop="configKey" label="业务标识" show-overflow-tooltip/>
-      <el-table-column prop="configValue.supplier" label="服务地址" show-overflow-tooltip>
-        <template #default="scope">
-          {{ JSON.parse(scope.row.configValue).smtpServer }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="configStatus" label="启用状态" show-overflow-tooltip width="100">
-        <template #default="scope">
-          <dict-tag :options="yes_no_type" :value="scope.row.configStatus"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="300">
-        <template #default="scope">
-          <el-button icon="view" text type="primary" v-auth="'sys_message_edit'"
-                     @click="senderDialogRef.openDialog(scope.row.id)">测试
-          </el-button>
-          <el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'"
-                     @click="formDialogRef.openDialog(scope.row.id)">编辑
-          </el-button>
-          <el-button icon="delete" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleDelete([scope.row.id])">删除
-          </el-button>
-          <el-button icon="Tickets" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleLog">日志
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
+	<div>
+		<el-row v-show="showSearch">
+			<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+				<el-form-item label="业务名称" prop="configName">
+					<el-input placeholder="请输入业务名称" v-model="state.queryForm.configName" />
+				</el-form-item>
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
+		</el-row>
+		<el-row>
+			<div class="mb8" style="width: 100%">
+				<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'sys_message_add'">
+					新 增
+				</el-button>
+				<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
+					删除
+				</el-button>
+				<right-toolbar
+					v-model:showSearch="showSearch"
+					:export="'admin_sysMessage_export'"
+					@exportExcel="exportExcel"
+					class="ml10 mr20"
+					style="float: right"
+					@queryTable="getDataList"
+				></right-toolbar>
+			</div>
+		</el-row>
+		<el-table
+			:data="state.dataList"
+			v-loading="state.loading"
+			border
+			:cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle"
+			@selection-change="selectionChangHandle"
+			@sort-change="sortChangeHandle"
+		>
+			<el-table-column type="selection" width="40" align="center" />
+			<el-table-column type="index" label="#" width="40" />
+			<el-table-column prop="configName" label="业务名称" show-overflow-tooltip />
+			<el-table-column prop="configKey" label="业务标识" show-overflow-tooltip />
+			<el-table-column prop="configValue.supplier" label="服务地址" show-overflow-tooltip>
+				<template #default="scope">
+					{{ JSON.parse(scope.row.configValue).smtpServer }}
+				</template>
+			</el-table-column>
+			<el-table-column prop="configStatus" label="启用状态" show-overflow-tooltip width="100">
+				<template #default="scope">
+					<dict-tag :options="yes_no_type" :value="scope.row.configStatus"></dict-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" width="300">
+				<template #default="scope">
+					<el-button icon="view" text type="primary" v-auth="'sys_message_edit'" @click="senderDialogRef.openDialog(scope.row.id)"
+						>测试
+					</el-button>
+					<el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'" @click="formDialogRef.openDialog(scope.row.id)"
+						>编辑
+					</el-button>
+					<el-button icon="delete" text type="primary" v-auth="'sys_message_del'" @click="handleDelete([scope.row.id])">删除 </el-button>
+					<el-button icon="Tickets" text type="primary" v-auth="'sys_message_del'" @click="handleLog">日志 </el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
-    <sender-dialog ref="senderDialogRef"/>
-
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+		<sender-dialog ref="senderDialogRef" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemEmailMessage">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {delObjs, fetchList} from "/@/api/admin/config";
-import {useMessage, useMessageBox} from "/@/hooks/message";
-import {useDict} from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList } from "/@/api/admin/config"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const SenderDialog = defineAsyncComponent(() => import('./sender.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const SenderDialog = defineAsyncComponent(() => import("./sender.vue"))
 
 // 定义查询字典
-const {yes_no_type} = useDict('yes_no_type')
+const { yes_no_type } = useDict("yes_no_type")
 // 定义变量内容
 const formDialogRef = ref()
 const senderDialogRef = ref()
@@ -96,64 +97,56 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {
-    configType: 'email',
-    configName: ''
-  },
-  pageList: fetchList
+	queryForm: {
+		configType: "email",
+		configName: "",
+	},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/admin/sysMessage/export', Object.assign(state.queryForm, {ids: selectObjs}), 'sysMessage.xlsx')
+	downBlobFile("/admin/sysMessage/export", Object.assign(state.queryForm, { ids: selectObjs }), "信息推送-邮件.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
-
-// 跳转日志
-const router = useRouter();
-const handleLog = () => {
-  router.push({path: '/admin/log/index', query: {serviceId: 'email'}})
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
 }
 
+// 跳转日志
+const router = useRouter()
+const handleLog = () => {
+	router.push({ path: "/admin/log/index", query: { serviceId: "email" } })
+}
 </script>
diff --git a/src/views/tools/message/internal/index.vue b/src/views/tools/message/internal/index.vue
index 2b33a4d..c368104 100644
--- a/src/views/tools/message/internal/index.vue
+++ b/src/views/tools/message/internal/index.vue
@@ -1,103 +1,121 @@
 <template>
-  <div>
-    <el-row v-show="showSearch">
-      <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-        <el-form-item label="标题" prop="title">
-          <el-input placeholder="请输入标题" v-model="state.queryForm.title"/>
-        </el-form-item>
-        <el-form-item>
-          <el-button icon="search" type="primary" @click="getDataList">
-            查询
-          </el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <el-row>
-      <div class="mb8" style="width: 100%">
-        <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-                   v-auth="'sys_message_add'">
-          新 增
-        </el-button>
-        <el-button plain :disabled="multiple" icon="Delete" type="primary"
-                   v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
-          删除
-        </el-button>
-        <right-toolbar v-model:showSearch="showSearch" :export="'admin_sysMessage_export'"
-                       @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-                       @queryTable="getDataList"></right-toolbar>
-      </div>
-    </el-row>
-    <el-table :data="state.dataList" v-loading="state.loading" border
-              :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-              @selection-change="selectionChangHandle"
-              @sort-change="sortChangeHandle">
-      <el-table-column type="selection" width="40" align="center"/>
-      <el-table-column type="index" label="#" width="40"/>
-      <el-table-column prop="category" label="分类" show-overflow-tooltip width="100">
-        <template #default="scope">
-          <dict-tag :options="message_type" :value="scope.row.category"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="title" label="标题" show-overflow-tooltip/>
-      <el-table-column prop="allFlag" label="全部通知" show-overflow-tooltip>
-        <template #default="scope">
-          <dict-tag :options="yes_no_type" :value="scope.row.allFlag"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sendFlag" label="已发送" show-overflow-tooltip>
-        <template #default="scope">
-          <dict-tag :options="yes_no_type" :value="scope.row.sendFlag"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sort" label="排序" show-overflow-tooltip/>
-      <el-table-column label="操作" width="300">
-        <template #default="scope">
-          <el-button icon="view" text type="primary" @click="contentRef.openDialog(scope.row)">详情
-          </el-button>
-          <el-button icon="BellFilled" text type="primary" v-auth="'sys_message_edit'"
-                     v-if="scope.row.sendFlag !== '1'"
-                     @click="handleSend(scope.row.id)">群发
-          </el-button>
-          <el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'"
-                     v-if="scope.row.sendFlag === '0'"
-                     @click="formDialogRef.openDialog(scope.row.id)">编辑
-          </el-button>
-          <el-button icon="delete" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleDelete([scope.row.id])">删除
-          </el-button>
-          <el-button icon="List" text type="primary" v-auth="'sys_message_edit'"
-                     v-if="scope.row.sendFlag === '1'"
-                     @click="receiveRef.openDialog(scope.row.id)">接收情况
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
+	<div>
+		<el-row v-show="showSearch">
+			<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+				<el-form-item label="标题" prop="title">
+					<el-input placeholder="请输入标题" v-model="state.queryForm.title" />
+				</el-form-item>
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
+		</el-row>
+		<el-row>
+			<div class="mb8" style="width: 100%">
+				<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'sys_message_add'">
+					新 增
+				</el-button>
+				<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
+					删除
+				</el-button>
+				<right-toolbar
+					v-model:showSearch="showSearch"
+					:export="'admin_sysMessage_export'"
+					@exportExcel="exportExcel"
+					class="ml10 mr20"
+					style="float: right"
+					@queryTable="getDataList"
+				></right-toolbar>
+			</div>
+		</el-row>
+		<el-table
+			:data="state.dataList"
+			v-loading="state.loading"
+			border
+			:cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle"
+			@selection-change="selectionChangHandle"
+			@sort-change="sortChangeHandle"
+		>
+			<el-table-column type="selection" width="40" align="center" />
+			<el-table-column type="index" label="#" width="40" />
+			<el-table-column prop="category" label="分类" show-overflow-tooltip width="100">
+				<template #default="scope">
+					<dict-tag :options="message_type" :value="scope.row.category"></dict-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="title" label="标题" show-overflow-tooltip />
+			<el-table-column prop="allFlag" label="全部通知" show-overflow-tooltip>
+				<template #default="scope">
+					<dict-tag :options="yes_no_type" :value="scope.row.allFlag"></dict-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="sendFlag" label="已发送" show-overflow-tooltip>
+				<template #default="scope">
+					<dict-tag :options="yes_no_type" :value="scope.row.sendFlag"></dict-tag>
+				</template>
+			</el-table-column>
+			<el-table-column prop="sort" label="排序" show-overflow-tooltip />
+			<el-table-column label="操作" width="300">
+				<template #default="scope">
+					<el-button icon="view" text type="primary" @click="contentRef.openDialog(scope.row)">详情 </el-button>
+					<el-button
+						icon="BellFilled"
+						text
+						type="primary"
+						v-auth="'sys_message_edit'"
+						v-if="scope.row.sendFlag !== '1'"
+						@click="handleSend(scope.row.id)"
+						>群发
+					</el-button>
+					<el-button
+						icon="edit-pen"
+						text
+						type="primary"
+						v-auth="'sys_message_edit'"
+						v-if="scope.row.sendFlag === '0'"
+						@click="formDialogRef.openDialog(scope.row.id)"
+						>编辑
+					</el-button>
+					<el-button icon="delete" text type="primary" v-auth="'sys_message_del'" @click="handleDelete([scope.row.id])">删除 </el-button>
+					<el-button
+						icon="List"
+						text
+						type="primary"
+						v-auth="'sys_message_edit'"
+						v-if="scope.row.sendFlag === '1'"
+						@click="receiveRef.openDialog(scope.row.id)"
+						>接收情况
+					</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-    <!-- 消息内容 -->
-    <news-content ref="contentRef"/>
+		<!-- 消息内容 -->
+		<news-content ref="contentRef" />
 
-    <!-- 接收列表 -->
-    <receive ref="receiveRef"/>
-  </div>
+		<!-- 接收列表 -->
+		<receive ref="receiveRef" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemSysMessage">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {delObjs, fetchList, sendObj} from "/@/api/admin/message";
-import {useMessage, useMessageBox} from "/@/hooks/message";
-import {useDict} from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList, sendObj } from "/@/api/admin/message"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const Receive = defineAsyncComponent(() => import('./receive.vue'));
-const NewsContent = defineAsyncComponent(() => import('/@/views/home/news/content.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const Receive = defineAsyncComponent(() => import("./receive.vue"))
+const NewsContent = defineAsyncComponent(() => import("/@/views/home/news/content.vue"))
 // 定义查询字典
-const {message_type, yes_no_type} = useDict('message_type', 'yes_no_type')
+const { message_type, yes_no_type } = useDict("message_type", "yes_no_type")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -110,71 +128,64 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {},
-  pageList: fetchList
+	queryForm: {},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/admin/sysMessage/export', Object.assign(state.queryForm, {ids: selectObjs}), 'sysMessage.xlsx')
+	downBlobFile("/admin/sysMessage/export", Object.assign(state.queryForm, { ids: selectObjs }), "信息推送-站内信.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 推送给目标用户
 const handleSend = async (id: string) => {
-  try {
-    await useMessageBox().confirm('此操作将消息推送给目标用户');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将消息推送给目标用户")
+	} catch {
+		return
+	}
 
-  try {
-    await sendObj({id: id});
-    getDataList();
-    useMessage().success('推送成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await sendObj({ id: id })
+		getDataList()
+		useMessage().success("推送成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 </script>
diff --git a/src/views/tools/message/sms/index.vue b/src/views/tools/message/sms/index.vue
index fd8d2ca..f1ca140 100644
--- a/src/views/tools/message/sms/index.vue
+++ b/src/views/tools/message/sms/index.vue
@@ -1,87 +1,89 @@
 <template>
-  <div>
-    <el-row v-show="showSearch">
-      <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-        <el-form-item label="业务名称" prop="configName">
-          <el-input placeholder="请输入业务名称" v-model="state.queryForm.configName"/>
-        </el-form-item>
-        <el-form-item>
-          <el-button icon="search" type="primary" @click="getDataList">
-            查询
-          </el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <el-row>
-      <div class="mb8" style="width: 100%">
-        <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-                   v-auth="'sys_message_add'">
-          新 增
-        </el-button>
-        <el-button plain :disabled="multiple" icon="Delete" type="primary"
-                   v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
-          删除
-        </el-button>
-        <right-toolbar v-model:showSearch="showSearch" :export="'admin_sysMessage_export'"
-                       @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-                       @queryTable="getDataList"></right-toolbar>
-      </div>
-    </el-row>
-    <el-table :data="state.dataList" v-loading="state.loading" border
-              :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-              @selection-change="selectionChangHandle"
-              @sort-change="sortChangeHandle">
-      <el-table-column type="selection" width="40" align="center"/>
-      <el-table-column type="index" label="#" width="40"/>
-      <el-table-column prop="configName" label="业务名称" show-overflow-tooltip/>
-      <el-table-column prop="configKey" label="业务标识" show-overflow-tooltip/>
-      <el-table-column prop="configValue.supplier" label="厂商" show-overflow-tooltip>
-        <template #default="scope">
-          {{ formDialogRef?.supplierList.find((item: any) => item.value === JSON.parse(scope.row.configValue).supplier)?.label}}
-        </template>
-      </el-table-column>
-      <el-table-column prop="configStatus" label="启用状态" show-overflow-tooltip width="100">
-        <template #default="scope">
-          <dict-tag :options="yes_no_type" :value="scope.row.configStatus"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="300">
-        <template #default="scope">
-          <el-button icon="view" text type="primary" v-auth="'sys_message_edit'"
-                     @click="senderDialogRef.openDialog(scope.row.id)">测试
-          </el-button>
-          <el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'"
-                     @click="formDialogRef.openDialog(scope.row.id)">编辑
-          </el-button>
-          <el-button icon="delete" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleDelete([scope.row.id])">删除
-          </el-button>
-          <el-button icon="Tickets" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleLog">日志
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
+	<div>
+		<el-row v-show="showSearch">
+			<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+				<el-form-item label="业务名称" prop="configName">
+					<el-input placeholder="请输入业务名称" v-model="state.queryForm.configName" />
+				</el-form-item>
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
+		</el-row>
+		<el-row>
+			<div class="mb8" style="width: 100%">
+				<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'sys_message_add'">
+					新 增
+				</el-button>
+				<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
+					删除
+				</el-button>
+				<right-toolbar
+					v-model:showSearch="showSearch"
+					:export="'admin_sysMessage_export'"
+					@exportExcel="exportExcel"
+					class="ml10 mr20"
+					style="float: right"
+					@queryTable="getDataList"
+				></right-toolbar>
+			</div>
+		</el-row>
+		<el-table
+			:data="state.dataList"
+			v-loading="state.loading"
+			border
+			:cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle"
+			@selection-change="selectionChangHandle"
+			@sort-change="sortChangeHandle"
+		>
+			<el-table-column type="selection" width="40" align="center" />
+			<el-table-column type="index" label="#" width="40" />
+			<el-table-column prop="configName" label="业务名称" show-overflow-tooltip />
+			<el-table-column prop="configKey" label="业务标识" show-overflow-tooltip />
+			<el-table-column prop="configValue.supplier" label="厂商" show-overflow-tooltip>
+				<template #default="scope">
+					{{ formDialogRef?.supplierList.find((item: any) => item.value === JSON.parse(scope.row.configValue).supplier)?.label }}
+				</template>
+			</el-table-column>
+			<el-table-column prop="configStatus" label="启用状态" show-overflow-tooltip width="100">
+				<template #default="scope">
+					<dict-tag :options="yes_no_type" :value="scope.row.configStatus"></dict-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" width="300">
+				<template #default="scope">
+					<el-button icon="view" text type="primary" v-auth="'sys_message_edit'" @click="senderDialogRef.openDialog(scope.row.id)"
+						>测试
+					</el-button>
+					<el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'" @click="formDialogRef.openDialog(scope.row.id)"
+						>编辑
+					</el-button>
+					<el-button icon="delete" text type="primary" v-auth="'sys_message_del'" @click="handleDelete([scope.row.id])">删除 </el-button>
+					<el-button icon="Tickets" text type="primary" v-auth="'sys_message_del'" @click="handleLog">日志 </el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
-    <sender-dialog ref="senderDialogRef"/>
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+		<sender-dialog ref="senderDialogRef" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemSmsMessage">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {delObjs, fetchList} from "/@/api/admin/config";
-import {useMessage, useMessageBox} from "/@/hooks/message";
-import {useDict} from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList } from "/@/api/admin/config"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const SenderDialog = defineAsyncComponent(() => import('./sender.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const SenderDialog = defineAsyncComponent(() => import("./sender.vue"))
 // 定义查询字典
-const {yes_no_type} = useDict('yes_no_type')
+const { yes_no_type } = useDict("yes_no_type")
 // 定义变量内容
 const formDialogRef = ref()
 const senderDialogRef = ref()
@@ -93,63 +95,56 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {
-    configType: 'sms',
-    configName: ''
-  },
-  pageList: fetchList
+	queryForm: {
+		configType: "sms",
+		configName: "",
+	},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/admin/sysMessage/export', Object.assign(state.queryForm, {ids: selectObjs}), 'sysMessage.xlsx')
+	downBlobFile("/admin/sysMessage/export", Object.assign(state.queryForm, { ids: selectObjs }), "信息推送-短信.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 跳转日志
-const router = useRouter();
+const router = useRouter()
 const handleLog = () => {
-  router.push({path: '/admin/log/index', query: {serviceId: 'sms'}})
+	router.push({ path: "/admin/log/index", query: { serviceId: "sms" } })
 }
 </script>
diff --git a/src/views/tools/message/webhook/index.vue b/src/views/tools/message/webhook/index.vue
index 8d244ba..0b4985a 100644
--- a/src/views/tools/message/webhook/index.vue
+++ b/src/views/tools/message/webhook/index.vue
@@ -1,89 +1,91 @@
 <template>
-  <div>
-    <el-row v-show="showSearch">
-      <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
-        <el-form-item label="业务名称" prop="configName">
-          <el-input placeholder="请输入业务名称" v-model="state.queryForm.configName"/>
-        </el-form-item>
-        <el-form-item>
-          <el-button icon="search" type="primary" @click="getDataList">
-            查询
-          </el-button>
-          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </el-row>
-    <el-row>
-      <div class="mb8" style="width: 100%">
-        <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-                   v-auth="'sys_message_add'">
-          新 增
-        </el-button>
-        <el-button plain :disabled="multiple" icon="Delete" type="primary"
-                   v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
-          删除
-        </el-button>
-        <right-toolbar v-model:showSearch="showSearch" :export="'admin_sysMessage_export'"
-                       @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
-                       @queryTable="getDataList"></right-toolbar>
-      </div>
-    </el-row>
-    <el-table :data="state.dataList" v-loading="state.loading" border
-              :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-              @selection-change="selectionChangHandle"
-              @sort-change="sortChangeHandle">
-      <el-table-column type="selection" width="40" align="center"/>
-      <el-table-column type="index" label="#" width="40"/>
-      <el-table-column prop="configName" label="业务名称" show-overflow-tooltip/>
-      <el-table-column prop="configKey" label="业务标识" show-overflow-tooltip/>
-      <el-table-column prop="configValue.supplier" label="厂商" show-overflow-tooltip>
-        <template #default="scope">
-          {{ formDialogRef?.supplierList.find((item: any) => item.value === JSON.parse(scope.row.configValue).supplier)?.label}}
-        </template>
-      </el-table-column>
-      <el-table-column prop="configStatus" label="启用状态" show-overflow-tooltip width="100">
-        <template #default="scope">
-          <dict-tag :options="yes_no_type" :value="scope.row.configStatus"></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="300">
-        <template #default="scope">
-          <el-button icon="view" text type="primary" v-auth="'sys_message_edit'"
-                     @click="senderDialogRef.openDialog(scope.row.id)">测试
-          </el-button>
-          <el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'"
-                     @click="formDialogRef.openDialog(scope.row.id)">编辑
-          </el-button>
-          <el-button icon="delete" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleDelete([scope.row.id])">删除
-          </el-button>
-          <el-button icon="Tickets" text type="primary" v-auth="'sys_message_del'"
-                     @click="handleLog">日志
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination"/>
+	<div>
+		<el-row v-show="showSearch">
+			<el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+				<el-form-item label="业务名称" prop="configName">
+					<el-input placeholder="请输入业务名称" v-model="state.queryForm.configName" />
+				</el-form-item>
+				<el-form-item>
+					<el-button icon="search" type="primary" @click="getDataList"> 查询 </el-button>
+					<el-button icon="Refresh" @click="resetQuery">重置</el-button>
+				</el-form-item>
+			</el-form>
+		</el-row>
+		<el-row>
+			<div class="mb8" style="width: 100%">
+				<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'sys_message_add'">
+					新 增
+				</el-button>
+				<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'sys_message_del'" @click="handleDelete(selectObjs)">
+					删除
+				</el-button>
+				<right-toolbar
+					v-model:showSearch="showSearch"
+					:export="'admin_sysMessage_export'"
+					@exportExcel="exportExcel"
+					class="ml10 mr20"
+					style="float: right"
+					@queryTable="getDataList"
+				></right-toolbar>
+			</div>
+		</el-row>
+		<el-table
+			:data="state.dataList"
+			v-loading="state.loading"
+			border
+			:cell-style="tableStyle.cellStyle"
+			:header-cell-style="tableStyle.headerCellStyle"
+			@selection-change="selectionChangHandle"
+			@sort-change="sortChangeHandle"
+		>
+			<el-table-column type="selection" width="40" align="center" />
+			<el-table-column type="index" label="#" width="40" />
+			<el-table-column prop="configName" label="业务名称" show-overflow-tooltip />
+			<el-table-column prop="configKey" label="业务标识" show-overflow-tooltip />
+			<el-table-column prop="configValue.supplier" label="厂商" show-overflow-tooltip>
+				<template #default="scope">
+					{{ formDialogRef?.supplierList.find((item: any) => item.value === JSON.parse(scope.row.configValue).supplier)?.label }}
+				</template>
+			</el-table-column>
+			<el-table-column prop="configStatus" label="启用状态" show-overflow-tooltip width="100">
+				<template #default="scope">
+					<dict-tag :options="yes_no_type" :value="scope.row.configStatus"></dict-tag>
+				</template>
+			</el-table-column>
+			<el-table-column label="操作" width="300">
+				<template #default="scope">
+					<el-button icon="view" text type="primary" v-auth="'sys_message_edit'" @click="senderDialogRef.openDialog(scope.row.id)"
+						>测试
+					</el-button>
+					<el-button icon="edit-pen" text type="primary" v-auth="'sys_message_edit'" @click="formDialogRef.openDialog(scope.row.id)"
+						>编辑
+					</el-button>
+					<el-button icon="delete" text type="primary" v-auth="'sys_message_del'" @click="handleDelete([scope.row.id])">删除 </el-button>
+					<el-button icon="Tickets" text type="primary" v-auth="'sys_message_del'" @click="handleLog">日志 </el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 
-    <!-- 编辑、新增  -->
-    <form-dialog ref="formDialogRef" @refresh="getDataList(false)"/>
-    <sender-dialog ref="senderDialogRef"/>
-  </div>
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+		<sender-dialog ref="senderDialogRef" />
+	</div>
 </template>
 
 <script setup lang="ts" name="systemSysHookMessage">
-import {BasicTableProps, useTable} from "/@/hooks/table";
-import {delObjs, fetchList} from "/@/api/admin/config";
-import {useMessage, useMessageBox} from "/@/hooks/message";
-import {useDict} from '/@/hooks/dict';
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import { delObjs, fetchList } from "/@/api/admin/config"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
 
 // 引入组件
-const FormDialog = defineAsyncComponent(() => import('./form.vue'));
-const SenderDialog = defineAsyncComponent(() => import('./sender.vue'));
+const FormDialog = defineAsyncComponent(() => import("./form.vue"))
+const SenderDialog = defineAsyncComponent(() => import("./sender.vue"))
 const senderDialogRef = ref()
 
 // 定义查询字典
-const {yes_no_type} = useDict('yes_no_type')
+const { yes_no_type } = useDict("yes_no_type")
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -94,63 +96,56 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
-  queryForm: {
-    configType: 'webhook',
-    configName: ''
-  },
-  pageList: fetchList
+	queryForm: {
+		configType: "webhook",
+		configName: "",
+	},
+	pageList: fetchList,
 })
 
 //  table hook
-const {
-  getDataList,
-  currentChangeHandle,
-  sizeChangeHandle,
-  sortChangeHandle,
-  downBlobFile,
-  tableStyle
-} = useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
-  // 清空搜索条件
-  queryRef.value?.resetFields()
-  // 清空多选
-  selectObjs.value = []
-  getDataList()
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
 }
 
 // 导出excel
 const exportExcel = () => {
-  downBlobFile('/admin/sysMessage/export', Object.assign(state.queryForm, {ids: selectObjs}), 'sysMessage.xlsx')
+	downBlobFile("/admin/sysMessage/export", Object.assign(state.queryForm, { ids: selectObjs }), "信息推送-hook.xlsx")
 }
 
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
-  selectObjs.value = objs.map(({id}) => id);
-  multiple.value = !objs.length;
-};
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
 
 // 删除操作
 const handleDelete = async (ids: string[]) => {
-  try {
-    await useMessageBox().confirm('此操作将永久删除');
-  } catch {
-    return;
-  }
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
 
-  try {
-    await delObjs(ids);
-    getDataList();
-    useMessage().success('删除成功');
-  } catch (err: any) {
-    useMessage().error(err.msg);
-  }
-};
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
 
 // 跳转日志
-const router = useRouter();
+const router = useRouter()
 const handleLog = () => {
-  router.push({path: '/admin/log/index', query: {serviceId: 'webhook'}})
+	router.push({ path: "/admin/log/index", query: { serviceId: "webhook" } })
 }
 </script>
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
index c15f77d..a341697 100644
--- a/src/views/wallet/mch-manage/index.vue
+++ b/src/views/wallet/mch-manage/index.vue
@@ -3,13 +3,7 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'wallet_mchManage_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchManage_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -77,20 +71,10 @@
 				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'wallet_mchManage_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
 						>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_mchManage_del'"
-							@click="handleDelete([scope.row.id])"
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
 					</template>
@@ -110,10 +94,7 @@ import { pageJoin, delObjs } from "/@/api/wallet/mch-manage"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
 import { parseDate } from "/@/utils/formatTime"
-
-// 引入组件
-const FormDialog = defineAsyncComponent(() => import("./form.vue"))
-// 定义查询字典
+import FormDialog from "./form.vue"
 
 const { merchant_type } = useDict("merchant_type")
 // 定义变量内容
@@ -131,8 +112,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -145,7 +125,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "merchantInfo.xlsx")
+	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-active/index.vue b/src/views/wallet/wallet-active/index.vue
index 6dce4db..a4ffa7b 100644
--- a/src/views/wallet/wallet-active/index.vue
+++ b/src/views/wallet/wallet-active/index.vue
@@ -163,7 +163,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletActive/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletActive.xlsx")
+	downBlobFile("/wallet/walletActive/export", Object.assign(state.queryForm, { ids: selectObjs }), "钱包开卡.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index b94914b..d08e730 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -175,7 +175,7 @@ const exportExcel = () => {
 	postDownBlobFile(
 		"/wallet/wallet-transaction/export-cz",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
-		"walletRecharge.xlsx",
+		"充值记录.xlsx",
 	)
 }
 
diff --git a/src/views/wallet/wallet-foreign/index.vue b/src/views/wallet/wallet-foreign/index.vue
index a79c39f..c298913 100644
--- a/src/views/wallet/wallet-foreign/index.vue
+++ b/src/views/wallet/wallet-foreign/index.vue
@@ -133,7 +133,7 @@ const doInfo = (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletForeign/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletForeign.xlsx")
+	downBlobFile("/wallet/walletForeign/export", Object.assign(state.queryForm, { ids: selectObjs }), "外来人员电子餐券.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-freeze/index.vue b/src/views/wallet/wallet-freeze/index.vue
index 4a5f45b..5007182 100644
--- a/src/views/wallet/wallet-freeze/index.vue
+++ b/src/views/wallet/wallet-freeze/index.vue
@@ -134,7 +134,7 @@ const doInfo = (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletFreeze/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletFreeze.xlsx")
+	downBlobFile("/wallet/walletFreeze/export", Object.assign(state.queryForm, { ids: selectObjs }), "饭卡冻结记录.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 4e6949b..8f932fb 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -183,7 +183,7 @@ const exportExcel = () => {
 	postDownBlobFile(
 		"/wallet/wallet-manage/export",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
-		"walletManage.xlsx",
+		"电子钱包.xlsx",
 	)
 }
 
diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index 93ae7e7..a1b3f3e 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -159,7 +159,7 @@ const exportExcel = () => {
 	postDownBlobFile(
 		"/wallet/wallet-manage/export-qb",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
-		"wallet_walletRecord.xlsx",
+		"钱包记录.xlsx",
 	)
 }
 
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 2d2ba13..7dc45c4 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -184,7 +184,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx")
+	downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款申请.xlsx")
 }
 
 const doApply = async (row: any) => {
diff --git a/src/views/wallet/wallet-recharge-apply/preview-excel.vue b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
index b98f05b..a91eb5a 100644
--- a/src/views/wallet/wallet-recharge-apply/preview-excel.vue
+++ b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
@@ -70,15 +70,12 @@
 </template>
 
 <script setup lang="ts" name="preview-excel">
-import { computed } from "vue"
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import { useDict } from "/@/hooks/dict"
+import { useTable } from "/@/hooks/table"
 import { displayPrice } from "/@/utils/formatMoney"
 import * as walletRechargeApplyApi from "/@/api/wallet/wallet-recharge-apply"
 import type { VNode } from "vue"
 import type { TableColumnCtx } from "element-plus"
 import { h } from "vue"
-import { downBlobFile } from "/@/utils/other"
 
 interface SummaryMethodProps<T = any> {
 	columns: TableColumnCtx<T>[]
@@ -87,9 +84,6 @@ interface SummaryMethodProps<T = any> {
 
 const { query } = useRoute()
 
-// 定义变量内容
-const dialogVisible = ref(false)
-
 onMounted(async () => {
 	const id = query.id as unknown as any
 	state.queryForm.id = id
@@ -108,7 +102,7 @@ const state = reactive<any>({
 })
 
 //  table hook
-const { tableStyle } = useTable(state)
+const { tableStyle, downBlobFile } = useTable(state)
 
 const data = reactive<any>({
 	list: [],
@@ -149,7 +143,7 @@ const getList = async () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/wallet-recharge-apply/export-excel", Object.assign(state.queryForm), "walletManage.xlsx")
+	downBlobFile("/wallet/wallet-recharge-apply/export-excel", Object.assign(state.queryForm), "充值/扣款申请-数据.xlsx")
 }
 
 // 表格行尾合计
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index 96aeeb1..22df1d4 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -180,7 +180,7 @@ const getSummaries = (param: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	postDownBlobFile("/wallet/wallet-recharge-import/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx")
+	postDownBlobFile("/wallet/wallet-recharge-import/export", Object.assign(state.queryForm, { ids: selectObjs }), "充值/扣款流水.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-setting/components/recharge-package/index.vue b/src/views/wallet/wallet-setting/components/recharge-package/index.vue
index 2b4af40..cb0cc9f 100644
--- a/src/views/wallet/wallet-setting/components/recharge-package/index.vue
+++ b/src/views/wallet/wallet-setting/components/recharge-package/index.vue
@@ -125,7 +125,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/wallet-recharge-package/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargePackage.xlsx")
+	downBlobFile("/wallet/wallet-recharge-package/export", Object.assign(state.queryForm, { ids: selectObjs }), "钱包配置中心-充值套餐.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-setting/components/third-zy/index.vue b/src/views/wallet/wallet-setting/components/third-zy/index.vue
index fb532e0..b9d9dee 100644
--- a/src/views/wallet/wallet-setting/components/third-zy/index.vue
+++ b/src/views/wallet/wallet-setting/components/third-zy/index.vue
@@ -36,23 +36,24 @@
 				</el-table-column>
 				<el-table-column prop="encipherRes" label="加密res" show-overflow-tooltip>
 					<template #default="{ row }">
-						<el-button text :type="row.encipherRes ? 'primary' : 'danger'" @click="row.encipherRes && handleClickJsonView(row.encipherRes)">
+						<el-button v-if="row.encipherRes" text type="primary" @click="row.encipherRes && handleClickJsonView(row.encipherRes)">
 							查看
 						</el-button>
+						<div class="color-danger" v-else>null</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="orgReq" label="原始req" show-overflow-tooltip>
 					<template #default="{ row }">
-						<el-button text :type="row.encipherRes ? 'primary' : 'danger'" @click="row.encipherRes && handleClickJsonView(row.orgReq)">
-							查看
-						</el-button>
+						<el-button v-if="row.orgReq" text type="primary" @click="row.orgReq && handleClickJsonView(row.orgReq)">查看</el-button>
+						<div class="color-danger" v-else>null</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="encipherReq" label="加密req" show-overflow-tooltip>
 					<template #default="{ row }">
-						<el-button text :type="row.encipherReq ? 'primary' : 'danger'" @click="row.encipherReq && handleClickJsonView(row.encipherReq)">
+						<el-button v-if="row.encipherReq" text type="primary" @click="row.encipherReq && handleClickJsonView(row.encipherReq)">
 							查看
 						</el-button>
+						<div class="color-danger" v-else>null</div>
 					</template>
 				</el-table-column>
 				<el-table-column prop="error" label="调用错误" show-overflow-tooltip>
@@ -70,6 +71,7 @@
 						<div v-else class="color-danger">null</div>
 					</template>
 				</el-table-column>
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
 			</el-table>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 		</div>
diff --git a/src/views/wallet/wallet-stride/index.vue b/src/views/wallet/wallet-stride/index.vue
index cbe7640..6c5e1df 100644
--- a/src/views/wallet/wallet-stride/index.vue
+++ b/src/views/wallet/wallet-stride/index.vue
@@ -135,7 +135,7 @@ const doInfo = (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/admin/walletStride/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletStride.xlsx")
+	downBlobFile("/admin/walletStride/export", Object.assign(state.queryForm, { ids: selectObjs }), "跨单位就餐.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index 03894aa..f9f280d 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -176,7 +176,7 @@ const exportExcel = () => {
 	postDownBlobFile(
 		"/wallet/wallet-transaction/export-tk",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
-		"walletRecharge.xlsx",
+		"退款记录.xlsx",
 	)
 }
 
diff --git a/src/views/wallet/wallet-type/index.vue b/src/views/wallet/wallet-type/index.vue
index 29838c0..e6e4807 100644
--- a/src/views/wallet/wallet-type/index.vue
+++ b/src/views/wallet/wallet-type/index.vue
@@ -3,13 +3,7 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'wallet_walletType_add'"
-					>
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_walletType_add'">
 						新 增
 					</el-button>
 					<el-button
@@ -57,20 +51,10 @@
 				</el-table-column>
 				<el-table-column v-auths="['wallet_walletType_edit', 'wallet_walletType_del']" label="操作" width="150">
 					<template #default="scope">
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'wallet_walletType_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletType_edit'" @click="formDialogRef.openDialog(scope.row.id)"
 							>编辑</el-button
 						>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_walletType_del'"
-							@click="handleDelete([scope.row.id])"
+						<el-button icon="delete" text type="primary" v-auth="'wallet_walletType_del'" @click="handleDelete([scope.row.id])"
 							>删除</el-button
 						>
 					</template>
@@ -109,8 +93,7 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 })
 
 //  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 // 清空搜索条件
 const resetQuery = () => {
@@ -123,7 +106,7 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletType/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletType.xlsx")
+	downBlobFile("/wallet/walletType/export", Object.assign(state.queryForm, { ids: selectObjs }), "多钱包.xlsx")
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index 5fdc020..d5edff2 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -170,7 +170,7 @@ const exportExcel = () => {
 	postDownBlobFile(
 		"/wallet/wallet-transaction/export-xf",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
-		"walletRecharge.xlsx",
+		"消费记录.xlsx",
 	)
 }