diff --git a/src/views/supermarketerp/supermarketCategory/form.vue b/src/views/supermarketerp/supermarketCategory/form.vue
index 8848ed5..41485c5 100644
--- a/src/views/supermarketerp/supermarketCategory/form.vue
+++ b/src/views/supermarketerp/supermarketCategory/form.vue
@@ -29,9 +29,7 @@
 				<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 :label="item.value" v-for="(item, index) in status" border :key="index">{{ item.label }} </el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
@@ -56,7 +54,7 @@
 <script setup lang="ts" name="SupermarketCategoryDialog">
 import { useDict } from "/@/hooks/dict"
 import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/src/api/supermarketerp/supermarketCategory"
+import { getObj, addObj, putObj } from "/@/api/supermarketerp/supermarketCategory"
 import { rule } from "/@/utils/validate"
 const emit = defineEmits(["refresh"])
 
diff --git a/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue b/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue
index 753886c..9739022 100644
--- a/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/supermarketInventory.vue
@@ -1,5 +1,65 @@
-<template></template>
+<template>
+	<div class="w-full h-full p-1">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="90px">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="总库存" prop="stock" class="flex 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-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">
-const supermarketInventory = defineModel("supermarketInventory", { type: Object, default: () => {} })
+import { ref } from "vue"
+const stock = defineModel("stock", { default: 0 })
+const inventoryUpperLimit = defineModel("inventoryUpperLimit", { default: 0 })
+const inventoryLowerLimit = defineModel("inventoryLowerLimit", { default: 0 })
+
+const dataFormRef = ref()
+// const form = reactive({
+// 	stock: 0,
+// 	inventoryUpperLimit: 0,
+// 	inventoryLowerLimit: 0,
+// })
+
+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 f41fbde..889690a 100644
--- a/src/views/supermarketerp/supermarketSpu/form.vue
+++ b/src/views/supermarketerp/supermarketSpu/form.vue
@@ -95,16 +95,6 @@
 								<el-input-number v-model="form.costPrice" :min="0" :precision="2" />
 							</el-form-item>
 						</el-col>
-						<el-col :span="14" class="mb20">
-							<el-form-item label="总库存" prop="stock">
-								<el-alert type="warning" show-icon>
-									<p>
-										注：最小售卖单位的总库存,否则无法换算完成库存扣减,每卖出一个包装形式的商品，都会进行总库存-内装数，实现多种包装形式售卖
-									</p>
-								</el-alert>
-								<el-input-number v-model="form.stock" :min="0" :precision="0" />
-							</el-form-item>
-						</el-col>
 						<el-col :span="24" class="mb20">
 							<el-form-item label="商品状态" prop="status">
 								<el-radio-group v-model="form.status">
@@ -127,16 +117,6 @@
 								<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="inventoryUpperLimit">
-								<el-input-number v-model="form.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="form.inventoryLowerLimit" :min="0" :precision="0" />
-							</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" />
@@ -148,8 +128,12 @@
 					<supermarket-unit ref="supermarketUnitEntityListRef" v-model:supermarketUnitEntityList="form.smErpUnitEntityList" />
 				</el-tab-pane>
 				<el-tab-pane label="库存" name="库存" style="overflow-y: auto; height: 60vh">
-					<!-- form.supermarketInventory -->
-					<supermarket-inventory ref="supermarketInventoryRef" v-model:supermarketInventory="form.supermarketInventory" />
+					<supermarket-inventory
+						ref="supermarketInventoryRef"
+						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
@@ -163,8 +147,8 @@
 		<template #footer>
 			<el-button @click="visible = false">取消</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>
+			<el-button v-if="currentTabPaneIndex != 3" type="primary" @click="currentTabPaneIndex++">下一步</el-button>
+			<el-button v-if="currentTabPaneIndex == 3" type="primary" @click="onSubmit" :disabled="loading">确 认</el-button>
 		</template>
 	</el-dialog>
 </template>
@@ -239,7 +223,6 @@ const dataRules = {
 	barcode: [{ required: true, message: "自编码/条码不能为空", trigger: "blur" }],
 	productName: [{ required: true, message: "商品名称不能为空", trigger: "blur" }],
 	unit: [{ required: true, message: "单位不能为空", trigger: "blur" }],
-	stock: [{ required: true, message: "总库存不能为空", trigger: "blur" }],
 	categoryId: [{ required: true, message: "商品分类不能为空", trigger: "blur" }],
 	brandId: [{ required: true, message: "品牌不能为空", trigger: "blur" }],
 	picUrl: [{ required: true, message: "商品封面图不能为空", trigger: "blur" }],
@@ -348,6 +331,7 @@ const onSubmit = async () => {
 	if (!form.smErpUnitEntityList || form.smErpUnitEntityList.length <= 0) return useMessage().warning("请添加包装单位")
 	if (!form.smErpAuxiliaryCodeEntityList || form.smErpAuxiliaryCodeEntityList.length <= 0) return useMessage().warning("请添加辅助条码")
 	if (!(await supermarketUnitEntityListRef.value.editableTableValidate())) return useMessage().warning("包装单位必填项未填写完整")
+	if (!(await supermarketInventoryRef.value.stockValidate())) return useMessage().warning("库存必填项未填写完整")
 	if (!(await supermarketAuxiliaryCodeEntityList.value.editableTableValidate())) return useMessage().warning("辅助条码必填项未填写完整")
 
 	try {