From f308b3c6698f34809060ff026820e67320b06eed Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 28 Mar 2025 14:48:56 +0800
Subject: [PATCH] 11

---
 src/views/wallet/mch-manage/form.vue  | 8 --------
 src/views/wallet/mch-manage/index.vue | 7 ++++++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
index aa303cd..aaad5da 100644
--- a/src/views/wallet/mch-manage/form.vue
+++ b/src/views/wallet/mch-manage/form.vue
@@ -7,13 +7,11 @@
 						<el-input v-model.trim="form.name" placeholder="请输入商户名" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="部门" prop="deptId">
 						<select-dept v-model="form.deptId" placeholder="请选择部门" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="商户类型" prop="merchantType">
 						<el-radio-group v-model="form.merchantType">
@@ -30,19 +28,16 @@
 						</el-radio-group>
 					</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" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="轮播图" prop="swiperPic">
 						<upload-imgs v-model="form.swiperPic" />
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="12" class="mb20">
 					<el-form-item prop="sort">
 						<template #label>
@@ -52,13 +47,11 @@
 						<el-input-number v-model="form.sort" placeholder="" />
 					</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-form-item label="营业时间：" class="my-0" />
 					<el-form-item class="ml-2" label="早上" prop="jobTime">
@@ -98,7 +91,6 @@
 						/>
 					</el-form-item>
 				</el-col>
-
 				<el-col :span="24" class="mb20">
 					<el-form-item label="店铺地址" prop="addressDes">
 						<el-input type="textarea" v-model.trim="form.addressDes" placeholder="请输入店铺地址" />
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
index de7ddff..085ef6d 100644
--- a/src/views/wallet/mch-manage/index.vue
+++ b/src/views/wallet/mch-manage/index.vue
@@ -92,13 +92,18 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="300" />
+				<el-table-column prop="deptName" label="部门" show-overflow-tooltip min-width="100" />
 				<el-table-column prop="phone" label="联系电话" :min-width="120" />
 				<el-table-column prop="sort" label="排序" :min-width="100">
 					<template #default="{ row }">
 						<span class="color-success">{{ row.sort }}</span>
 					</template>
 				</el-table-column>
+				<el-table-column prop="mchCount" label="分店数量" :min-width="100">
+					<template #default="{ row }">
+						<span class="color-primary">{{ row.mchCount || 0 }}</span>
+					</template>
+				</el-table-column>
 				<el-table-column prop="businessTime" label="营业时间" :min-width="160">
 					<template #default="{ row }">
 						<div>{{ row.jobTime?.split(",")[0] ? "早上：" + row.jobTime?.split(",")[0] : "" }}</div>