diff --git a/src/components/Select/SelectDept.vue b/src/components/Select/SelectDept.vue
index 1609d75..9cfb397 100644
--- a/src/components/Select/SelectDept.vue
+++ b/src/components/Select/SelectDept.vue
@@ -1,84 +1,56 @@
 <template>
 	<el-tree-select
-		class="w100"
-		v-model="state.selectId"
-		:data="state.options"
-		@visible-change="(e: boolean) => e && getOptions()"
+		v-model="selectId"
+		:data="deptOptions"
 		:props="{ value: 'id', label: 'name', children: 'children' }"
+		class="w100"
+		filterable
 		clearable
 		check-strictly
 		:render-after-expand="false"
-		:placeholder="props.placeholder"
+		:placeholder="placeholder"
+		@change="handleChange"
 	/>
 </template>
 
-<script setup lang="ts" name="select-dept">
-import { reactive } from "vue"
-import * as deptApi from "/@/api/admin/dept"
+<script setup lang="ts" name="SelectDept">
+import { ref, onMounted } from "vue"
+import { deptTree } from "/@/api/admin/dept"
+import { useMessage } from "/@/hooks/message"
 
 const selectId = defineModel()
 
-export type Props = {
-	placeholder?: string
-}
-const props = withDefaults(defineProps<Props>(), {
-	placeholder: "请选择",
-})
-
-const queryForm = reactive<any>({
-	name: "",
-	current: 1,
-	size: 10,
-})
-
-const state = reactive<any>({
-	loading: true,
-	selectId: selectId,
-	options: [],
-})
-
-watch(
-	selectId,
-	(newVal, oldValue) => {
-		if (newVal == oldValue) return
-		state.selectId = newVal
-		getOptions()
+defineProps({
+	placeholder: {
+		type: String,
+		default: "请选择部门",
 	},
-	{ immediate: true },
-)
+})
 
-async function getOptions() {
+const emit = defineEmits(["update:modelValue", "change"])
+
+const deptOptions = ref<any[]>([])
+
+// 加载部门树数据
+const loadDeptTree = async () => {
 	try {
-		state.loading = true
-		const _pa = {
-			...queryForm,
+		const res = await deptTree()
+		if (res.code == 0) {
+			deptOptions.value = res.data || []
+		} else {
+			useMessage().error(res.msg || "获取部门数据失败")
 		}
-		const { data } = await deptApi.deptTree(_pa)
-		state.options = data ?? []
-	} finally {
-		setTimeout(() => (state.loading = false), 500)
+	} catch (error: any) {
+		useMessage().error(error.msg || "获取部门数据失败")
 	}
 }
 
-function remoteSearch(params: string) {
-	if (params != queryForm.name) {
-		queryForm.name = params
-		getOptions()
-	}
+// 选择变更
+const handleChange = (val: string | number) => {
+	emit("change", val)
 }
 
-function filterTreeData(treeData: Array<any>) {
-	return treeData.filter((item) => {
-		if (item.children && item.children.length) {
-			item.disabled = true
-			item.children = filterTreeData(item.children)
-		}
-		return item
-	})
-}
-
-function clear() {
-	state.selectId = null
-	getOptions()
-}
+onMounted(() => {
+	loadDeptTree()
+})
 </script>
diff --git a/src/hooks/smProcessTableAction.ts b/src/hooks/smProcessTableAction.ts
index 1ba8b60..4f3fe9f 100644
--- a/src/hooks/smProcessTableAction.ts
+++ b/src/hooks/smProcessTableAction.ts
@@ -1,15 +1,24 @@
+import { Ref } from "vue"
 import { useMessage } from "./message"
 
-type tableRow = { id: string | undefined; checkStatus: number | string | undefined }
+type tableRow = { id: string | undefined; checkStatus: number | string | undefined; processInstanceId: string | undefined | null }
 type ICreate = () => void
 type IEdit = (row: tableRow) => void
 type IFormClose = () => void
+type IDeal = (row: tableRow) => void
+type ITaskSubmitEvent = () => void
 
 // 采购流程（补货申请、采购订单、采购入库、采购退货、零售出库、零售退货） 表格操作列行为hook
-export function useSmProcessTableAction(processFormState: { formId: string | undefined; formDisabled: boolean; showForm: boolean }): {
+export function useSmProcessTableAction(
+	processFormState: { formId: string | undefined; formDisabled: boolean; showForm: boolean },
+	processDrawerRef: Ref<any>,
+	fetchList: () => void,
+): {
 	create: ICreate
 	edit: IEdit
 	formClose: IFormClose
+	deal: IDeal
+	taskSubmitEvent: ITaskSubmitEvent
 } {
 	// 点击新增
 	const create: ICreate = () => {
@@ -22,17 +31,27 @@ export function useSmProcessTableAction(processFormState: { formId: string | und
 		row.checkStatus == 2 ? (processFormState.formDisabled = true) : (processFormState.formDisabled = false)
 		processFormState.showForm = true
 	}
-
 	// 表单关闭
 	const formClose: IFormClose = () => {
 		processFormState.showForm = false
 		processFormState.formId = undefined
 		processFormState.formDisabled = true
 	}
+	// 点击开始处理
+	const deal = (row: tableRow) => {
+		if (!row.processInstanceId) return useMessage().warning("流程id不存在")
+		processDrawerRef.value.openProcessDrawer(row)
+	}
+	// 审批提交事件
+	const taskSubmitEvent = () => {
+		fetchList()
+	}
 
 	return {
 		create,
 		edit,
 		formClose,
+		deal,
+		taskSubmitEvent,
 	}
 }
diff --git a/src/views/admin/system/user/form.vue b/src/views/admin/system/user/form.vue
index e8231be..c60f6de 100644
--- a/src/views/admin/system/user/form.vue
+++ b/src/views/admin/system/user/form.vue
@@ -47,6 +47,7 @@
 							<el-tree-select
 								:data="deptData"
 								:props="{ value: 'id', label: 'name', children: 'children', disabled: 'isLock' }"
+								filterable
 								check-strictly
 								class="w100"
 								clearable
diff --git a/src/views/canteen/merchantInfo/form.vue b/src/views/canteen/merchantInfo/form.vue
deleted file mode 100644
index 7f64580..0000000
--- a/src/views/canteen/merchantInfo/form.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-			<el-row :gutter="24">
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商户" prop="merchantId">
-						<select-mch v-model="form.merchantId" />
-					</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">
-							<el-radio :label="item.value" v-for="(item, index) in merchant_type" border :key="index">{{ item.label }} </el-radio>
-						</el-radio-group>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="商户logo" prop="logo">
-						<upload-img v-model:imageUrl="form.logo"></upload-img>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="轮播图" prop="swiper">
-						<upload-imgs v-model="form.swiper" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="联系电话" prop="phone">
-						<el-input v-model="form.phone" placeholder="请输入联系电话" />
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="营业时间" prop="rangeDate">
-						<el-time-picker
-							v-model="form.rangeDate"
-							placeholder="请选择营业时间"
-							is-range
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							value-format="HH:mm"
-							format="HH:mm"
-						/>
-					</el-form-item>
-				</el-col>
-
-				<el-col :span="24" class="mb20">
-					<el-form-item label="店铺地址" prop="address">
-						<el-input type="textarea" v-model="form.address" placeholder="请输入店铺地址" />
-					</el-form-item>
-				</el-col>
-			</el-row>
-		</el-form>
-		<template #footer>
-			<span class="dialog-footer">
-				<el-button @click="visible = false">取消</el-button>
-				<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-			</span>
-		</template>
-	</el-dialog>
-</template>
-
-<script setup lang="ts" name="MerchantInfoDialog">
-import { useDict } from "/@/hooks/dict"
-import { useMessage } from "/@/hooks/message"
-import { getObj, addObj, putObj } from "/@/api/canteen/merchantInfo"
-import { rule } from "/@/utils/validate"
-import { deptTree } from "/@/api/admin/dept"
-const emit = defineEmits(["refresh"])
-
-// 定义变量内容
-const dataFormRef = ref()
-const visible = ref(false)
-const loading = ref(false)
-//定义业务变量内容
-
-// 定义字典
-const { merchant_type } = useDict("merchant_type")
-
-// 提交表单数据
-const form = reactive({
-	id: "",
-	merchantId: "",
-	deptId: "",
-	name: "",
-	merchantType: "",
-	logo: "",
-	collectMoneyCode: "",
-	swiper: "",
-	phone: "",
-	businessTime: "",
-	address: "",
-	jobStartTime: "",
-	rangeDate: [],
-	jobEndTime: [],
-})
-
-// 定义校验规则
-const dataRules = ref({
-	merchantId: [{ required: true, message: "商户不能为空", trigger: "blur" }],
-	name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
-	type: [{ required: true, message: "请选择商户类型", trigger: "change" }],
-	logo: [{ required: true, message: "请上传商户logo", trigger: "change" }],
-	swiper: [{ required: true, message: "请上传商户轮播图", trigger: "change" }],
-	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "change" }],
-	deptId: [{ required: true, message: "请选择部门", trigger: "change" }],
-})
-
-// 打开弹窗
-const openDialog = (id: string) => {
-	visible.value = true
-	form.id = ""
-
-	// 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields()
-	})
-
-	// 获取merchantInfo信息
-	if (id) {
-		form.id = id
-		getmerchantInfoData(id)
-	}
-}
-
-// 提交
-const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
-	if (!valid) return false
-	const _pa = { ...form }
-	if (_pa.rangeDate && _pa.rangeDate.length) {
-		_pa.jobStartTime = _pa.rangeDate[0]
-		_pa.jobEndTime = _pa.rangeDate[1]
-	}
-	try {
-		loading.value = true
-		form.id ? await putObj(form) : await addObj(form)
-		useMessage().success(form.id ? "修改成功" : "添加成功")
-		visible.value = false
-		emit("refresh")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	} finally {
-		loading.value = false
-	}
-}
-
-// 初始化表单数据
-const getmerchantInfoData = (id: string) => {
-	// 获取数据
-	loading.value = true
-	getObj(id)
-		.then((res: any) => {
-			Object.assign(form, res.data)
-		})
-		.finally(() => {
-			loading.value = false
-		})
-}
-
-// 暴露变量
-defineExpose({
-	openDialog,
-})
-</script>
diff --git a/src/views/canteen/merchantInfo/index.vue b/src/views/canteen/merchantInfo/index.vue
deleted file mode 100644
index 782e253..0000000
--- a/src/views/canteen/merchantInfo/index.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-	<div class="layout-padding">
-		<div class="layout-padding-auto layout-padding-view">
-			<el-row>
-				<div class="mb8" style="width: 100%">
-					<el-button
-						icon="folder-add"
-						type="primary"
-						class="ml10"
-						@click="formDialogRef.openDialog()"
-						v-auth="'canteen_merchantInfo_add'"
-					>
-						新 增
-					</el-button>
-					<el-button
-						plain
-						:disabled="multiple"
-						icon="Delete"
-						type="primary"
-						v-auth="'canteen_merchantInfo_del'"
-						@click="handleDelete(selectObjs)"
-					>
-						删除
-					</el-button>
-					<right-toolbar
-						v-model:showSearch="showSearch"
-						:export="'canteen_merchantInfo_export'"
-						@exportExcel="exportExcel"
-						class="ml10 mr20"
-						style="float: right"
-						@queryTable="getDataList"
-					></right-toolbar>
-				</div>
-			</el-row>
-			<el-table
-				:data="state.dataList"
-				v-loading="state.loading"
-				border
-				:cell-style="tableStyle.cellStyle"
-				:header-cell-style="tableStyle.headerCellStyle"
-				@selection-change="selectionChangHandle"
-				@sort-change="sortChangeHandle"
-			>
-				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<!-- <el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip>
-          <template #default="scope">
-            <dict-tag :options="merchant_type" :value="scope.row.merchantType"></dict-tag>
-          </template>
-</el-table-column> -->
-				<el-table-column prop="name" label="商户名" />
-				<el-table-column prop="logo" label="logo">
-					<template #default="{ row }">
-						<preview-image :src="row.logo" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="deptName" label="部门" />
-				<el-table-column prop="collectMoneyCode" label="商户收款二维码" show-overflow-tooltip>
-					<template #default="{ row }">
-						<preview-image :src="row.logo" />
-					</template>
-				</el-table-column>
-				<el-table-column prop="phone" label="联系电话" show-overflow-tooltip />
-				<el-table-column prop="businessTime" label="结束营业时间" show-overflow-tooltip />
-				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip />
-				<el-table-column label="操作" width="150">
-					<template #default="scope">
-						<el-button
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'canteen_merchantInfo_edit'"
-							@click="formDialogRef.openDialog(scope.row.id)"
-						>
-							编辑
-						</el-button>
-						<el-button
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'canteen_merchantInfo_del'"
-							@click="handleDelete([scope.row.id])"
-						>
-							删除
-						</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
-		</div>
-
-		<!-- 编辑、新增  -->
-		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-	</div>
-</template>
-
-<script setup lang="ts" name="systemMerchantInfo">
-import { BasicTableProps, useTable } from "/@/hooks/table"
-import { fetchList, delObjs } from "/@/api/canteen/merchantInfo"
-import { useMessage, useMessageBox } from "/@/hooks/message"
-import { useDict } from "/@/hooks/dict"
-
-// 引入组件
-const FormDialog = defineAsyncComponent(() => import("./form.vue"))
-// 定义查询字典
-
-const { merchant_type } = useDict("merchant_type")
-// 定义变量内容
-const formDialogRef = ref()
-// 搜索变量
-const queryRef = ref()
-const showSearch = ref(true)
-// 多选变量
-const selectObjs = ref([]) as any
-const multiple = ref(true)
-
-const state: BasicTableProps = reactive<BasicTableProps>({
-	queryForm: {},
-	pageList: fetchList,
-})
-
-//  table hook
-const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
-	useTable(state)
-
-// 清空搜索条件
-const resetQuery = () => {
-	// 清空搜索条件
-	queryRef.value?.resetFields()
-	// 清空多选
-	selectObjs.value = []
-	getDataList()
-}
-
-// 导出excel
-const exportExcel = () => {
-	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "merchantInfo.xlsx")
-}
-
-// 多选事件
-const selectionChangHandle = (objs: { id: string }[]) => {
-	selectObjs.value = objs.map(({ id }) => id)
-	multiple.value = !objs.length
-}
-
-// 删除操作
-const handleDelete = async (ids: string[]) => {
-	try {
-		await useMessageBox().confirm("此操作将永久删除")
-	} catch {
-		return
-	}
-
-	try {
-		await delObjs(ids)
-		getDataList()
-		useMessage().success("删除成功")
-	} catch (err: any) {
-		useMessage().error(err.msg)
-	}
-}
-</script>
diff --git a/src/views/mch/mch-dept-user/index.vue b/src/views/mch/mch-dept-user/index.vue
index ff51b6e..622b7d8 100644
--- a/src/views/mch/mch-dept-user/index.vue
+++ b/src/views/mch/mch-dept-user/index.vue
@@ -1,6 +1,22 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+				<el-row>
+					<el-form-item style="width: 300px" label="商户" prop="merchantName">
+						<el-input v-model="state.queryForm.merchantName" placeholder="商户" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="用户" prop="userIds">
+						<select-user v-model="state.queryForm.userIds" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
 			<el-row>
 				<div class="mb8" style="width: 100%">
 					<el-button icon="RefreshLeft" type="primary" class="ml10" @click="syncAll"> 同步全部 </el-button>
@@ -37,42 +53,15 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
-				<el-table-column prop="mchId" label="商户">
-					<template #default="{ row }">
-						<div class="status">
-							<span>商户id</span>
-							<span>1111</span>
-						</div>
-						<div class="status">
-							<span>商户名</span>
-							<span>1111</span>
-						</div>
-					</template>
+				<el-table-column type="index" label="#" width="80" />
+				<el-table-column label="商户">
+					<el-table-column prop="merchantId" label="商户id" />
+					<el-table-column prop="merchantName" label="商户名" />
 				</el-table-column>
-				<el-table-column prop="userId" label="用户">
-					<template #default="{ row }">
-						<div class="status">
-							<span>用户id</span>
-							<span>1111</span>
-						</div>
-						<div class="status">
-							<span>用户名</span>
-							<span>1111</span>
-						</div></template
-					>
-				</el-table-column>
-				<el-table-column prop="userId" label="用户部门">
-					<template #default="{ row }">
-						<div class="status">
-							<span>用户部门id</span>
-							<span>1111</span>
-						</div>
-						<div class="status">
-							<span>用户部门</span>
-							<span>1111</span>
-						</div>
-					</template>
+				<el-table-column label="用户">
+					<el-table-column prop="userId" label="用户id" />
+					<el-table-column prop="username" label="用户" />
+					<el-table-column prop="userMobile" label="用户手机号" />
 				</el-table-column>
 				<el-table-column label="操作" width="150">
 					<template #default="scope">
@@ -103,6 +92,7 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as mchDeptUserApi from "/@/api/wallet/mch-dept-user"
 import { useMessage, useMessageBox } from "/@/hooks/message"
 import { useDict } from "/@/hooks/dict"
+import { ro } from "element-plus/es/locale"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import("./form.vue"))
@@ -128,7 +118,7 @@ const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, do
 // 同步全部
 const syncAll = async () => {
 	try {
-		await useMessageBox().confirm("是否同步全部")
+		await useMessageBox().confirm("是否同步全部,会先删除")
 	} catch {
 		return
 	}
@@ -172,3 +162,29 @@ const handleDelete = async (ids: string[]) => {
 	}
 }
 </script>
