diff --git a/src/views/canteen/canteenCategory/form.vue b/src/views/canteen/canteenCategory/form.vue
index ad333f8..b38dc3f 100644
--- a/src/views/canteen/canteenCategory/form.vue
+++ b/src/views/canteen/canteenCategory/form.vue
@@ -1,101 +1,99 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="分类名称" prop="name">
+						<el-input v-model="form.name" placeholder="请输入分类名称" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" class="mb20">
+					<el-form-item label="餐段类型" prop="categoryType">
+						<el-select v-model="form.categoryType" placeholder="请选择餐段类型" multiple>
+							<el-option :value="item.value" :label="item.label" v-for="(item, index) in daily_menu" :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="form.picUrl"></upload-img>
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="分类名称" prop="name">
-        <el-input v-model="form.name" placeholder="请输入分类名称"/>
-      </el-form-item>
-      </el-col>
-         <el-col :span="12" class="mb20">
-           <el-form-item label="餐段类型" prop="categoryType">
-             <el-select v-model="form.categoryType" placeholder="请选择餐段类型">
-               <el-option :value="item.value" :label="item.label" v-for="(item, index) in daily_menu" :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="form.picUrl"></upload-img>
-  </el-form-item>
-  </el-col>
+				<el-col :span="24" class="mb20">
+					<el-form-item label="分类排序" prop="sort">
+						<el-input v-model="form.sort" placeholder="请输入分类排序" />
+					</el-form-item>
+				</el-col>
 
-    <el-col :span="24" class="mb20">
-      <el-form-item label="分类排序" prop="sort">
-        <el-input v-model="form.sort" placeholder="请输入分类排序"/>
-      </el-form-item>
-      </el-col>
-
-<!--    <el-col :span="12" class="mb20">-->
-<!--      <el-form-item label="开启状态" prop="status">-->
-<!--            <el-radio-group v-model="form.status">-->
-<!--           <el-radio label="开启状态" border>开启状态</el-radio>-->
-<!--            </el-radio-group>-->
-<!--        </el-form-item>-->
-<!--      </el-col>-->
+				<!--    <el-col :span="12" class="mb20">-->
+				<!--      <el-form-item label="开启状态" prop="status">-->
+				<!--            <el-radio-group v-model="form.status">-->
+				<!--           <el-radio label="开启状态" border>开启状态</el-radio>-->
+				<!--            </el-radio-group>-->
+				<!--        </el-form-item>-->
+				<!--      </el-col>-->
 			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="visible = false">取消</el-button>
+				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+			</span>
+		</template>
+	</el-dialog>
 </template>
 
 <script setup lang="ts" name="CanteenCategoryDialog">
 import { useDict } from '/@/hooks/dict';
-import { useMessage } from "/@/hooks/message";
-import { getObj, addObj, putObj } from '/@/api/canteen/canteenCategory'
+import { useMessage } from '/@/hooks/message';
+import { getObj, addObj, putObj } from '/@/api/canteen/canteenCategory';
 import { rule } from '/@/utils/validate';
 const emit = defineEmits(['refresh']);
 
 // 定义变量内容
 const dataFormRef = ref();
-const visible = ref(false)
-const loading = ref(false)
+const visible = ref(false);
+const loading = ref(false);
 // 定义字典
-const { daily_menu } = useDict('daily_menu')
+const { daily_menu } = useDict('daily_menu');
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  parentId: '',
-	  name: '',
-	  picUrl: '',
-	  sort: '',
-	  status: '',
-	  creator: '',
-	  updater: '',
-	  deleted: '',
-	  deptId: '',
-  categoryType: '',
+	id: '',
+	parentId: '',
+	name: '',
+	picUrl: '',
+	sort: '',
+	status: '',
+	creator: '',
+	updater: '',
+	deleted: '',
+	deptId: '',
+	categoryType: [],
 });
 
 // 定义校验规则
 const dataRules = ref({
-        name: [{required: true, message: '分类名称不能为空', trigger: 'blur'}],
-        categoryType: [{required: true, message: '餐段类型不能为空', trigger: 'blur'}],
-        sort: [{required: true, message: '分类排序不能为空', trigger: 'blur'}],
-})
+	name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+	categoryType: [{ required: true, message: '餐段类型不能为空', trigger: 'blur' }],
+	sort: [{ required: true, message: '分类排序不能为空', trigger: 'blur' }],
+});
 
 // 打开弹窗
 const openDialog = (id: string) => {
-  visible.value = true
-  form.id = ''
+	visible.value = true;
+	form.id = '';
 
-  // 重置表单数据
+	// 重置表单数据
 	nextTick(() => {
 		dataFormRef.value?.resetFields();
 	});
 
-  // 获取canteenCategory信息
-  if (id) {
-    form.id = id
-    getcanteenCategoryData(id)
-  }
+	// 获取canteenCategory信息
+	if (id) {
+		form.id = id;
+		getcanteenCategoryData(id);
+	}
 };
 
 // 提交
