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/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>