diff --git a/src/api/assets/warehouse/index.ts b/src/api/assets/warehouse/index.ts
new file mode 100644
index 0000000..34f58bf
--- /dev/null
+++ b/src/api/assets/warehouse/index.ts
@@ -0,0 +1,66 @@
+import { newService } from '/@/utils/request';
+
+// 仓库查询参数
+export interface WarehouseQueryParams {
+	name?: string;
+	status?: number;
+	pageNum?: number;
+	pageSize?: number;
+}
+
+// 仓库数据接口
+export interface WarehouseData {
+	id?: string;
+	warehouseName: string;
+	warehouseCode?: string;
+	address?: string;
+	contactPerson?: string;
+	contactPhone?: string;
+	status?: number;
+	remark?: string;
+}
+
+// 获取仓库列表
+export function listWarehouses(params?: WarehouseQueryParams) {
+	return newService({
+		url: '/assets/warehouse/listWarehouses',
+		method: 'get',
+		params,
+	});
+}
+
+// 获取仓库详情
+export function getWarehouse(id: string) {
+	return newService({
+		url: '/assets/warehouse/getWarehouse',
+		method: 'get',
+		params: { id },
+	});
+}
+
+// 创建仓库
+export function createWarehouse(data: WarehouseData) {
+	return newService({
+		url: '/assets/warehouse/createWarehouse',
+		method: 'post',
+		data,
+	});
+}
+
+// 更新仓库
+export function updateWarehouse(data: WarehouseData) {
+	return newService({
+		url: '/assets/warehouse/updateWarehouse',
+		method: 'put',
+		data,
+	});
+}
+
+// 删除仓库
+export function deleteWarehouse(id: string) {
+	return newService({
+		url: '/assets/warehouse/deleteWarehouse',
+		method: 'delete',
+		params: { id },
+	});
+}
diff --git a/src/views/assets/warehouse/component/editWarehouse.vue b/src/views/assets/warehouse/component/editWarehouse.vue
new file mode 100644
index 0000000..8fdfcbb
--- /dev/null
+++ b/src/views/assets/warehouse/component/editWarehouse.vue
@@ -0,0 +1,197 @@
+<template>
+	<el-dialog
+		:title="isEdit ? '修改仓库' : '新增仓库'"
+		v-model="isShowDialog"
+		width="600px"
+		:close-on-click-modal="false"
+		@close="onCancel"
+	>
+		<el-form ref="formRef" :model="ruleForm" :rules="rules" label-width="100px">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="仓库名称" prop="warehouseName">
+						<el-input v-model="ruleForm.warehouseName" placeholder="请输入仓库名称" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="仓库编码" prop="warehouseCode">
+						<el-input v-model="ruleForm.warehouseCode" placeholder="请输入仓库编码" clearable />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<el-form-item label="仓库地址" prop="address">
+						<el-input v-model="ruleForm.address" placeholder="请输入仓库地址" clearable />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="联系人" prop="contactPerson">
+						<el-input v-model="ruleForm.contactPerson" placeholder="请输入联系人" clearable />
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="联系电话" prop="contactPhone">
+						<el-input v-model="ruleForm.contactPhone" placeholder="请输入联系电话" clearable />
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="状态" prop="status">
+						<el-radio-group v-model="ruleForm.status">
+							<el-radio :value="1">启用</el-radio>
+							<el-radio :value="0">禁用</el-radio>
+						</el-radio-group>
+					</el-form-item>
+				</el-col>
+			</el-row>
+			<el-row :gutter="20">
+				<el-col :span="24">
+					<el-form-item label="备注" prop="remark">
+						<el-input v-model="ruleForm.remark" type="textarea" :rows="3" placeholder="请输入备注" />
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<span class="dialog-footer">
+				<el-button @click="onCancel">取 消</el-button>
+				<el-button type="primary" @click="onSubmit" :loading="submitLoading">{{ isEdit ? '修 改' : '添 加' }}</el-button>
+			</span>
+		</template>
+	</el-dialog>
+</template>
+
+<script lang="ts">
+export default {
+	name: 'editWarehouse',
+};
+</script>
+
+<script setup lang="ts">
+import { ref, reactive } from 'vue';
+import { ElMessage } from 'element-plus';
+import type { FormInstance, FormRules } from 'element-plus';
+import { createWarehouse, updateWarehouse, getWarehouse } from '/@/api/assets/warehouse';
+
+// 定义事件
+const emit = defineEmits(['getWarehouseList']);
+
+// 表单ref
+const formRef = ref<FormInstance>();
+
+// 弹窗状态
+const isShowDialog = ref(false);
+const isEdit = ref(false);
+const submitLoading = ref(false);
+
+// 表单数据
+const ruleForm = reactive({
+	id: '',
+	warehouseName: '',
+	warehouseCode: '',
+	address: '',
+	contactPerson: '',
+	contactPhone: '',
+	status: 1,
+	remark: '',
+});
+
+// 表单验证规则
+const rules = reactive<FormRules>({
+	warehouseName: [{ required: true, message: '请输入仓库名称', trigger: 'blur' }],
+});
+
+// 重置表单
+const resetForm = () => {
+	ruleForm.id = '';
+	ruleForm.warehouseName = '';
+	ruleForm.warehouseCode = '';
+	ruleForm.address = '';
+	ruleForm.contactPerson = '';
+	ruleForm.contactPhone = '';
+	ruleForm.status = 1;
+	ruleForm.remark = '';
+};
+
+// 打开弹窗
+const openDialog = async (row?: any) => {
+	resetForm();
+	isEdit.value = !!row;
+	
+	if (row) {
+		try {
+			const res: any = await getWarehouse(row.id);
+			const data = res.data;
+			ruleForm.id = data.id || '';
+			ruleForm.warehouseName = data.warehouseName || '';
+			ruleForm.warehouseCode = data.warehouseCode || '';
+			ruleForm.address = data.address || '';
+			ruleForm.contactPerson = data.contactPerson || '';
+			ruleForm.contactPhone = data.contactPhone || '';
+			ruleForm.status = (data.status === '1' || data.status === 1 || data.status === true) ? 1 : 0;
+			ruleForm.remark = data.remark || '';
+		} catch (error) {
+			console.error('获取仓库详情失败:', error);
+		}
+	}
+	
+	isShowDialog.value = true;
+};
+
+// 取消
+const onCancel = () => {
+	isShowDialog.value = false;
+	formRef.value?.resetFields();
+};
+
+// 提交
+const onSubmit = async () => {
+	const form = formRef.value;
+	if (!form) return;
+	
+	form.validate(async (valid: boolean) => {
+		if (valid) {
+			submitLoading.value = true;
+			try {
+				const data = {
+					id: ruleForm.id || undefined,
+					warehouseName: ruleForm.warehouseName,
+					warehouseCode: ruleForm.warehouseCode,
+					address: ruleForm.address,
+					contactPerson: ruleForm.contactPerson,
+					contactPhone: ruleForm.contactPhone,
+					status: ruleForm.status,
+					remark: ruleForm.remark,
+				};
+				
+				if (isEdit.value) {
+					await updateWarehouse(data);
+					ElMessage.success('修改成功');
+				} else {
+					await createWarehouse(data);
+					ElMessage.success('添加成功');
+				}
+				
+				isShowDialog.value = false;
+				emit('getWarehouseList');
+			} catch (error) {
+				console.error('提交失败:', error);
+			} finally {
+				submitLoading.value = false;
+			}
+		}
+	});
+};
+
+// 暴露方法
+defineExpose({
+	openDialog,
+});
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/assets/warehouse/index.vue b/src/views/assets/warehouse/index.vue
new file mode 100644
index 0000000..31007cd
--- /dev/null
+++ b/src/views/assets/warehouse/index.vue
@@ -0,0 +1,178 @@
+<template>
+	<div class="assets-warehouse-page">
+		<div class="assets-warehouse-container">
+			<el-card shadow="hover">
+				<div class="assets-warehouse-search mb15">
+					<el-form :inline="true" :model="tableData.param.keyword">
+						<el-form-item label="仓库名称">
+							<el-input size="default" v-model="tableData.param.keyword" placeholder="请输入仓库名称" clearable style="width: 200px" />
+						</el-form-item>
+						<el-form-item label="状态">
+							<el-select size="default" v-model="tableData.param.status" placeholder="请选择状态" clearable style="width: 120px">
+								<el-option label="启用" :value="1" />
+								<el-option label="禁用" :value="0" />
+							</el-select>
+						</el-form-item>
+						<el-form-item>
+							<el-button size="default" type="primary" @click="getWarehouseList">
+								<el-icon><ele-Search /></el-icon>
+								查询
+							</el-button>
+							<el-button size="default" @click="onResetQuery">
+								<el-icon><ele-Refresh /></el-icon>
+								重置
+							</el-button>
+							<el-button size="default" type="success" @click="onOpenAdd">
+								<el-icon><ele-Plus /></el-icon>
+								新增
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+				<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading" border>
+					<el-table-column type="index" label="序号" width="60" align="center" />
+					<el-table-column prop="warehouseName" label="仓库名称" min-width="150" show-overflow-tooltip />
+					<el-table-column prop="warehouseCode" label="仓库编码" width="120" show-overflow-tooltip />
+					<el-table-column prop="address" label="仓库地址" min-width="200" show-overflow-tooltip />
+					<el-table-column prop="contactPerson" label="联系人" width="100" show-overflow-tooltip />
+					<el-table-column prop="contactPhone" label="联系电话" width="130" show-overflow-tooltip />
+					<el-table-column prop="status" label="状态" width="100" align="center">
+						<template #default="scope">
+							<el-tag :type="scope.row.status == '1' || scope.row.status === 1 ? 'success' : 'danger'">
+								{{ scope.row.status == '1' || scope.row.status === 1 ? '启用' : '禁用' }}
+							</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column prop="createdAt" label="创建时间" width="170" show-overflow-tooltip />
+					<el-table-column label="操作" width="150" fixed="right" align="center">
+						<template #default="scope">
+							<el-button size="small" text type="primary" @click="onEdit(scope.row)">修改</el-button>
+							<el-button size="small" text type="danger" @click="onRowDel(scope.row)">删除</el-button>
+						</template>
+					</el-table-column>
+				</el-table>
+				<!-- 分页 -->
+				<div class="mt15" style="text-align: right">
+					<el-pagination
+						v-model:current-page="tableData.param.pageNum"
+						v-model:page-size="tableData.param.pageSize"
+						:page-sizes="[10, 20, 50, 100]"
+						:total="tableData.total"
+						layout="total, sizes, prev, pager, next, jumper"
+						@size-change="onSizeChange"
+						@current-change="onCurrentChange"
+					/>
+				</div>
+			</el-card>
+		</div>
+		<EditWarehouse ref="editWarehouseRef" @getWarehouseList="getWarehouseList" />
+	</div>
+</template>
+
+<script lang="ts">
+export default {
+	name: 'assetsWarehouse',
+};
+</script>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { listWarehouses, deleteWarehouse } from '/@/api/assets/warehouse';
+import EditWarehouse from './component/editWarehouse.vue';
+
+// 表格数据
+const tableData = reactive({
+	data: [] as any[],
+	total: 0,
+	loading: false,
+	param: {
+		keyword: '',
+		status: undefined as number | undefined,
+		pageNum: 1,
+		pageSize: 10,
+	},
+});
+
+// 编辑弹窗ref
+const editWarehouseRef = ref();
+
+// 获取仓库列表
+const getWarehouseList = async () => {
+	tableData.loading = true;
+	try {
+		const res: any = await listWarehouses(tableData.param);
+		tableData.data = res.data?.list || [];
+		tableData.total = res.data?.total || 0;
+	} catch (error) {
+		console.error('获取仓库列表失败:', error);
+	} finally {
+		tableData.loading = false;
+	}
+};
+
+// 重置查询
+const onResetQuery = () => {
+	tableData.param.keyword = '';
+	tableData.param.status = undefined;
+	tableData.param.pageNum = 1;
+	getWarehouseList();
+};
+
+// 打开新增弹窗
+const onOpenAdd = () => {
+	editWarehouseRef.value.openDialog();
+};
+
+// 打开编辑弹窗
+const onEdit = (row: any) => {
+	editWarehouseRef.value.openDialog(row);
+};
+
+// 删除仓库
+const onRowDel = (row: any) => {
+	ElMessageBox.confirm(`确定要删除仓库【${row.warehouseName}】吗？`, '提示', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	}).then(async () => {
+		try {
+			await deleteWarehouse(row.id);
+			ElMessage.success('删除成功');
+			getWarehouseList();
+		} catch (error) {
+			console.error('删除失败:', error);
+		}
+	}).catch(() => {});
+};
+
+// 分页大小改变
+const onSizeChange = (size: number) => {
+	tableData.param.pageSize = size;
+	getWarehouseList();
+};
+
+// 当前页改变
+const onCurrentChange = (page: number) => {
+	tableData.param.pageNum = page;
+	getWarehouseList();
+};
+
+// 页面加载时获取数据
+onMounted(() => {
+	getWarehouseList();
+});
+</script>
+
+<style scoped lang="scss">
+.assets-warehouse-page {
+	padding: 15px;
+	.assets-warehouse-container {
+		.assets-warehouse-search {
+			.el-form-item {
+				margin-bottom: 0;
+			}
+		}
+	}
+}
+</style>