+
+<style scoped lang="scss">
+.status {
+	display: flex;
+	align-items: center;
+	margin-bottom: 2px;
+
+	span {
+		display: inline-block;
+	}
+
+	span:nth-child(1) {
+		min-width: 60px;
+		max-width: 100px;
+		text-align: left;
+	}
+
+	span:nth-child(2) {
+		flex: 1;
+		min-width: 50px;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+</style>
diff --git a/src/views/wallet/mch-manage/form.vue b/src/views/wallet/mch-manage/form.vue
new file mode 100644
index 0000000..16fa8e7
--- /dev/null
+++ b/src/views/wallet/mch-manage/form.vue
@@ -0,0 +1,308 @@
+<template>
+	<el-dialog :title="form.id ? '编辑' : '新增'" width="40%" v-model="visible" :close-on-click-modal="false" draggable>
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" label-width="110px" v-loading="loading">
+			<el-row :gutter="24">
+				<el-col :span="24" class="mb20">
+					<el-form-item label="商户名" prop="name">
+						<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">
+							<el-radio
+								:label="item.value"
+								:disabled="merchantTypeRadioDisabled"
+								v-for="(item, index) in merchant_type"
+								border
+								:key="index"
+								@click="handleClickRadio(item.value)"
+							>
+								{{ item.label }}
+							</el-radio>
+						</el-radio-group>
+					</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-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="cooperationStatus">
+						<el-switch v-model="form.cooperationStatus" />
+					</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-tree-select
+							v-model="form.parentId"
+							:data="merchantTree"
+							:props="{ value: 'id', label: 'name', children: 'children', disabled: 'isLock' }"
+							check-strictly
+							class="w100"
+							clearable
+							filterable
+							placeholder="请选择主店"
+						/>
+					</el-form-item>
+				</el-col>
+
+				<el-col v-if="form.merchantType == '2' && form.merchantBranch == 2" :span="12" class="mb20">
+					<el-form-item label="优惠价格" prop="discountsPrice">
+						<el-input-number v-model="form.discountsPrice" :min="0" :max="1000" :precision="0" />
+					</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>
+							<span>排序</span>
+							<tip content="越大越在前" />
+						</template>
+						<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">
+						<el-time-picker
+							v-model="jobTime.morning"
+							placeholder="请选择营业时间"
+							is-range
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							value-format="HH:mm"
+							format="HH:mm"
+						/>
+					</el-form-item>
+					<el-form-item class="ml-2" label="中午" prop="jobTime">
+						<el-time-picker
+							v-model="jobTime.noon"
+							placeholder="请选择营业时间"
+							is-range
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							value-format="HH:mm"
+							format="HH:mm"
+						/>
+					</el-form-item>
+					<el-form-item class="ml-2" label="晚上" prop="jobTime">
+						<el-time-picker
+							v-model="jobTime.evening"
+							placeholder="请选择营业时间"
+							is-range
+							range-separator="至"
+							start-placeholder="开始日期"
+							end-placeholder="结束日期"
+							value-format="HH:mm"
+							format="HH:mm"
+						/>
+					</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="请输入店铺地址" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<el-button @click="visible = false">取消</el-button>
+			<el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+		</template>
+	</el-dialog>
+</template>
+
+<script setup lang="ts" name="MerchantInfoDialog">
+import { useDict } from "/@/hooks/dict"
+import { useMessage } from "/@/hooks/message"
+import { pageJoin, getObj, addObj, putObj } from "/@/api/wallet/mch-manage"
+
+const emit = defineEmits(["refresh"])
+
+// 定义变量内容
+const dataFormRef = ref()
+const visible = ref(false)
+const loading = ref(false)
+const merchantTree = ref<any[]>([])
+
+// 定义字典
+const { merchant_type } = useDict("merchant_type")
+
+// 提交表单数据
+const form = reactive({
+	id: "",
+	deptId: "",
+	name: "",
+	merchantType: "",
+	logoPic: "",
+	collectMoneyCode: "",
+	swiperPic: "",
+	isSyncZy: "0",
+	visibleMobile: "0",
+	phone: "",
+	businessTime: "",
+	addressDes: "",
+	sort: 0,
+	merchantBranch: 1,
+	cooperationStatus: "0",
+	parentId: "",
+	discountsPrice: null,
+})
+const jobTime = reactive<{
+	[key: string]: string[]
+}>({
+	morning: [],
+	noon: [],
+	evening: [],
+})
+const merchantTypeRadioDisabled = ref(false)
+
+// 定义校验规则
+const dataRules = ref({
+	name: [{ required: true, message: "商户名不能为空", trigger: "blur" }],
+	types: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+	logoPic: [{ required: true, message: "请上传商户logo", trigger: "blur" }],
+	swiperPic: [{ required: true, message: "请上传商户轮播图", trigger: "blur" }],
+	rangeDate: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
+	deptId: [{ required: true, message: "请选择部门", trigger: "blur" }],
+	merchantType: [{ required: true, message: "请选择商户类型", trigger: "blur" }],
+	sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
+	// jobTime: [{ required: true, message: "请选择营业时间", trigger: "blur" }],
+	cooperationStatus:
+		form.merchantType == "2" && form.merchantBranch == 2 ? [{ required: true, message: "请选择合作状态", trigger: "blur" }] : [],
+	parentId: form.merchantType == "2" && form.merchantBranch == 2 ? [{ required: true, message: "请选择主店", trigger: "blur" }] : [],
+})
+
+// 打开弹窗
+const openDialog = async (id: string) => {
+	visible.value = true
+	form.id = ""
+
+	// 重置表单数据
+	dataFormRef.value?.resetFields()
+	for (const key in jobTime) {
+		jobTime[key] = []
+	}
+
+	// 获取merchantInfo信息
+	if (id) {
+		form.id = id
+		await getmerchantInfoData(id)
+	}
+
+	await getMerchantTreeData()
+}
+
+// 获取商户树数据
+const getMerchantTreeData = async () => {
+	const res = await pageJoin({ current: 1, size: 9999 })
+	if (res.code == 0) {
+		merchantTree.value = res.data.records
+	} else {
+		merchantTree.value = []
+	}
+}
+
+watch(
+	() => form.merchantType,
+	(newVal) => {
+		if (newVal != "2") {
+			form.merchantBranch = 1
+			form.cooperationStatus = "0"
+			form.parentId = ""
+		}
+	},
+)
+
+// 提交
+const onSubmit = async () => {
+	const valid = await dataFormRef.value.validate().catch(() => {})
+	if (!valid) return false
+	const _pa = {
+		...form,
+		isSyncZy: form.isSyncZy ? "1" : "0",
+		types: form.merchantType,
+		jobTime: (jobTime.morning?.join("-") || "") + "," + (jobTime.noon?.join("-") || "") + "," + (jobTime.evening?.join("-") || ""),
+	}
+	try {
+		loading.value = true
+		form.id ? await putObj(_pa) : await addObj(_pa)
+		useMessage().success(form.id ? "修改成功" : "添加成功")
+		visible.value = false
+		emit("refresh")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 初始化表单数据
+const getmerchantInfoData = async (id: string) => {
+	loading.value = true
+	try {
+		const res = await getObj(id)
+		if (res.code === 0) {
+			const regex = /^.*?,.*?,.*?$/
+			const resJobTime = res.data.jobTime && regex.test(res.data.jobTime) ? res.data.jobTime.split(",") : []
+			Object.assign(form, res.data, {
+				merchantType: res.data.types,
+				isSyncZy: res.data.isSyncZy == "1" ? true : false,
+			})
+			jobTime.morning = resJobTime[0]?.split("-") ?? []
+			jobTime.noon = resJobTime[1]?.split("-") ?? []
+			jobTime.evening = resJobTime[2]?.split("-") ?? []
+		}
+	} catch (error: any) {
+		useMessage().error(error.msg)
+	} finally {
+		loading.value = false
+	}
+}
+
+// 点击商户类型单选按钮
+const handleClickRadio = (radioItemValue: string) => {
+	if (radioItemValue === form.merchantType) {
+		form.merchantType = ""
+		merchantTypeRadioDisabled.value = true
+		setTimeout(() => {
+			merchantTypeRadioDisabled.value = false
+		}, 0)
+	}
+}
+
+// 暴露变量
+defineExpose({
+	openDialog,
+})
+</script>
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
new file mode 100644
index 0000000..86e4799
--- /dev/null
+++ b/src/views/wallet/mch-manage/index.vue
@@ -0,0 +1,274 @@
+<template>
+	<div class="layout-padding">
+		<div class="layout-padding-auto layout-padding-view">
+			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList" row-key="id" lazy>
+				<el-row>
+					<el-form-item style="width: 300px" label="商户名" prop="name">
+						<el-input v-model="state.queryForm.name" placeholder="商户名" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="商户类型" prop="types">
+						<dict-select v-model="state.queryForm.types" dict-code="merchant_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否显示在移动端" prop="visibleMobile">
+						<dict-select v-model="state.queryForm.visibleMobile" dict-code="yes_no_type" />
+					</el-form-item>
+					<el-form-item style="width: 300px" label="是否同步正元" prop="isSyncZy">
+						<dict-select v-model="state.queryForm.isSyncZy" dict-code="yes_no_type" />
+					</el-form-item>
+					<el-form-item>
+						<el-button icon="Search" type="primary" @click="getDataList">
+							{{ $t("common.queryBtn") }}
+						</el-button>
+						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
+					</el-form-item>
+				</el-row>
+			</el-form>
+			<el-row>
+				<div class="mb8" style="width: 100%">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()" v-auth="'wallet_mchManage_add'">
+						新 增
+					</el-button>
+					<el-button
+						plain
+						:disabled="multiple"
+						icon="Delete"
+						type="primary"
+						v-auth="'wallet_mchManage_del'"
+						@click="handleDelete(selectObjs)"
+					>
+						删 除
+					</el-button>
+					<right-toolbar
+						v-model:showSearch="showSearch"
+						:export="'wallet_mchManage_export'"
+						@exportExcel="exportExcel"
+						class="ml10 mr20"
+						style="float: right"
+						@queryTable="getDataList"
+					/>
+				</div>
+			</el-row>
+			<el-table
+				:data="state.dataList"
+				v-loading="state.loading"
+				border
+				:cell-style="tableStyle.cellStyle"
+				:header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+				@sort-change="sortChangeHandle"
+			>
+				<el-table-column type="selection" width="40" align="center" />
+				<el-table-column type="index" label="#" width="50" />
+				<el-table-column prop="name" label="商户名" min-width="120" />
+				<el-table-column prop="logoPic" label="logo">
+					<template #default="{ row }">
+						<preview-image :src="row.logoPic" />
+					</template>
+				</el-table-column>
+				<el-table-column prop="collectionCode" width="150" label="商户收款二维码" show-overflow-tooltip>
+					<template #default="{ row }">
+						<div class="flex flex-col justify-center items-center">
+							<preview-image :src="row.collectionCode" />
+							<el-button size="small" type="primary" link @click="downloadCollectionCode(row)">下载</el-button>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="merchantType" label="商户类型" show-overflow-tooltip :min-width="100">
+					<template #default="{ row }">
+						<div class="flex justify-center items-center">
+							<div v-for="(v, i) in row.types?.split(',')" :key="i" class="mr-1">
+								<dict-tag :options="merchant_type" :value="v" />
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column width="200" label="支付默认钱包">
+					<template #default="{ row }">
+						<div class="flex items-center justify-center">
+							<div class="color-primary">{{ row.walletTypeName }}</div>
+							<div class="flex items-center just ml5">
+								<dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+							</div>
+						</div>
+					</template>
+				</el-table-column>
+				<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>
+						<div>{{ row.jobTime?.split(",")[1] ? "中午：" + row.jobTime?.split(",")[1] : "" }}</div>
+						<div>{{ row.jobTime?.split(",")[2] ? "晚上：" + row.jobTime?.split(",")[2] : "" }}</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="addressDes" label="地址" show-overflow-tooltip :min-width="160" />
+				<el-table-column prop="createTime" label="创建时间" show-overflow-tooltip :min-width="160" />
+				<el-table-column prop="isSyncZy" label="是否同步正元" min-width="120">
+					<template #default="{ row }">
+						<el-switch
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
+							active-value="1"
+							inactive-value="0"
+							v-model="row.isSyncZy"
+							@change="isSyncZyChange(row)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column label="是否在移动端展示" min-width="150">
+					<template #default="{ row }">
+						<el-switch
+							:disabled="!useUserInfo().userInfos.roleCodes.includes('ROLE_ADMIN')"
+							active-value="1"
+							inactive-value="0"
+							v-model="row.visibleMobile"
+							@change="visibleMobileChange(row)"
+						/>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" fixed="right" min-width="300">
+					<template #default="{ row }">
+						<el-button icon="RefreshRight" text type="primary" v-auth="'wallet_mchManage_refresh_qrcode'" @click="refreshQrcode(row)">
+							刷新二维码
+						</el-button>
+						<el-button icon="setting" text type="primary" v-auth="'wallet_mchManage_setting'" @click="settingDialogRef.openDialog(row.id)">
+							配置
+						</el-button>
+						<el-button icon="edit-pen" text type="primary" v-auth="'wallet_mchManage_edit'" @click="formDialogRef.openDialog(row.id)">
+							编辑
+						</el-button>
+						<el-button icon="delete" text type="primary" v-auth="'wallet_mchManage_del'" @click="handleDelete([row.id])"> 删除 </el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+		</div>
+
+		<!-- 编辑、新增  -->
+		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+		<!-- 商户配置 -->
+		<Setting ref="settingDialogRef" @refresh="getDataList(false)" />
+	</div>
+</template>
+
+<script setup lang="ts" name="MchManage">
+import { BasicTableProps, useTable } from "/@/hooks/table"
+import * as mchManangeApi from "/@/api/wallet/mch-manage"
+import { useMessage, useMessageBox } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import FormDialog from "./form.vue"
+import Setting from "./setting.vue"
+import { useUserInfo } from "/@/stores/userInfo"
+import { downBlobFile as downCollectionCodeBlobFile } from "/@/utils/other"
+
+const { merchant_type, wallet_type, yes_no_type } = useDict("merchant_type", "wallet_type", "yes_no_type")
+
+// 定义变量内容
+const formDialogRef = ref()
+const settingDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+	queryForm: {},
+	pageList: mchManangeApi.pageJoin,
+})
+
+//  table hook
+const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+	// 清空搜索条件
+	queryRef.value?.resetFields()
+	// 清空多选
+	selectObjs.value = []
+	getDataList()
+}
+
+// 重新生成正元二位啊吗
+const refreshQrcode = async (row: any) => {
+	try {
+		await useMessageBox().confirm("是否重新生成正元二维码")
+	} catch (e) {
+		return
+	}
+	try {
+		await mchManangeApi.refreshQrcode({ mchId: row.id })
+		getDataList()
+		useMessage().success("生成成功")
+	} catch (e) {
+		useMessage().error("生成失败")
+	}
+}
+
+// 修改是否在正元显示
+const isSyncZyChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
+// 修改是否在移动端显示
+const visibleMobileChange = async (row: any) => {
+	try {
+		await mchManangeApi.putObj(row)
+		getDataList()
+		useMessage().success("操作成功")
+	} catch (e) {
+		useMessage().error("操作错误")
+	}
+}
+
+// 导出excel
+const exportExcel = () => {
+	downBlobFile("/canteen/merchantInfo/export", Object.assign(state.queryForm, { ids: selectObjs }), "商户管理.xlsx")
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+	selectObjs.value = objs.map(({ id }) => id)
+	multiple.value = !objs.length
+}
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+	try {
+		await useMessageBox().confirm("此操作将永久删除")
+	} catch {
+		return
+	}
+
+	try {
+		await delObjs(ids)
+		getDataList()
+		useMessage().success("删除成功")
+	} catch (err: any) {
+		useMessage().error(err.msg)
+	}
+}
+
+// 点击二维码下载
+const downloadCollectionCode = (row: any) => {
+	if (!row.collectionCode) return useMessage().error("二维码链接不存在")
+	downCollectionCodeBlobFile(row.collectionCode, {}, `${row.name} 收款二维码.png`)
+}
+</script>