@@ -104,32 +102,35 @@ const onSubmit = async () => {
 	if (!valid) return false;
 
 	try {
-    loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
+		loading.value = true;
+		form.id
+			? await putObj({ ...form, categoryType: form.categoryType.join(',') })
+			: await addObj({ ...form, categoryType: form.categoryType.join(',') });
 		useMessage().success(form.id ? '修改成功' : '添加成功');
 		visible.value = false;
 		emit('refresh');
 	} catch (err: any) {
 		useMessage().error(err.msg);
 	} finally {
-    loading.value = false;
-  }
+		loading.value = false;
+	}
 };
 
-
 // 初始化表单数据
 const getcanteenCategoryData = (id: string) => {
-  // 获取数据
-  loading.value = true
-  getObj(id).then((res: any) => {
-    Object.assign(form, res.data)
-  }).finally(() => {
-    loading.value = false
-  })
+	// 获取数据
+	loading.value = true;
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data, { categoryType: res.data.categoryType.split(',') });
+		})
+		.finally(() => {
+			loading.value = false;
+		});
 };
 
 // 暴露变量
 defineExpose({
-  openDialog
+	openDialog,
 });
 </script>
diff --git a/src/views/canteen/canteenCategory/index.vue b/src/views/canteen/canteenCategory/index.vue
index 3da8798..f00ea30 100644
--- a/src/views/canteen/canteenCategory/index.vue
+++ b/src/views/canteen/canteenCategory/index.vue
@@ -1,135 +1,134 @@
 <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-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
-      </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="'canteen_canteenCategory_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'canteen_canteenCategory_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'canteen_canteenCategory_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"
+	<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-input placeholder="请输入分类名称" v-model="state.queryForm.name" />
+					</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="'canteen_canteenCategory_add'">
+						新 增
+					</el-button>
+					<el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'canteen_canteenCategory_del'" @click="handleDelete(selectObjs)">
+						删除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'canteen_canteenCategory_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="分类名称"  show-overflow-tooltip/>
-        <el-table-column prop="categoryType" label="餐段类型" show-overflow-tooltip>
-          <template #default="scope">
-            <dict-tag :options="daily_menu" :value="scope.row.categoryType"></dict-tag>
-          </template>
-        </el-table-column>
-          <el-table-column prop="picUrl" label="分类图"  show-overflow-tooltip/>
-          <el-table-column prop="createBy" label="创建者"  show-overflow-tooltip/>
-          <el-table-column prop="updateBy" label="更新者"  show-overflow-tooltip/>
-          <el-table-column prop="createTime" label="创建时间"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenCategory_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'canteen_canteenCategory_del'" @click="handleDelete([scope.row.id])">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-    </div>
+				@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="分类名称" show-overflow-tooltip />
+				<el-table-column prop="categoryType" label="餐段类型" show-overflow-tooltip width="180">
+					<template #default="scope">
+						<dict-tag :options="daily_menu" :value="scope.row.categoryType?.split(',')"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="picUrl" label="分类图" show-overflow-tooltip />
+				<el-table-column prop="createBy" label="创建者" show-overflow-tooltip />
+				<el-table-column prop="updateBy" label="更新者" show-overflow-tooltip />
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
+				<el-table-column label="操作" width="150">
+					<template #default="scope">
+						<el-button icon="edit-pen" text type="primary" v-auth="'canteen_canteenCategory_edit'" @click="formDialogRef.openDialog(scope.row.id)"
+							>编辑</el-button
+						>
+						<el-button icon="delete" text type="primary" v-auth="'canteen_canteenCategory_del'" @click="handleDelete([scope.row.id])">删除</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="systemCanteenCategory">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/canteen/canteenCategory";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { BasicTableProps, useTable } from '/@/hooks/table';
+import { fetchList, delObjs } from '/@/api/canteen/canteenCategory';
+import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useDict } from '/@/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-const { daily_menu } = useDict('daily_menu')
+const { daily_menu } = useDict('daily_menu');
 // 定义变量内容
-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
-})
+	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('/canteen/canteenCategory/export', Object.assign(state.queryForm, { ids: selectObjs }), 'canteenCategory.xlsx')
-}
+	downBlobFile('/canteen/canteenCategory/export', Object.assign(state.queryForm, { ids: selectObjs }), 'canteenCategory.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);
+	}
 };
 </script>
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index cd071cc..b445e05 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -1,8 +1,8 @@
 <template>
 	<el-dialog width="60%" :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
 		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="auto" v-loading="loading">
