diff --git a/src/api/baseData/unit/unitApi.js b/src/api/baseData/unit/unitApi.js
new file mode 100644
index 0000000..9275952
--- /dev/null
+++ b/src/api/baseData/unit/unitApi.js
@@ -0,0 +1,28 @@
+import { baseRequest } from '@/utils/request'
+
+const request = (url, ...arg) => baseRequest(`/base/sysunit/` + url, ...arg)
+
+/**
+ * 单位Api接口管理器
+ *
+ * @author Luck
+ * @date  2024/07/23 11:36
+ **/
+export default {
+	// 获取单位分页
+	sysUnitPage(data) {
+		return request('page', data, 'get')
+	},
+	// 提交单位表单 edit为true时为编辑，默认为新增
+	sysUnitSubmitForm(data, edit = false) {
+		return request(edit ? 'edit' : 'add', data)
+	},
+	// 删除单位
+	sysUnitDelete(data) {
+		return request('delete', data)
+	},
+	// 获取单位详情
+	sysUnitDetail(data) {
+		return request('detail', data, 'get')
+	}
+}
diff --git a/src/components/DrawerForm/index.vue b/src/components/DrawerForm/index.vue
new file mode 100644
index 0000000..6dc7cb6
--- /dev/null
+++ b/src/components/DrawerForm/index.vue
@@ -0,0 +1,49 @@
+<template>
+	<xn-form-container
+		:title="formData.id ? '编辑单位组' : '增加单位组'"
+		:width="700"
+		:visible="visible"
+		:destroy-on-close="true"
+		@close="onClose"
+	>
+		<dynamic-form></dynamic-form>
+		<template #footer>
+			<a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+			<a-button type="primary" @click="onSubmit" :loading="submitLoading">保存</a-button>
+		</template>
+	</xn-form-container>
+</template>
+
+<script setup>
+	// const props = defineProps({})
+
+	// const emit = defineEmits()
+
+	const submitLoading = ref(false)
+
+	// 关闭
+	const onClose = () => {}
+
+	// 保存
+	const onSubmit = () => {}
+
+	// 生命周期钩子
+	onMounted(() => {
+		console.log('Component mounted')
+		// TODO: Add your onMounted code here
+	})
+
+	onUpdated(() => {
+		console.log('Component updated')
+		// TODO: Add your onUpdated code here
+	})
+
+	onUnmounted(() => {
+		console.log('Component unmounted')
+		// TODO: Add your onUnmounted code here
+	})
+
+	// watch(() => {}, () => {})
+</script>
+
+<style scoped></style>
diff --git a/src/components/DynamicForm/index.vue b/src/components/DynamicForm/index.vue
new file mode 100644
index 0000000..974350a
--- /dev/null
+++ b/src/components/DynamicForm/index.vue
@@ -0,0 +1,76 @@
+<template>
+	<a-form ref="formRef" :model="formData" :rules="formRules" layout="horizontal">
+		<a-row :gutter="16">
+			<a-col v-for="field in fields" :key="field.name" :span="12" v-show="!field.advanced || advanced">
+				<a-form-item :label="field.label" :name="field.name">
+					<component
+						:is="getComponent(field.type)"
+						v-model:value="formData[field.name]"
+						v-bind="field.options"
+						:placeholder="field.placeholder"
+						:allow-clear="field.allowClear"
+					/>
+				</a-form-item>
+			</a-col>
+		</a-row>
+	</a-form>
+</template>
+
+<script setup>
+	// 接收父组件传递的表单字段配置
+	const props = defineProps({
+		fields: {
+			type: Array,
+			required: true
+		},
+		formData: {
+			type: Object,
+			required: true
+		},
+		formRules: {
+			type: Object,
+			default: () => ({})
+		}
+	})
+
+	const emit = defineEmits(['submit', 'reset'])
+
+	// 表单引用
+	const formRef = ref(null)
+
+	// 高级选项开关
+	const advanced = ref(false)
+
+	// 切换高级选项
+	const toggleAdvanced = () => {
+		advanced.value = !advanced.value
+	}
+
+	// 提交表单
+	const onSubmit = () => {
+		formRef.value.validate((valid) => {
+			if (valid) {
+				emit('submit', formData)
+			} else {
+				console.log('表单验证失败')
+			}
+		})
+	}
+
+	// 重置表单
+	const onReset = () => {
+		formRef.value.resetFields()
+		emit('reset')
+	}
+
+	// 获取组件类型
+	const getComponent = (type) => {
+		const componentMap = {
+			input: 'a-input',
+			select: 'a-select',
+			radio: 'a-radio-group',
+			switch: 'a-switch'
+		}
+		return componentMap[type] || 'a-input'
+	}
+</script>
diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue
new file mode 100644
index 0000000..a047c8a
--- /dev/null
+++ b/src/components/SearchForm/index.vue
@@ -0,0 +1,98 @@
+<!-- DynamicForm.vue -->
+<template>
+	<a-card :bordered="false">
+		<a-form ref="searchFormRef" name="advanced_search" :model="formState" class="ant-advanced-search-form">
+			<a-row :gutter="24">
+				<a-col v-for="(field, index) in fields" :key="index" :span="6" v-show="!field.advanced || advanced">
+					<a-form-item :label="field.label" :name="field.name">
+						<component
+							:is="getComponent(field)"
+							v-model:value="formState[field.name]"
+							:placeholder="field.placeholder"
+							:options="field.options"
+						/>
+					</a-form-item>
+				</a-col>
+				<a-col :span="6">
+					<a-button type="primary" @click="onSearch">查询</a-button>
+					<a-button style="margin: 0 8px" @click="reset">重置</a-button>
+					<a @click="toggleAdvanced" style="margin-left: 8px">
+						{{ advanced ? '收起' : '展开' }}
+						<component :is="advanced ? 'up-outlined' : 'down-outlined'" />
+					</a>
+				</a-col>
+			</a-row>
+		</a-form>
+	</a-card>
+</template>
+
+<script setup>
+	import { ref, defineProps, defineEmits, onMounted, onUpdated, onUnmounted, watch } from 'vue'
+
+	const props = defineProps({
+		fields: {
+			type: Array,
+			required: true,
+			default: () => []
+		}
+	})
+
+	const emit = defineEmits(['update:modelValue', 'search'])
+
+	const searchFormRef = ref(null)
+	const formState = ref({})
+	const advanced = ref(false)
+
+	const reset = () => {
+		formState.value = { ...props.modelValue }
+		emit('update:modelValue', formState.value)
+	}
+
+	const onSearch = () => {
+		emit('search', formState.value)
+	}
+
+	const toggleAdvanced = () => {
+		advanced.value = !advanced.value
+	}
+
+	const getComponent = (field) => {
+		switch (field.type) {
+			case 'input':
+				return 'a-input'
+			case 'select':
+				return 'a-select'
+			default:
+				return 'a-input'
+		}
+	}
+
+	// 生命周期钩子
+	onMounted(() => {
+		console.log('Component mounted')
+	})
+
+	onUpdated(() => {
+		console.log('Component updated')
+	})
+
+	onUnmounted(() => {
+		console.log('Component unmounted')
+	})
+
+	const extractNamesAsObject = (fields) => {
+		return fields.reduce((acc, field) => {
+			acc[field.name] = field // 将 field.name 作为键，field 作为值
+			return acc
+		}, {})
+	}
+
+	watch(
+		() => props.fields,
+		(newVal) => {
+			formState.value = { ...extractNamesAsObject(newVal) }
+		}
+	)
+</script>
+
+<style scoped></style>
diff --git a/src/components/Table/index.vue b/src/components/Table/index.vue
index aa481fb..522ebc0 100644
--- a/src/components/Table/index.vue
+++ b/src/components/Table/index.vue
@@ -11,6 +11,45 @@
 					<a-checkbox :checked="data.localSettings.rowClassNameSwitch" @change="changeRowClass"> 斑马纹 </a-checkbox>
 				</div>
 				<span v-for="item in tool" :key="item.name">
