From 6809b4fa2a4d3f2ac6362155ab6db9d1c66c953b Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 14 May 2025 17:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 5779913..b823aec 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -35,19 +35,19 @@
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-show="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
+				<el-col v-if="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-show="form.types == '2' && form.supType == '20'" :span="24" class="mb20">
+				<el-col v-if="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-show="form.types == '2'" :span="24" class="mb20">
+				<el-col v-if="form.types == '2'" :span="24" class="mb20">
 					<el-form-item label="分类：" prop="catgoryId">
 						<select-mch-catory v-model="form.catgoryId" :apiParams="{ bizType: form.types }" />
 					</el-form-item>
@@ -179,32 +179,17 @@ const jobTime = reactive<{
 const merchantTypeRadioDisabled = ref(false)
 
 // 定义校验规则
-const dataRulesArr = {
+const dataRules = {
 	name: [{ required: true, message: "商户名不能为空", trigger: "change" }],
 	types: [{ required: true, message: "请选择商户类型", trigger: "change" }],
 	logoPic: [{ required: true, message: "请上传商户logo", trigger: "change" }],
 	swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
 	deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
 	sort: [{ required: true, message: "请输入排序", trigger: "change" }],
+	catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }],
+	supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
+	cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
 }
-const dataRules = computed(() => {
-	if (form.types == "2" && form.supType == "20") {
-		return {
-			...dataRulesArr,
-			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
-			cooperationStatus: [{ required: true, message: "请选择合作状态", trigger: "change" }],
-			// parentId: [{ required: true, message: "请选择品牌", trigger: "change" }],
-		}
-	} else if (form.types == "2") {
-		return {
-			...dataRulesArr,
-			supType: [{ required: true, message: "请选择合作商家类型", trigger: "change" }],
-			catgoryId: [{ required: true, message: "请选择分类", trigger: "change" }],
-		}
-	} else {
-		return dataRulesArr
-	}
-})
 
 // 打开弹窗
 const openDialog = async (id: string) => {
@@ -240,6 +225,9 @@ watch(
 const onSubmit = async () => {
 	const valid = await dataFormRef.value.validate().catch(() => {})
 	if (!valid) return false
+	console.log(valid)
+	return
+
 	const _pa = {
 		...form,
 		isSyncZy: form.isSyncZy ? "1" : "0",