From fde7dba0292c4a91ee382200f67ffa0955a57c92 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Sat, 29 Mar 2025 16:34:33 +0800
Subject: [PATCH] 1

---
 src/views/mch/mch-manage/form.vue | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index a1294cb..c390598 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -35,23 +35,18 @@
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
+				<el-col v-show="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
 					<el-form-item label="合作状态：" prop="cooperationStatus">
 						<el-radio-group v-model="form.cooperationStatus">
 							<el-radio border :label="item.value" v-for="(item, index) in yes_no_type" :key="index">{{ item.label }}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
+				<el-col v-show="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
 					<el-form-item label="品牌：" prop="parentId">
 						<select-mch v-model="form.parentId" :apiParams="{ types: '2', supType: '10' }" />
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
-					<el-form-item label="优惠价格：" prop="discountsPrice">
-						<el-input v-model="form.discountsPrice" />
-					</el-form-item>
-				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户logo：" prop="logoPic">
 						<upload-img v-model:imageUrl="form.logoPic" />
@@ -71,12 +66,17 @@
 						<el-input-number v-model="form.sort" placeholder="" />
 					</el-form-item>
 				</el-col>
+				<el-col v-if="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
+					<el-form-item label="优惠价格：" prop="discountsPrice">
+						<el-input v-model="form.discountsPrice" />
+					</el-form-item>
+				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="联系电话：" prop="phone">
 						<el-input v-model.trim="form.phone" placeholder="请输入联系电话" />
 					</el-form-item>
 				</el-col>
-				<el-col :span="24" class="mb20">
+				<el-col v-if="form.types == '1'" :span="24" class="mb20">
 					<el-form-item label="营业时间：" class="my-0" />
 					<el-form-item class="ml-2" label="早上" prop="jobTime">
 						<el-time-picker
@@ -189,7 +189,6 @@ const dataRules = computed(() => {
 			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
 			cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
 			parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
-			discountsPrice: [{ required: true, message: "请输入优惠价格", trigger: "change" }],
 		}
 	} else if (form.types == "2") {
 		return {
@@ -239,6 +238,8 @@ const onSubmit = async () => {
 		...form,
 		isSyncZy: form.isSyncZy ? "1" : "0",
 		jobTime: (jobTime.morning?.join("-") || "") + "," + (jobTime.noon?.join("-") || "") + "," + (jobTime.evening?.join("-") || ""),
+		cooperationStatus: form.types == "2" && form.supType == "10" ? null : form.cooperationStatus,
+		parentId: form.types == "2" && form.supType == "10" ? null : form.parentId,
 	}
 	try {
 		loading.value = true