+					<!-- 新增 -->
+					<a-tooltip
+						v-if="item.name === 'plus' && props.toolConfig.plus"
+						:title="item.title"
+						class="s-tool-item"
+						@click="
+							() => {
+								emit('plusRowData')
+							}
+						"
+					>
+						<component class="icons" :is="item.icon"></component>
+					</a-tooltip>
+					<!-- 修改 -->
+					<a-tooltip
+						v-if="item.name === 'edit' && props.toolConfig.edit"
+						:title="item.title"
+						class="s-tool-item"
+						@click="
+							() => {
+								emit('editRowData')
+							}
+						"
+					>
+						<component class="icons" :is="item.icon"></component>
+					</a-tooltip>
+					<!-- 删除 -->
+					<a-tooltip
+						v-if="item.name === 'delete' && props.toolConfig.delete"
+						:title="item.title"
+						class="s-tool-item"
+						@click="
+							() => {
+								emit('deleteRowData')
+							}
+						"
+					>
+						<component class="icons" :is="item.icon"></component>
+					</a-tooltip>
 					<!-- 刷新 -->
 					<a-tooltip
 						v-if="item.name === 'refresh' && props.toolConfig.refresh"
@@ -124,7 +163,7 @@
 	import { get } from 'lodash-es'
 	const slots = useSlots()
 	const route = useRoute()
