From 0a34e1e89432b6e1c41c68bcf35a67be42471c6b Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Fri, 27 Dec 2024 18:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=86=E5=B8=83=E8=A1=A8=E5=8D=95=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=E8=A1=A8=E5=8D=95=E9=A1=B9=EF=BC=8C?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=A7=BB=E9=99=A4=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/admin/menu.ts                         |  98 ++--
 src/components/TagList/index.vue              | 108 ++--
 src/components/Upload/Image.vue               |   2 +-
 src/i18n/lang/en.ts                           |   7 +-
 src/i18n/lang/zh-cn.ts                        |   7 +-
 src/views/home/index.vue                      |  18 +-
 src/views/home/navMenu/index.vue              |  21 +-
 src/views/supermarket/supermarketSpu/form.vue | 520 ++++++++----------
 .../supermarket/supermarketSpu/index.vue      | 262 ++++-----
 9 files changed, 500 insertions(+), 543 deletions(-)

diff --git a/src/api/admin/menu.ts b/src/api/admin/menu.ts
index 714b93b..25cc670 100644
--- a/src/api/admin/menu.ts
+++ b/src/api/admin/menu.ts
@@ -1,50 +1,50 @@
 import request from '/@/utils/request';
 
 export const pageList = (params?: Object) => {
-    return request({
-        url: '/admin/menu/tree',
-        method: 'get',
-        params,
-    });
+	return request({
+		url: '/admin/menu/tree',
+		method: 'get',
+		params,
+	});
 };
 
 export const getObj = (obj: object) => {
-    return request({
-        url: `/admin/menu/details`,
-        method: 'get',
-        params: obj
-    });
+	return request({
+		url: `/admin/menu/details`,
+		method: 'get',
+		params: obj,
+	});
 };
 
 export const save = (data: Object) => {
-    return request({
-        url: '/admin/menu',
-        method: 'post',
-        data: data,
-    });
+	return request({
+		url: '/admin/menu',
+		method: 'post',
+		data: data,
+	});
 };
 
 export const putObj = (data: Object) => {
-    return request({
-        url: '/admin/menu',
-        method: 'put',
-        data: data,
-    });
+	return request({
+		url: '/admin/menu',
+		method: 'put',
+		data: data,
+	});
 };
 
 export const addObj = (data: Object) => {
-    return request({
-        url: '/admin/menu',
-        method: 'post',
-        data: data,
-    });
+	return request({
+		url: '/admin/menu',
+		method: 'post',
+		data: data,
+	});
 };
 
 export const delObj = (id: string) => {
-    return request({
-        url: '/admin/menu/' + id,
-        method: 'delete',
-    });
+	return request({
+		url: '/admin/menu/' + id,
+		method: 'delete',
+	});
 };
 
 /**
@@ -52,27 +52,27 @@ export const delObj = (id: string) => {
  * @method getAdminMenu 获取后端动态路由菜单(admin)
  */
 export function useMenuApi() {
-    return {
-        getAdminMenu: (params?: object) => {
-            return request({
-                url: '/admin/menu',
-                method: 'get',
-                params,
-            });
-        },
-    };
+	return {
+		getAdminMenu: (params?: object): any => {
+			return request({
+				url: '/admin/menu',
+				method: 'get',
+				params,
+			});
+		},
+	};
 }
 
 export function validateExist(rule: any, value: any, callback: any, isEdit: boolean) {
-    if (isEdit) {
-        return callback();
-    }
-    getObj({[rule.field]: value}).then((response) => {
-        const result = response.data;
-        if (result !== null && result.length > 0) {
-            callback(new Error('数据已经存在'));
-        } else {
-            callback();
-        }
-    });
+	if (isEdit) {
+		return callback();
+	}
+	getObj({ [rule.field]: value }).then((response) => {
+		const result = response.data;
+		if (result !== null && result.length > 0) {
+			callback(new Error('数据已经存在'));
+		} else {
+			callback();
+		}
+	});
 }
diff --git a/src/components/TagList/index.vue b/src/components/TagList/index.vue
index bc5067d..32f55bd 100644
--- a/src/components/TagList/index.vue
+++ b/src/components/TagList/index.vue
@@ -1,50 +1,43 @@
 <template>