-			<el-tabs v-model="tabPaneActiveName">
-				<el-tab-pane label="基础信息" name="基础信息" disabled style="overflow-y: auto; height: 60vh">
+			<el-tabs v-model="tabPaneActiveName" @tab-change="handleTabChange">
+				<el-tab-pane label="基础信息" name="基础信息" style="overflow-y: auto; height: 60vh">
 					<el-row style="padding: 10px">
 						<el-col :span="12" class="mb20">
 							<el-form-item label="货号" prop="productCode">
@@ -27,7 +27,7 @@
 						<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-option v-for="item in categoryOptions" :key="item?.id" :label="item?.name" :value="item?.id" />
 								</el-select>
 							</el-form-item>
 						</el-col>
@@ -183,10 +183,10 @@
 						</el-col>
 					</el-row>
 				</el-tab-pane>
-				<el-tab-pane label="包装单位" name="包装单位" disabled style="overflow-y: auto; height: 60vh">
+				<el-tab-pane label="包装单位" name="包装单位" style="overflow-y: auto; height: 60vh">
 					<supermarketUnit v-model:supermarketUnitEntityList="form.supermarketUnitEntityList" />
 				</el-tab-pane>
-				<el-tab-pane label="辅助条码" name="辅助条码" disabled style="overflow-y: auto; height: 60vh">
+				<el-tab-pane label="辅助条码" name="辅助条码" style="overflow-y: auto; height: 60vh">
 					<supermarketAuxiliaryCode v-model:supermarketAuxiliaryCodeEntityList="form.supermarketAuxiliaryCodeEntityList" />
 				</el-tab-pane>
 			</el-tabs>
@@ -213,6 +213,7 @@ import { fetchList } from '/@/api/supermarketerp/smErpSupplier';
 import { rule } from '/@/utils/validate';
 import supermarketAuxiliaryCode from './components/supermarketAuxiliaryCode/index.vue';
 import supermarketUnit from './components/supermarketUnit/index.vue';
+import { TabPaneName } from 'element-plus';
 
 const emit = defineEmits(['refresh']);
 
@@ -310,6 +311,7 @@ const getsupermarketSpuData = (id: string) => {
 // 打开弹窗
 const openDialog = async (id: string) => {
 	visible.value = true;
+	currentTabPaneIndex.value = 0;
 	form.id = '';
 	form.supermarketUnitEntityList = [];
 	form.supermarketAuxiliaryCodeEntityList = [];
@@ -356,6 +358,11 @@ const openDialog = async (id: string) => {
 	}
 };
 
+// tab栏切换
+const handleTabChange = (name: TabPaneName) => {
+	currentTabPaneIndex.value = tabPaneEnum.findIndex((item) => item === name);
+};
+
 // 提交
 const onSubmit = async () => {
 	console.log(form);
@@ -391,10 +398,3 @@ defineExpose({
 	openDialog,
 });
 </script>
-
-<style scoped lang="scss">
-:deep(.el-tabs__item.is-disabled) {
-	color: #2e5cf6;
-	cursor: default;
-}
-</style>
diff --git a/src/views/supermarket/supermarketSpu/index.vue b/src/views/supermarket/supermarketSpu/index.vue
index cf54c36..e39e767 100644
--- a/src/views/supermarket/supermarketSpu/index.vue
+++ b/src/views/supermarket/supermarketSpu/index.vue
@@ -60,11 +60,15 @@
 				<el-table-column prop="unit" label="单位" show-overflow-tooltip />
 				<el-table-column prop="categoryId" label="商品分类" show-overflow-tooltip width="100">
 					<template #default="scope">
-						{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId).name }}
+						{{ supermarketCategory?.find((item: any) => item.id === scope.row.categoryId)?.name }}
 					</template>
 				</el-table-column>
-				<el-table-column prop="picUrl" label="封面图" show-overflow-tooltip />
-				<el-table-column prop="status" label="商品状态" show-overflow-tooltip width="100">
+				<el-table-column prop="picUrl" label="封面图" width="140">
+					<template #default="scope">
+						<el-image style="width: 100px; height: 100px" :src="imageBaseUrl + scope.row.picUrl" fit="cover" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="status" label="商品状态" width="100">
 					<template #default="scope">
 						<dict-tag :options="status" :value="scope.row.status"></dict-tag>
 					</template>
@@ -112,6 +116,7 @@ import { BasicTableProps, useTable } from '/@/hooks/table';
 import { fetchList, delObjs, getSupermarketCategory } from '/@/api/supermarket/supermarketSpu';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useDict } from '/@/hooks/dict';
+const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));