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

src/views/supermarket/supermarketSpu/components/supermarketUnit/form.vue

@@ -35,11 +35,29 @@
 					</el-form-item>
 				</el-col>
 
-				<!-- <el-col :span="12" class="mb20">
-					<el-form-item label="spuId" prop="spuId">
-						<el-input placeholder="请输入spuId" v-model="form.spuId" />
+				<el-col :span="12" class="mb20">
+					<el-form-item label="进价/单位分" prop="purchasePrice">
+						<el-input-number v-model="form.purchasePrice" placeholder="请输入进价" />
 					</el-form-item>
-				</el-col> -->
+				</el-col>
+
+				<el-col :span="12" class="mb20">
+					<el-form-item label="零售价/单位分" prop="retailPrice">
+						<el-input-number v-model="form.retailPrice" placeholder="请输入零售价" />
+					</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-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-form-item>
+				</el-col>
 			</el-row>
 		</el-form>
 		<template #footer>
@@ -71,6 +89,10 @@ const form = reactive({
 	unit: '',
 	status: '',
 	packageNum: 0,
+	purchasePrice: '',
+	retailPrice: '',
+	promotionPrice: '',
+	costPrice: '',
 });
 
 // 定义校验规则
@@ -80,7 +102,8 @@ const dataRules = ref({
 	unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
 	status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
 	packageNum: [{ required: true, message: '内装数量不能为空', trigger: 'blur' }],
-	spuId: [{ required: true, message: 'spuId不能为空', trigger: 'blur' }],
+	purchasePrice: [{ required: true, message: '进价不能为空', trigger: 'blur' }],
+	retailPrice: [{ required: true, message: '零售价不能为空', trigger: 'blur' }],
 });
 
 // 打开弹窗

src/views/supermarket/supermarketSpu/form.vue

@@ -294,20 +294,6 @@ const getsupermarketSpuData = (id: string) => {
 		.finally(() => {
 			loading.value = false;
 		});
-	getSupermarketUnit(id)
-		.then((res: any) => {
-			form.supermarketUnitEntityList = res.data;
-		})
-		.finally(() => {
-			loading.value = false;
-		});
-	getSupermarketAuxiliaryCode(id)
-		.then((res: any) => {
-			form.supermarketAuxiliaryCodeEntityList = res.data;
-		})
-		.finally(() => {
-			loading.value = false;
-		});
 };
 
 // 打开弹窗
@@ -315,8 +301,6 @@ const openDialog = async (id: string) => {
 	visible.value = true;
 	currentTabPaneIndex.value = 0;
 	form.id = '';
-	form.supermarketUnitEntityList = [];
-	form.supermarketAuxiliaryCodeEntityList = [];
 
 	// 重置表单数据
 	dataFormRef.value?.resetFields();