-  <div class="flex flex-wrap items-center gap-2 max-w-full">
-    <el-tag
-        v-for="tag in tags"
-        :key="tag"
-        :type="tagType"
-        closable
-        :disable-transitions="false"
-        @close="handleClose(tag)"
-    >
-      {{ tag }}
-    </el-tag>
-    <el-input
-        v-if="inputVisible"
-        ref="InputRef"
-        v-model="inputValue"
-        class="w-20"
-        size="small"
-        @keyup.enter="handleInputConfirm"
-        @blur="handleInputConfirm"
-    />
-    <el-button v-else class="button-new-tag" size="small" @click="showInput">
-      {{ buttonText }}
-    </el-button>
-  </div>
+	<div class="flex flex-wrap items-center gap-2 max-w-full">
+		<el-tag v-for="tag in tags" :key="tag" :type="tagType" closable :disable-transitions="false" @close="handleClose(tag)">
+			{{ tag }}
+		</el-tag>
+		<el-input
+			v-if="inputVisible"
+			ref="InputRef"
+			v-model="inputValue"
+			class="w-20"
+			size="small"
+			@keyup.enter="handleInputConfirm"
+			@blur="handleInputConfirm"
+		/>
+		<el-button v-else class="button-new-tag" size="small" @click="showInput">
+			{{ buttonText }}
+		</el-button>
+	</div>
 </template>
 
 <script lang="ts" setup>
-import {ref, nextTick, defineProps, defineEmits} from 'vue';
-import {ElInput} from 'element-plus';
+import { ref, nextTick } from 'vue';
+import { ElInput } from 'element-plus';
 
 const props = defineProps({
-  modelValue: {
-    type: Array as () => string[],
-    default: () => []
-  },
-  buttonText: {
-    type: String,
-    default: '+ New Tag'
-  },
-  tagType: {
-    type: String,
-    default: 'primary',
-    validator: (value: string) => {
-      return ['primary', 'success', 'info', 'warning', 'danger'].includes(value);
-    }
-  }
+	modelValue: {
+		type: Array as () => string[],
+		default: () => [],
+	},
+	buttonText: {
+		type: String,
+		default: '+ New Tag',
+	},
+	tagType: {
+		type: String,
+		default: 'primary',
+		validator: (value: string) => {
+			return ['primary', 'success', 'info', 'warning', 'danger'].includes(value);
+		},
+	},
 });
 
 const emits = defineEmits(['update:modelValue']);
@@ -56,27 +49,30 @@ const InputRef = ref<InstanceType<typeof ElInput>>();
 const tags = ref([...props.modelValue]);
 
 const handleClose = (tag: string) => {
-  tags.value.splice(tags.value.indexOf(tag), 1);
-  emits('update:modelValue', tags.value);
+	tags.value.splice(tags.value.indexOf(tag), 1);
+	emits('update:modelValue', tags.value);
 };
 
-watch(() => props.modelValue, (val) => {
-  tags.value = val;
-});
+watch(
+	() => props.modelValue,
+	(val) => {
+		tags.value = val;
+	}
+);
 
 const showInput = () => {
-  inputVisible.value = true;
-  nextTick(() => {
-    InputRef.value!.input!.focus();
-  });
+	inputVisible.value = true;
+	nextTick(() => {
+		InputRef.value!.input!.focus();
+	});
 };
 
 const handleInputConfirm = () => {
-  if (inputValue.value) {
-    tags.value.push(inputValue.value);
-    emits('update:modelValue', tags.value);
-  }
-  inputVisible.value = false;
-  inputValue.value = '';
+	if (inputValue.value) {
+		tags.value.push(inputValue.value);
+		emits('update:modelValue', tags.value);
+	}
+	inputVisible.value = false;
+	inputValue.value = '';
 };
 </script>
