Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/views/supermarket/supermarketSpu/form.vue

@@ -25,10 +25,17 @@
 							</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 v-for="item in supplierOptions" :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="unit">
 								<el-input v-model="form.unit" placeholder="请输入单位" />
 							</el-form-item>
-						</el-col>
+						</el-col> -->
 						<el-col :span="12" class="mb20">
 							<el-form-item label="商品分类" prop="categoryId">
 								<el-select v-model="form.categoryId" placeholder="请选择商品分类">
@@ -105,13 +112,6 @@
 								<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 v-for="item in supplierOptions" :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="会员价1" prop="memberPrice1">-->
 						<!--								<el-input-number v-model="form.memberPrice1" placeholder="请输入会员价1"></el-input-number>-->