-	const emit = defineEmits(['expand'])
+	const emit = defineEmits(['expand', 'plusRowData', 'editRowData', 'deleteRowData'])
 	const renderSlots = Object.keys(slots)
 
 	const props = defineProps(
@@ -134,7 +173,7 @@
 				default: 'key'
 			},
 			data: {
-				type: Function,
+				type: [Function, Array],
 				required: true
 			},
 			pageNum: {
@@ -189,6 +228,9 @@
 			toolConfig: {
 				type: Object,
 				default: () => ({
+					plus: false,
+					edit: false,
+					delete: false,
 					refresh: false,
 					height: false,
 					columnSetting: false,
@@ -245,6 +287,21 @@
 	const renderTableProps = ref([])
 	// 右上角工具数组
 	const tool = [
+		{
+			name: 'plus',
+			icon: 'plus-outlined',
+			title: '新增'
+		},
+		{
+			name: 'edit',
+			icon: 'edit-outlined',
+			title: '编辑'
+		},
+		{
+			name: 'delete',
+			icon: 'delete-outlined',
+			title: '删除'
+		},
 		{
 			name: 'refresh',
 			icon: 'sync-outlined',
@@ -365,62 +422,71 @@
 			}
 		)
 		// 用请求数据请求该列表的返回数据
-		const result = props.data(parameter)
-		if ((typeof result === 'object' || typeof result === 'function') && typeof result.then === 'function') {
-			result.then((r) => {
-				if (r == null) {
-					data.localLoading = false
-					return
-				}
-				// 获取分页数据及分页的显示内容
-				data.localPagination =
-					(props.showPagination &&
-						Object.assign({}, data.localPagination, {
-							current: r.current, // pageNo, // 返回结果中的当前分页数
-							total: r.total, // totalRows, // 返回结果中的总记录数
-							showSizeChanger: props.showSizeChanger,
-							pageSizeOptions: props.pageSizeOptions,
-							showTotal: (total, range) => {
-								return `${range[0]}-${range[1]} 共 ${total} 条 `
-							},
-							pageSize: (pagination && pagination.pageSize) || data.localPagination.pageSize
-						})) ||
-					false
-				// 后端数据records为null保存修复
-				if (r.records == null) {
-					r.records = []
-				}
-				// 为防止删除数据后导致页面当前页面数据长度为 0 ,自动翻页到上一页
-				if (r.records.length === 0 && props.showPagination && data.localPagination.current > 1) {
-					data.localPagination.current--
-					loadData()
-					return
-				}
-				try {
-					// 当情况满足时，表示数据不满足分页大小，关闭 table 分页功能
-					// 没有数据或只有一页数据时隐藏分页栏
-					// if ((['auto', true].includes(props.showPagination) && r.total <= (r.pages * data.localPagination.pageSize))) {
-					// 	data.localPagination.hideOnSinglePage = true
-					// }
-					if (!props.showPagination) {
-						data.localPagination.hideOnSinglePage = true
-					}
-				} catch (e) {
-					data.localPagination = false
-				}
+		console.log(typeof props.data, 'typeof props.data')
+		if (typeof props.data !== 'function') {
+			data.localLoading = false
+			data.localDataSource = props.data
 
-				// 返回结果中的数组数据
-				if (props.showPagination === false) {
-					data.localDataSource = r instanceof Array ? r : r.records
-				} else {
-					data.localDataSource = r.records
-				}
-				getTableProps()
-			})
-				.catch(() => {})
-				.finally(() => {
-					data.localLoading = false
-				})
+			getTableProps()
+		} else {
+			const result = props.data(parameter)
+			if ((typeof result === 'object' || typeof result === 'function') && typeof result.then === 'function') {
+				result
+					.then((r) => {
+						if (r == null) {
+							data.localLoading = false
+							return
+						}
+						// 获取分页数据及分页的显示内容
+						data.localPagination =
+							(props.showPagination &&
+								Object.assign({}, data.localPagination, {
+									current: r.current, // pageNo, // 返回结果中的当前分页数
+									total: r.total, // totalRows, // 返回结果中的总记录数
+									showSizeChanger: props.showSizeChanger,
+									pageSizeOptions: props.pageSizeOptions,
+									showTotal: (total, range) => {
+										return `${range[0]}-${range[1]} 共 ${total} 条 `
+									},
+									pageSize: (pagination && pagination.pageSize) || data.localPagination.pageSize
+								})) ||
+							false
+						// 后端数据records为null保存修复
+						if (r.records == null) {
+							r.records = []
+						}
+						// 为防止删除数据后导致页面当前页面数据长度为 0 ,自动翻页到上一页
+						if (r.records.length === 0 && props.showPagination && data.localPagination.current > 1) {
+							data.localPagination.current--
+							loadData()
+							return
+						}
+						try {
+							// 当情况满足时，表示数据不满足分页大小，关闭 table 分页功能
+							// 没有数据或只有一页数据时隐藏分页栏
+							// if ((['auto', true].includes(props.showPagination) && r.total <= (r.pages * data.localPagination.pageSize))) {
+							// 	data.localPagination.hideOnSinglePage = true
+							// }
+							if (!props.showPagination) {
+								data.localPagination.hideOnSinglePage = true
+							}
+						} catch (e) {
+							data.localPagination = false
+						}
+
+						// 返回结果中的数组数据
+						if (props.showPagination === false) {
+							data.localDataSource = r instanceof Array ? r : r.records
+						} else {
+							data.localDataSource = r.records
+						}
+						getTableProps()
+					})
+					.catch(() => {})
+					.finally(() => {
+						data.localLoading = false
+					})
+			}
 		}
 	}
 
@@ -502,7 +568,8 @@
 			...renderProps,
 			size: data.customSize, // 注意这个size是a-table组件需要的，这里不能跟别的地方成为compSize
 			columns: data.columnsSetting.filter((value) => value.checked === undefined || value.checked),
-			...data.localSettings
+			...data.localSettings,
+			scroll: {x: 100, y: 1000}
 		}
 		// 将值为 undefined 或者 null 的 table里props属性进行一个过滤
 		renderTableProps.value = Object.entries(renderProps).reduce((x, [y, z]) => (z == null ? x : ((x[y] = z), x)), {})
@@ -571,7 +638,20 @@
 	})
 	onMounted(() => {
 		init()
+
+		window.addEventListener('resize', () => {
+			console.log('屏幕发生变换')
+		})
 	})
+
+
+
+	onBeforeUnmount(() => {
+		window.removeEventListener('resize', () => {
+			console.log('屏幕发生变换')
+
+		});
+	});
 </script>
 <style lang="less" scoped>
 	.s-table-tool {
diff --git a/src/views/basicData/unit/columns/unitGroupColumns.js b/src/views/basicData/unit/columns/unitGroupColumns.js
new file mode 100644
index 0000000..dee05f5
--- /dev/null
+++ b/src/views/basicData/unit/columns/unitGroupColumns.js
@@ -0,0 +1,10 @@
+export const unitGroupColumns = [
+	{
+		title: '名称',
+		dataIndex: 'name'
+	},
+	{
+		title: '状态',
+		dataIndex: 'state'
+	},
+]
diff --git a/src/views/basicData/unit/detail/index.vue b/src/views/basicData/unit/detail/index.vue
new file mode 100644
index 0000000..c88dfcb
--- /dev/null
+++ b/src/views/basicData/unit/detail/index.vue
@@ -0,0 +1,29 @@
+<template>
+	<div></div>
+</template>
+
+<script setup>
+	// const props = defineProps({})
+
+	// const emit = defineEmits()
+
+	// 生命周期钩子
+	onMounted(() => {
+		console.log('Component mounted')
+		// TODO: Add your onMounted code here
+	})
+
+	onUpdated(() => {
+		console.log('Component updated')
+		// TODO: Add your onUpdated code here
+	})
+
+	onUnmounted(() => {
+		console.log('Component unmounted')
+		// TODO: Add your onUnmounted code here
+	})
+
+	// watch(() => {}, () => {})
+</script>
+
+<style scoped></style>
diff --git a/src/views/basicData/unit/formData/SearchForm.js b/src/views/basicData/unit/formData/SearchForm.js
new file mode 100644
index 0000000..fc11a9e
--- /dev/null
+++ b/src/views/basicData/unit/formData/SearchForm.js
@@ -0,0 +1,26 @@
+export const SearchFields = [
+	{ label: '名称', name: 'name', type: 'input', placeholder: '请输入名称' },
+	{
+		label: '状态',
+		name: 'state',
+		type: 'select',
+		placeholder: '请选择状态',
+		options: [
+			{ label: 'Active', value: 'active' },
+			{ label: 'Inactive', value: 'inactive' }
+		]
+	},
+	{ label: '编码', name: 'number', type: 'input', placeholder: '请输入编码' },
+	{
+		label: '是否基本单位',
+		name: 'isBase',
+		type: 'select',
+		placeholder: '请选择是否基本单位',
+		options: [
+			{ label: '是', value: true },
+			{ label: '否', value: false }
+		],
+		advanced: true
+	},
+	{ label: '单位组id', name: 'unitGroupId', type: 'input', placeholder: '请输入单位组id', advanced: true }
+]
diff --git a/src/views/basicData/unit/index.vue b/src/views/basicData/unit/index.vue
new file mode 100644
index 0000000..e2b8eaa
--- /dev/null
+++ b/src/views/basicData/unit/index.vue
@@ -0,0 +1,202 @@
+<template>
+	<search-form :fields="SearchFields" @search="handleSearch" @rest="reset"></search-form>
+
+	<a-card class="mt-4">
+		<a-row :gutter="20">
+			<a-col :span="8">
+				<s-table
+					:alert="false"
+					:columns="unitGroupColumns"
+					:data="loadData"
+					bordered
+					:row-key="(record) => record.id"
+					:tool-config="{
+						plus: true,
+						edit: true,
+						delete: true,
+						refresh: true,
+						height: true,
+						columnSetting: true,
+						striped: false
+					}"
+					:row-selection="options.rowSelection"
+					@plusRowData="handlePlusRowData"
+					@editRowData="handleEditRowData"
+					@deleteRowData="handleDeleteRowData"
+				>
+					<template #operator class="table-operator">
+						<a-space>
+							<span>单位组</span>
+						</a-space>
+					</template>
+				</s-table>
+			</a-col>
+			<a-col :span="16">
+				<s-table
+					ref="tableRef"
+					:columns="columns"
+					:data="loadData"
+					:alert="options.alert.show"
+					bordered
+					:row-key="(record) => record.id"
+					:tool-config="toolConfig"
+					:row-selection="options.rowSelection"
+				>
+					<template #operator class="table-operator">
+						<a-space>
+							<a-button type="primary" @click="formRef.onOpen()" v-if="hasPerm('sysUnitAdd')">
+								<template #icon><plus-outlined /></template>
+								新增
+							</a-button>
+							<xn-batch-delete
+								v-if="hasPerm('sysUnitBatchDelete')"
+								:selectedRowKeys="selectedRowKeys"
+								@batchDelete="deleteBatchSysUnit"
+							/>
+						</a-space>
+					</template>
+					<template #bodyCell="{ column, record }">
+						<template v-if="column.dataIndex === 'state'">
+							{{ $TOOL.dictTypeData('COMMON_STATUS', record.state) }}
+						</template>
+						<template v-if="column.dataIndex === 'isBase'">
+							{{ $TOOL.dictTypeData('YES_NO', record.isBase) }}
+						</template>
+						<template v-if="column.dataIndex === 'action'">
+							<a-space>
+								<a @click="formRef.onOpen(record)" v-if="hasPerm('sysUnitEdit')">编辑</a>
+								<a-divider type="vertical" v-if="hasPerm(['sysUnitEdit', 'sysUnitDelete'], 'and')" />
+								<a-popconfirm title="确定要删除吗？" @confirm="deleteSysUnit(record)">
+									<a-button type="link" danger size="small" v-if="hasPerm('sysUnitDelete')">删除</a-button>
+								</a-popconfirm>
+							</a-space>
+						</template>
+					</template>
+				</s-table>
+			</a-col>
+		</a-row>
+	</a-card>
+</template>
+
+<script setup name="sysunit">
+	import tool from '@/utils/tool'
+	import { cloneDeep } from 'lodash-es'
+	import sysUnitApi from '@/api/baseData/unit/unitApi'
+	import { unitGroupColumns } from '@/views/basicData/unit/columns/unitGroupColumns'
+	import { SearchFields } from '@/views/basicData/unit/formData/SearchForm'
+
+	const searchFormState = ref({})
+	const searchFormRef = ref()
+	const tableRef = ref()
+	const formRef = ref()
+	const toolConfig = {
+		refresh: true,
+		height: true,
+		columnSetting: true,
+		striped: false
+	}
+	// 查询区域显示更多控制
+	const advanced = ref(false)
+	const toggleAdvanced = () => {
+		advanced.value = !advanced.value
+	}
+	const columns = [
+		{
+			title: '名称',
+			dataIndex: 'name'
+		},
+		{
+			title: '状态',
+			dataIndex: 'state'
+		},
+		{
+			title: '编码',
+			dataIndex: 'number'
+		},
+		{
+			title: '换算率',
+			dataIndex: 'rate'
+		},
+		{
+			title: '是否基本单位',
+			dataIndex: 'isBase'
+		},
+		{
+			title: '精度',
+			dataIndex: 'precision'
+		},
+		{
+			title: '单位组id',
+			dataIndex: 'unitGroupId'
+		}
+	]
+	// 操作栏通过权限判断是否显示
+	if (hasPerm(['sysUnitEdit', 'sysUnitDelete'])) {
+		columns.push({
+			title: '操作',
+			dataIndex: 'action',
+			align: 'center',
+			width: 150
+		})
+	}
+	const selectedRowKeys = ref([])
+	// 列表选择配置
+	const options = {
+		// columns数字类型字段加入 needTotal: true 可以勾选自动算账
+		alert: {
+			show: true,
+			clear: () => {
+				selectedRowKeys.value = ref([])
+			}
+		},
+		rowSelection: {
+			onChange: (selectedRowKey, selectedRows) => {
+				selectedRowKeys.value = selectedRowKey
+			}
+		}
+	}
+	const loadData = (parameter) => {
+		const searchFormParam = cloneDeep(searchFormState.value)
+		return sysUnitApi.sysUnitPage(Object.assign(parameter, searchFormParam)).then((data) => {
+			return data
+		})
+	}
+
+	// 搜索
+	const handleSearch = () => {}
+	// 重置
+	const reset = () => {
+		searchFormRef.value.resetFields()
+		tableRef.value.refresh(true)
+	}
+	// 删除
+	const deleteSysUnit = (record) => {
+		let params = [
+			{
+				id: record.id
+			}
+		]
+		sysUnitApi.sysUnitDelete(params).then(() => {
+			tableRef.value.refresh(true)
+		})
+	}
+	// 批量删除
+	const deleteBatchSysUnit = (params) => {
+		sysUnitApi.sysUnitDelete(params).then(() => {
+			tableRef.value.clearRefreshSelected()
+		})
+	}
+	const stateOptions = tool.dictList('COMMON_STATUS')
+	const isBaseOptions = tool.dictList('YES_NO')
+
+	// 表格 新增/修改/删除
+	const handlePlusRowData = () => {
+		formRef.value.onOpen()
+	}
+
+	const handleEditRowData = () => {
+		formRef.value.onOpen()
+	}
+
+	const handleDeleteRowData = () => {}
+</script>