From 4db91b7f627b097fceb7d28d932411a86375ff64 Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Fri, 28 Mar 2025 21:40:02 +0800
Subject: [PATCH] 1

---
 src/views/mch/mch-manage/form.vue  | 27 ++++++++++++++-------------
 src/views/mch/mch-manage/index.vue |  1 -
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/mch/mch-manage/form.vue b/src/views/mch/mch-manage/form.vue
index 17a3c68..e27f288 100644
--- a/src/views/mch/mch-manage/form.vue
+++ b/src/views/mch/mch-manage/form.vue
@@ -29,20 +29,21 @@
 					</el-form-item>
 				</el-col>
 				<el-col v-if="form.merchantType == '2'" :span="24" class="mb20">
-					<el-form-item label="商户分店：" prop="merchantBranch">
-						<el-radio-group v-model="form.merchantBranch" @change="(value:number) => form.merchantBranch = value">
-							<el-radio :label="1">总店</el-radio>
-							<el-radio :label="2">分店</el-radio>
+					<el-form-item label="超市类型：" prop="supType">
+						<el-radio-group v-model="form.supType" @change="(value:number) => form.supType = value">
+							<el-radio border :label="item.value" v-for="(item, index) in wallet_mch_sup_type" :key="index">{{ item.label }}</el-radio>
 						</el-radio-group>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.merchantType == '2' && form.merchantBranch == 2" :span="24" class="mb20">
+				<el-col v-if="form.merchantType == '2' && form.supType == 20" :span="24" class="mb20">
 					<el-form-item label="合作状态：" prop="cooperationStatus">
-						<dict-select v-model="form.cooperationStatus" dict-code="yes_no_type" />
+						<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.merchantType == '2' && form.merchantBranch == 2" :span="24" class="mb20">
-					<el-form-item label="总店：" prop="parentId">
+				<el-col v-if="form.merchantType == '2' && form.supType == 20" :span="24" class="mb20">
+					<el-form-item label="品牌：" prop="parentId">
 						<el-tree-select
 							v-model="form.parentId"
 							:data="merchantTree"
@@ -55,9 +56,9 @@
 						/>
 					</el-form-item>
 				</el-col>
-				<el-col v-if="form.merchantType == '2' && form.merchantBranch == 2" :span="12" class="mb20">
+				<el-col v-if="form.merchantType == '2' && form.supType == 20" :span="24" class="mb20">
 					<el-form-item label="优惠价格：" prop="discountsPrice">
-						<el-input-number v-model="form.discountsPrice" :min="0" :max="1000" :precision="0" />
+						<el-input v-model="form.discountsPrice" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -149,7 +150,7 @@ const visible = ref(false)
 const loading = ref(false)
 
 // 定义字典
-const { merchant_type } = useDict("merchant_type")
+const { merchant_type, wallet_mch_sup_type, yes_no_type } = useDict("merchant_type", "wallet_mch_sup_type", "yes_no_type")
 
 // 提交表单数据
 const form = reactive({
@@ -166,8 +167,8 @@ const form = reactive({
 	businessTime: "",
 	addressDes: "",
 	sort: 0,
-	merchantBranch: 1,
-	cooperationStatus: "0",
+	supType: 1,
+	cooperationStatus: "1",
 	parentId: "",
 	discountsPrice: null,
 })
diff --git a/src/views/mch/mch-manage/index.vue b/src/views/mch/mch-manage/index.vue
index 44e3dcb..c9c95d4 100644
--- a/src/views/mch/mch-manage/index.vue
+++ b/src/views/mch/mch-manage/index.vue
@@ -56,7 +56,6 @@
 				:header-cell-style="tableStyle.headerCellStyle"
 				@selection-change="selectionChangHandle"
 				@sort-change="sortChangeHandle"
-				lazy
 				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
 				:indent="20"
 				:default-expand-all="false"