diff --git a/src/components/Upload/Image.vue b/src/components/Upload/Image.vue
index 080625b..5388b76 100644
--- a/src/components/Upload/Image.vue
+++ b/src/components/Upload/Image.vue
@@ -72,7 +72,7 @@ interface UploadFileProps {
 	borderRadius?: string; // 组件边框圆角 ==> 非必传（默认为 8px）
 	iconSize?: number;
 	dir?: string; // 文件目录
-	listType: string;
+	listType?: string;
 }
 
 // 接受父组件参数
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 5736056..04ef22d 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -1,5 +1,10 @@
 export default {
 	router: {
+		systemManagement: 'systemManagement',
+		bizPlatform: 'bizPlatform',
+		baseTools: 'baseTools',
+		collaborativeOffic: 'collaborativeOffic',
+		platformDevelop: 'platformDevelop',
 		home: 'Home',
 		system: 'System',
 		systemMenu: 'System Menu',
@@ -115,7 +120,7 @@ export default {
 		fullscreen: 'Fullscreen',
 		closeFullscreen: 'Close Fullscreen',
 		favorite: 'Favorite',
-		favoriteMax: 'The number of shortcut navigation exceeds the upper limit. Please remove some shortcuts'
+		favoriteMax: 'The number of shortcut navigation exceeds the upper limit. Please remove some shortcuts',
 	},
 	notFound: {
 		foundTitle: 'Wrong Address Input, Please Re-enter the Address~',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index 7c85e50..e351e8e 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -1,6 +1,11 @@
 // 定义内容
 export default {
 	router: {
+		systemManagement: '系统管理',
+		bizPlatform: '业务平台',
+		baseTools: '基础工具',
+		collaborativeOffic: '协同办公',
+		platformDevelop: '开发平台',
 		home: '首页',
 		system: '系统设置',
 		systemMenu: '菜单管理',
@@ -108,7 +113,7 @@ export default {
 		fullscreen: '当前页全屏',
 		closeFullscreen: '关闭全屏',
 		favorite: '收藏',
-		favoriteMax: '快捷导航数量超过上限，请移除部分'
+		favoriteMax: '快捷导航数量超过上限，请移除部分',
 	},
 	notFound: {
 		foundTitle: '地址输入错误，请重新输入地址~',
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 62575c1..5db0505 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1,7 +1,6 @@
 <template>
-	<div>
-		<navMmenu />
-		<div v-if="pageLoading">
+	<navMmenu />
+	<!-- <div v-if="pageLoading">
 			<el-main>
 				<el-card shadow="never">
 					<el-skeleton :rows="1"></el-skeleton>
@@ -11,17 +10,16 @@
 				</el-card>
 			</el-main>
 		</div>
-		<widgets />
-	</div>
+		<widgets /> -->
 </template>
 
 <script setup lang="ts" name="dashboard">
 import navMmenu from './navMenu/index.vue';
 
-const Widgets = defineAsyncComponent(() => import('./widgets/index.vue'));
-const pageLoading = ref(true);
+// const Widgets = defineAsyncComponent(() => import('./widgets/index.vue'));
+// const pageLoading = ref(true);
 
-onMounted(() => {
-	pageLoading.value = false;
-});
+// onMounted(() => {
+// 	pageLoading.value = false;
+// });
 </script>
diff --git a/src/views/home/navMenu/index.vue b/src/views/home/navMenu/index.vue
index c2660de..dba8ad4 100644
--- a/src/views/home/navMenu/index.vue
+++ b/src/views/home/navMenu/index.vue
@@ -1,10 +1,10 @@
 <template>
-	<el-card class="box-card p-10" style="min-height: 40vw; background-image: linear-gradient(0deg, #ffffff 0%, #d3f9f1aa 100%)" v-loading="loading">
+	<el-card class="card" v-loading="loading">
 		<el-row>
 			<el-col :span="4" v-for="(item, index) in navMenuListTop" :key="index">
 				<div :class="['nav-menu-item-top', item.id == currentActiveMenuId ? 'nav-menu-item-active' : '']" @click="currentActiveMenuId = item.id">
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
-					<div class="nav-menu-item-name">{{ item.name }}</div>
+					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
 				</div>
 			</el-col>
 		</el-row>
@@ -13,7 +13,7 @@
 			<el-col :span="3" v-for="(item, index) in navMenuListBottom" :key="index">
 				<div class="nav-menu-item-bottom" @click="handleClickBottomMenu(item)">
 					<el-image class="nav-menu-item-icon" :src="imageBaseUrl + item.menuPic" fit="cover" />
-					<div class="nav-menu-item-name">{{ item.name }}</div>
+					<div class="nav-menu-item-name">{{ $t(item.name) }}</div>
 				</div>
 			</el-col>
 		</el-row>
@@ -22,10 +22,11 @@
 
 <script setup lang="ts">
 import { ref } from 'vue';
-import { pageList } from '/@/api/admin/menu';
 import { ElMessage } from 'element-plus';
+import { useMenuApi } from '/@/api/admin/menu';
 
 const router = useRouter();
+const menuApi = useMenuApi();
 const loading = ref(false);
 const navMenuList = ref<any>([]);
 const navMenuListTop = ref<any>([]);
@@ -36,7 +37,7 @@ const imageBaseUrl = import.meta.env.VITE_IMAGE_BASE_PATH;
 const getNavMenuList = async () => {
 	loading.value = true;
 	try {
-		const res = await pageList({ current: 1, size: 999 }).finally(() => {
+		const res = await menuApi.getAdminMenu().finally(() => {
 			loading.value = false;
 		});
 		if (res.code == 0 && res.data.length > 0) {
@@ -72,6 +73,11 @@ onMounted(async () => {
 </script>
 
 <style scoped lang="scss">
+.card {
+	padding: 5vw;
+	height: 100%;
+	background-image: linear-gradient(0deg, #ffffff 0%, #d3f9f1aa 100%);
+}
 .nav-menu-item-top {
 	height: 6.5vw;
 	padding: 0.5vw;
@@ -82,8 +88,8 @@ onMounted(async () => {
 	justify-content: space-around;
 	background-color: #f9f9f9;
 	border-radius: 1rem;
-	cursor: pointer;
 	overflow: hidden;
+	cursor: pointer;
 
 	.nav-menu-item-icon {
 		width: 2.5vw;
@@ -103,7 +109,7 @@ onMounted(async () => {
 
 .nav-menu-item-bottom {
 	min-height: 4vw;
-	margin: 1vw;
+	margin: 1vw 2vw;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -127,7 +133,6 @@ onMounted(async () => {
 @media (max-width: 768px) {
 	.nav-menu-item-top {
 		height: 10vw;
-
 		padding: 1vw;
 		margin: 1vw;
 		.nav-menu-item-icon {
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index 99590a0..d4a8d02 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -1,247 +1,199 @@
 <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-col :span="12" class="mb20">
-					<el-form-item label="货号" prop="productCode">
-						<el-input v-model="form.productCode" placeholder="请输入货号" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="自编码/条码" prop="barcode">
-						<el-input v-model="form.barcode" placeholder="请输入自编码/条码" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商品名称" prop="productName">
-						<el-input v-model="form.productName" placeholder="请输入商品名称" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="单位" prop="unit">
-						<el-input v-model="form.unit" placeholder="请输入单位" />
-					</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.typeName" :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.typeName" :value="item.id" />
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商品封面图" prop="picUrl">
-						<upload-file v-model:imageUrl="form.picUrl"></upload-file>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商品轮播图" prop="sliderPicUrls">
-						<upload-file v-model:imageUrl="form.sliderPicUrls"></upload-file>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="排序字段" prop="sort">
-						<el-input-number :min="1" :max="1000" v-model="form.sort" placeholder="请输入排序字段"></el-input-number>
-					</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="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="costPrice">
-						<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位： 分"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="库存" prop="stock">
-						<el-input-number v-model="form.stock" placeholder="请输入库存"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="赠送积分" prop="giveIntegral">
-						<el-input-number v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="商户编号" prop="merchantId">
-						<el-select v-model="form.merchantId" placeholder="请选择商户编号">
-							<el-option label="请选择">0</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="规格" prop="specification">
-						<el-input v-model="form.specification" placeholder="请输入规格" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="产地" prop="origin">
-						<el-input v-model="form.origin" placeholder="请输入产地" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="装数" prop="packingQuantity">
-						<el-input-number :min="1" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="零售价" prop="retailPrice">
-						<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>
-					</el-form-item>
-				</el-col>
-				<el-col :span="12" class="mb20">
-					<el-form-item label="进价" prop="purchasePrice">
-						<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="货商" prop="supplierId">
-						<el-select v-model="form.supplierId" placeholder="请选择货商">
-							<el-option label="请选择">0</el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="会员价1" prop="memberPrice1">
-						<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="会员价2" prop="memberPrice2">
-						<el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="会员价3" prop="memberPrice3">
-						<el-input v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="批发价1" prop="wholesalePrice1">
-						<el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="批发价2" prop="wholesalePrice2">
-						<el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="批发价3" prop="wholesalePrice3">
-						<el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="促销价" prop="promotionPrice">
-						<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>
-					</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="12" class="mb20">
-					<el-form-item label="商品简介" prop="introduction">
-						<el-input type="textarea" v-model="form.introduction" placeholder="请输入商品简介" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商品详情" prop="description">
-						<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
-					</el-form-item>
-				</el-col>
-				<!--    <el-col :span="12" class="mb20">-->
-				<!--      <el-form-item label="签名上锁" prop="archiverSignature">-->
-				<!--            <el-radio-group v-model="form.archiverSignature">-->
-				<!--           <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="inventoryArea">-->
-				<!--            <el-radio-group v-model="form.inventoryArea">-->
-				<!--           <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="commissionRate">-->
-				<!--          <el-select v-model="form.commissionRate" placeholder="请选择比例提成">-->
-				<!--            <el-option label="请选择">0</el-option>-->
-				<!--          </el-select>-->
-				<!--        </el-form-item>-->
-				<!--      </el-col>-->
-
-				<!--    <el-col :span="12" class="mb20">-->
-				<!--      <el-form-item label="联营扣率" prop="jointDeductionRate">-->
-				<!--        <el-input v-model="form.jointDeductionRate" placeholder="请输入联营扣率"/>-->
-				<!--      </el-form-item>-->
-				<!--      </el-col>-->
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="库存上限" prop="inventoryUpperLimit">
-						<el-input-number v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="库存下限" prop="inventoryLowerLimit">
-						<el-input-number v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"></el-input-number>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="12" class="mb20">
-					<el-form-item label="毛利率" prop="grossMargin">
-						<el-input-number v-model="form.grossMargin" placeholder="请输入毛利率"></el-input-number>
-					</el-form-item>
-				</el-col>
-			</el-row>
+	<el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="true" 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: scroll; height: 50vh">
+					<el-row style="padding: 10px">
+						<el-col :span="12" class="mb20">
+							<el-form-item label="货号" prop="productCode">
+								<el-input v-model="form.productCode" placeholder="请输入货号" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="自编码/条码" prop="barcode">
+								<el-input v-model="form.barcode" placeholder="请输入自编码/条码" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="商品名称" prop="productName">
+								<el-input v-model="form.productName" placeholder="请输入商品名称" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="单位" prop="unit">
+								<el-input v-model="form.unit" placeholder="请输入单位" />
+							</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="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="24" class="mb20">
+							<el-form-item label="商品轮播图" prop="sliderPicUrls">
+								<upload-imgs v-model:imageUrl="form.sliderPicUrls"></upload-imgs>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="排序字段" prop="sort">
+								<el-input-number :min="0" :max="1000" v-model="form.sort" placeholder="请输入排序字段"></el-input-number>
+							</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="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="costPrice">
+								<el-input-number v-model="form.costPrice" placeholder="请输入成本单价，单位:分"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="库存" prop="stock">
+								<el-input-number v-model="form.stock" placeholder="请输入库存"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="赠送积分" prop="giveIntegral">
+								<el-input-number v-model="form.giveIntegral" placeholder="请输入赠送积分"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="商户编号" prop="merchantId">
+								<el-select v-model="form.merchantId" placeholder="请选择商户编号">
+									<el-option label="请选择" value="">???</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="规格" prop="specification">
+								<el-input v-model="form.specification" placeholder="请输入规格" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="产地" prop="origin">
+								<el-input v-model="form.origin" placeholder="请输入产地" />
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="装数" prop="packingQuantity">
+								<el-input-number :min="0" v-model="form.packingQuantity" placeholder="请输入装数"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="零售价" prop="retailPrice">
+								<el-input-number v-model="form.retailPrice" placeholder="请输入零售价"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="进价" prop="purchasePrice">
+								<el-input-number v-model="form.purchasePrice" placeholder="请输入进价"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="货商" prop="supplierId">
+								<el-select v-model="form.supplierId" placeholder="请选择货商">
+									<el-option label="请选择" value="">???</el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="会员价1" prop="memberPrice1">
+								<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="会员价2" prop="memberPrice2">
+								<el-input-number v-model="form.memberPrice2" placeholder="请输入会员价2"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="会员价3" prop="memberPrice3">
+								<el-input-number v-model="form.memberPrice3" placeholder="请输入会员价3"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="批发价1" prop="wholesalePrice1">
+								<el-input-number v-model="form.wholesalePrice1" placeholder="请输入批发价1"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="批发价2" prop="wholesalePrice2">
+								<el-input-number v-model="form.wholesalePrice2" placeholder="请输入批发价2"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="批发价3" prop="wholesalePrice3">
+								<el-input-number v-model="form.wholesalePrice3" placeholder="请输入批发价3"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="促销价" prop="promotionPrice">
+								<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>
+							</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="introduction">
+								<el-input type="textarea" v-model="form.introduction" rows="3" placeholder="请输入商品简介" maxlength="200" show-word-limit />
+							</el-form-item>
+						</el-col>
+						<el-col :span="24" class="mb20">
+							<el-form-item label="商品详情" prop="description">
+								<editor v-if="visible" v-model:get-html="form.description" placeholder="请输入商品详情"></editor>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="库存上限" prop="inventoryUpperLimit">
+								<el-input-number v-model="form.inventoryUpperLimit" placeholder="请输入库存上限"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="库存下限" prop="inventoryLowerLimit">
+								<el-input-number v-model="form.inventoryLowerLimit" placeholder="请输入库存下限"></el-input-number>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12" class="mb20">
+							<el-form-item label="毛利率" prop="grossMargin">
+								<el-input-number v-model="form.grossMargin" placeholder="请输入毛利率"></el-input-number>
+							</el-form-item>
+						</el-col>
+					</el-row>
+				</el-tab-pane>
+				<el-tab-pane label="包装单位" name="包装单位" disabled style="overflow-y: scroll; height: 50vh">Config</el-tab-pane>
+				<el-tab-pane label="辅助条码" name="辅助条码" disabled style="overflow-y: scroll; height: 50vh">Role</el-tab-pane>
+			</el-tabs>
 		</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>
+				<el-button v-if="currentTabPaneIndex != 0" type="primary" @click="currentTabPaneIndex--">上一步</el-button>
+				<el-button v-if="currentTabPaneIndex != 2" type="primary" @click="currentTabPaneIndex++">下一步</el-button>
+				<el-button v-if="currentTabPaneIndex == 2" type="primary" @click="onSubmit" :disabled="loading">确 认</el-button>
 			</span>
 		</template>
 	</el-dialog>
@@ -254,14 +206,12 @@ import { getObj, addObj, putObj, getSupermarketCategory, getSupermarketBrand } f
 import { rule } from '/@/utils/validate';
 const emit = defineEmits(['refresh']);
 
-// 定义变量内容
+const tabPaneEnum = ['基础信息', '包装单位', '辅助条码'];
 const dataFormRef = ref();
 const visible = ref(false);
 const loading = ref(false);
-// 定义字典
-const { supermarket_nature, status } = useDict('supermarket_nature', 'status');
-const categoryOptions = ref<any>([]); // 商品分类的下拉选项
-const brandOptions = ref<any>([]); // 超市品牌的下拉选项
+const currentTabPaneIndex = ref(0);
+const tabPaneActiveName = computed(() => tabPaneEnum[currentTabPaneIndex.value]);
 
 // 提交表单数据
 const form = reactive({
@@ -270,9 +220,8 @@ const form = reactive({
 	barcode: '',
 	productName: '',
 	unit: '',
-	introduction: '',
-	description: '',
 	categoryId: '',
+	brandId: '',
 	picUrl: '',
 	sliderPicUrls: '',
 	sort: 0,
@@ -281,12 +230,12 @@ const form = reactive({
 	stock: 0,
 	giveIntegral: 0,
 	merchantId: '',
-	deptId: '',
 	specification: '',
 	origin: '',
 	packingQuantity: 0,
-	purchasePrice: 0,
 	retailPrice: 0,
+	purchasePrice: 0,
+	supplierId: '',
 	memberPrice1: 0,
 	memberPrice2: 0,
 	memberPrice3: 0,
@@ -295,44 +244,41 @@ const form = reactive({
 	wholesalePrice3: 0,
 	promotionPrice: 0,
 	productNature: '',
-	archiverSignature: '',
-	inventoryArea: '',
-	commissionRate: '',
-	jointDeductionRate: '',
+	introduction: '',
+	description: '',
 	inventoryUpperLimit: 0,
 	inventoryLowerLimit: 0,
 	grossMargin: 0,
-	auxiliaryBarcodeId: '',
-	brandId: '',
-	supplierId: '',
 });
-
 // 定义校验规则
-const dataRules = ref({
+const dataRules = {
 	productCode: [{ required: true, message: '货号不能为空', trigger: 'blur' }],
 	barcode: [{ required: true, message: '自编码/条码不能为空', trigger: 'blur' }],
 	productName: [{ required: true, message: '商品名称不能为空', trigger: 'blur' }],
 	unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
-	sort: [{ validator: rule.number, trigger: 'blur' }],
-	costPrice: [{ validator: rule.number, trigger: 'blur' }],
-	stock: [
-		{ required: true, message: '库存不能为空', trigger: 'blur' },
-		{ validator: rule.number, trigger: 'blur' },
-	],
-	giveIntegral: [{ validator: rule.number, trigger: 'blur' }],
-	packingQuantity: [{ validator: rule.number, trigger: 'blur' }],
-	purchasePrice: [{ validator: rule.number, trigger: 'blur' }],
-	retailPrice: [{ validator: rule.number, trigger: 'blur' }],
-	memberPrice1: [{ validator: rule.number, trigger: 'blur' }],
-	memberPrice2: [{ validator: rule.number, trigger: 'blur' }],
-	memberPrice3: [{ validator: rule.number, trigger: 'blur' }],
-	wholesalePrice1: [{ validator: rule.number, trigger: 'blur' }],
-	wholesalePrice2: [{ validator: rule.number, trigger: 'blur' }],
-	wholesalePrice3: [{ validator: rule.number, trigger: 'blur' }],
-	promotionPrice: [{ validator: rule.number, trigger: 'blur' }],
-	inventoryUpperLimit: [{ validator: rule.number, trigger: 'blur' }],
-	inventoryLowerLimit: [{ validator: rule.number, trigger: 'blur' }],
-});
+	categoryId: [{ required: true, message: '商品分类不能为空', trigger: 'blur' }],
+	brandId: [{ required: true, message: '品牌不能为空', trigger: 'blur' }],
+	picUrl: [{ required: true, message: '商品封面图不能为空', trigger: 'blur' }],
+	status: [{ required: true, message: '请选择商品状态', trigger: 'blur' }],
+	merchantId: [{ required: true, message: '商户编号不能为空', trigger: 'blur' }],
+	supplierId: [{ required: true, message: '请选择货商', trigger: 'blur' }],
+};
+const { supermarket_nature, status } = useDict('supermarket_nature', 'status');
+const categoryOptions = ref<any>([]); // 商品分类的下拉选项
+const brandOptions = ref<any>([]); // 超市品牌的下拉选项
+
+// 初始化表单数据
+const getsupermarketSpuData = (id: string) => {
+	// 获取数据
+	loading.value = true;
+	getObj(id)
+		.then((res: any) => {
+			Object.assign(form, res.data);
+		})
+		.finally(() => {
+			loading.value = false;
+		});
+};
 
 // 打开弹窗
 const openDialog = async (id: string) => {
@@ -387,21 +333,15 @@ const onSubmit = async () => {
 	}
 };
 
-// 初始化表单数据
-const getsupermarketSpuData = (id: string) => {
-	// 获取数据
-	loading.value = true;
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data);
-		})
-		.finally(() => {
-			loading.value = false;
-		});
-};
-
 // 暴露变量
 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 d26ea64..7bc8043 100644
--- a/src/views/supermarket/supermarketSpu/index.vue
+++ b/src/views/supermarket/supermarketSpu/index.vue
@@ -1,162 +1,170 @@
 <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="productCode" >
-        <el-input placeholder="请输入货号" v-model="state.queryForm.productCode" />
-      </el-form-item>
-      <el-form-item label="自编码/条码" prop="barcode" >
-        <el-input placeholder="请输入自编码/条码" v-model="state.queryForm.barcode" />
-      </el-form-item>
-      <el-form-item label="商品名称" prop="productName" >
-        <el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
-      </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="'supermarket_supermarketSpu_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'supermarket_supermarketSpu_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'supermarket_supermarketSpu_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="productCode">
+						<el-input placeholder="请输入货号" v-model="state.queryForm.productCode" />
+					</el-form-item>
+					<el-form-item label="自编码/条码" prop="barcode">
+						<el-input placeholder="请输入自编码/条码" v-model="state.queryForm.barcode" />
+					</el-form-item>
+					<el-form-item label="商品名称" prop="productName">
+						<el-input placeholder="请输入商品名称" v-model="state.queryForm.productName" />
+					</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="'supermarket_supermarketSpu_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'supermarket_supermarketSpu_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删 除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'supermarket_supermarketSpu_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="productCode" label="货号"  show-overflow-tooltip/>
-          <el-table-column prop="barcode" label="自编码/条码"  show-overflow-tooltip/>
-          <el-table-column prop="productName" label="商品名称"  show-overflow-tooltip/>
-          <el-table-column prop="unit" label="单位"  show-overflow-tooltip/>
-          <el-table-column prop="categoryId" label="商品分类"  show-overflow-tooltip/>
-          <el-table-column prop="picUrl" label="封面图"  show-overflow-tooltip/>
-          <el-table-column prop="status" label="商品状态" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="status" :value="scope.row.status"></dict-tag>
-            </template>
-          </el-table-column>
-          <el-table-column prop="costPrice" label="成本单价"  show-overflow-tooltip/>
-          <el-table-column prop="stock" label="库存"  show-overflow-tooltip/>
-<!--          <el-table-column prop="giveIntegral" label="赠送积分"  show-overflow-tooltip/>-->
-<!--          <el-table-column prop="merchantId" label="商户编号"  show-overflow-tooltip/>-->
-          <el-table-column prop="specification" label="规格"  show-overflow-tooltip/>
-<!--          <el-table-column prop="origin" label="产地"  show-overflow-tooltip/>-->
-          <el-table-column prop="packingQuantity" label="装数"  show-overflow-tooltip/>
-          <el-table-column prop="purchasePrice" label="进价）"  show-overflow-tooltip/>
-          <el-table-column prop="retailPrice" label="零售价"  show-overflow-tooltip/>
-          <el-table-column prop="promotionPrice" label="促销价"  show-overflow-tooltip/>
-          <el-table-column prop="productNature" label="商品性质" show-overflow-tooltip>
-      <template #default="scope">
-                <dict-tag :options="supermarket_nature" :value="scope.row.productNature"></dict-tag>
-            </template>
-          </el-table-column>
-<!--          <el-table-column prop="inventoryUpperLimit" label="库存上限"  show-overflow-tooltip/>-->
-<!--          <el-table-column prop="inventoryLowerLimit" label="库存下限"  show-overflow-tooltip/>-->
-<!--          <el-table-column prop="grossMargin" label="毛利率"  show-overflow-tooltip/>-->
-          <el-table-column prop="brandId" label="品牌"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketSpu_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_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" fixed="left" />
+				<el-table-column type="index" label="#" width="40" />
+				<el-table-column prop="productCode" label="货号" show-overflow-tooltip />
+				<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" />
+				<el-table-column prop="picUrl" label="封面图" show-overflow-tooltip />
+				<el-table-column prop="status" label="商品状态" show-overflow-tooltip width="100">
+					<template #default="scope">
+						<dict-tag :options="status" :value="scope.row.status"></dict-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="costPrice" label="成本单价" show-overflow-tooltip width="100" />
+				<el-table-column prop="stock" label="库存" show-overflow-tooltip />
+				<!--          <el-table-column prop="giveIntegral" label="赠送积分"  show-overflow-tooltip/>-->
+				<!--          <el-table-column prop="merchantId" label="商户编号"  show-overflow-tooltip/>-->
+				<el-table-column prop="specification" label="规格" show-overflow-tooltip />
+				<!--          <el-table-column prop="origin" label="产地"  show-overflow-tooltip/>-->
+				<el-table-column prop="packingQuantity" label="装数" show-overflow-tooltip />
+				<el-table-column prop="purchasePrice" label="进价）" show-overflow-tooltip />
+				<el-table-column prop="retailPrice" label="零售价" show-overflow-tooltip />
+				<el-table-column prop="promotionPrice" label="促销价" show-overflow-tooltip />
+				<el-table-column prop="productNature" label="商品性质" show-overflow-tooltip width="100">
+					<template #default="scope">
+						<dict-tag :options="supermarket_nature" :value="scope.row.productNature"></dict-tag>
+					</template>
+				</el-table-column>
+				<!--          <el-table-column prop="inventoryUpperLimit" label="库存上限"  show-overflow-tooltip/>-->
+				<!--          <el-table-column prop="inventoryLowerLimit" label="库存下限"  show-overflow-tooltip/>-->
+				<!--          <el-table-column prop="grossMargin" label="毛利率"  show-overflow-tooltip/>-->
+				<el-table-column prop="brandId" label="品牌" show-overflow-tooltip />
+				<el-table-column label="操作" width="150" fixed="right">
+					<template #default="scope">
+						<el-button icon="edit-pen" text type="primary" v-auth="'supermarket_supermarketSpu_edit'" @click="formDialogRef.openDialog(scope.row.id)">
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'supermarket_supermarketSpu_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="systemSupermarketSpu">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import { fetchList, delObjs } from "/@/api/supermarket/supermarketSpu";
-import { useMessage, useMessageBox } from "/@/hooks/message";
+import { BasicTableProps, useTable } from '/@/hooks/table';
+import { fetchList, delObjs } from '/@/api/supermarket/supermarketSpu';
+import { useMessage, useMessageBox } from '/@/hooks/message';
 import { useDict } from '/@/hooks/dict';
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
 
-const { supermarket_nature,status } = useDict('supermarket_nature','status')
+const { supermarket_nature, status } = useDict('supermarket_nature', '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
-})
+	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('/supermarket/supermarketSpu/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketSpu.xlsx')
-}
+	downBlobFile('/supermarket/supermarketSpu/export', Object.assign(state.queryForm, { ids: selectObjs }), 'supermarketSpu.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>