diff --git a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
index 78dd8eb..215e507 100644
--- a/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
+++ b/src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue
@@ -34,25 +34,23 @@
 						<el-input-number v-model="form.packageNum" placeholder="请输入内装数量" />
 					</el-form-item>
 				</el-col>
+        <el-col :span="14" class="mb20">
+          <el-form-item label="零售价" prop="retailPrice">
+            <el-input-number v-model="form.retailPrice" placeholder="请输入零售价" />
+          </el-form-item>
+        </el-col>
 
+        <el-col :span="14" class="mb20">
+          <el-form-item label="促销价" prop="promotionPrice">
+            <el-input-number v-model="form.promotionPrice" placeholder="请输入促销价" />
+          </el-form-item>
+        </el-col>
 				<el-col :span="14" class="mb20">
 					<el-form-item label="进价" prop="purchasePrice">
 						<el-input-number v-model="form.purchasePrice" placeholder="请输入进价" />
 					</el-form-item>
 				</el-col>
 
-				<el-col :span="14" class="mb20">
-					<el-form-item label="零售价" prop="retailPrice">
-						<el-input-number v-model="form.retailPrice" placeholder="请输入零售价" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="14" class="mb20">
-					<el-form-item label="促销价" prop="promotionPrice">
-						<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价" />
-					</el-form-item>
-				</el-col>
-
 				<el-col :span="14" class="mb20">
 					<el-form-item label="成本价" prop="costPrice">
 						<el-input-number v-model="form.costPrice" placeholder="请输入成本价" />
@@ -96,12 +94,13 @@ const form = reactive({
 // 定义校验规则
 const dataRules = ref({
 	barCode: [{ required: true, message: '条码不能为空', trigger: 'blur' }],
-	spec: [{ required: true, message: 'spec不能为空', trigger: 'blur' }],
+	spec: [{ required: true, message: '规格不能为空', trigger: 'blur' }],
 	unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
 	status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
 	packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
-	purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
+	// purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
 	retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
+  promotionPrice: [{ required: true, message: '促销价不能为空', trigger: 'blur' }],
 });
 
 // 打开弹窗
diff --git a/src/views/supermarket/supermarketSpu/form.vue b/src/views/supermarket/supermarketSpu/form.vue
index faf0b54..88760ad 100644
--- a/src/views/supermarket/supermarketSpu/form.vue
+++ b/src/views/supermarket/supermarketSpu/form.vue
@@ -50,6 +50,13 @@
 								</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>
@@ -72,11 +79,11 @@
 								</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="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>
@@ -87,31 +94,31 @@
 								<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="specification">
-								<el-input v-model="form.specification" placeholder="请输入规格" />
-							</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="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="会员价1" prop="memberPrice1">-->
 						<!--								<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->
@@ -142,18 +149,11 @@
 						<!--								<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="promotionPrice">-->
+<!--								<el-input-number v-model="form.promotionPrice" placeholder="请输入促销价"></el-input-number>-->
+<!--							</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="4" placeholder="请输入商品简介" maxlength="400" show-word-limit />
@@ -261,6 +261,7 @@ const form = reactive({
 });
 // 定义校验规则
 const dataRules = {
+  productNature : [{ required: true, message: '请选择商品性质', trigger: 'blur' }],
 	merchantId: [{ required: true, message: '商户不能为空', trigger: 'blur' }],
 	productCode: [{ required: true, message: '货号不能为空', trigger: 'blur' }],
 	barcode: [{ required: true, message: '自编码/条码不能为空', trigger: 'blur' }],
diff --git a/src/views/supermarketerp/smErpSupplier/form.vue b/src/views/supermarketerp/smErpSupplier/form.vue
index 315cec9..0c109f6 100644
--- a/src/views/supermarketerp/smErpSupplier/form.vue
+++ b/src/views/supermarketerp/smErpSupplier/form.vue
@@ -125,13 +125,14 @@ const form = reactive({
 	passwordModifyTime: '',
 	openName: '',
 	contractNumber: '',
-	status: '',
+	status: '0',
 	pinyinCod: '',
 });
 
 // 定义校验规则
 const dataRules = ref({
 	supplierName: [{ required: true, message: '货商名称不能为空', trigger: 'blur' }],
+  supplierType: [{ required: true, message: '货商类别不能为空', trigger: 'blur' }],
 });
 
 // 打开弹窗