diff --git a/src/api/base/warehouse/index.js b/src/api/base/warehouse/index.js
new file mode 100644
index 0000000..2a29f49
--- /dev/null
+++ b/src/api/base/warehouse/index.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 创建仓库
+export function createBaseWarehouse(data) {
+  return request({
+    url: '/conf/base-warehouse/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新仓库
+export function updateBaseWarehouse(data) {
+  return request({
+    url: '/conf/base-warehouse/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库
+export function deleteBaseWarehouse(id) {
+  return request({
+    url: '/conf/base-warehouse/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得仓库
+export function getBaseWarehouse(id) {
+  return request({
+    url: '/conf/base-warehouse/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得仓库列表
+export function getBaseWarehouseList(params) {
+  return request({
+    url: '/conf/base-warehouse/list',
+    method: 'get',
+    params
+  })
+}
+// 导出仓库 Excel
+export function exportBaseWarehouseExcel(params) {
+  return request({
+    url: '/conf/base-warehouse/export-excel',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
\ No newline at end of file
diff --git a/src/views/conf/warehouse/BaseWarehouseForm.vue b/src/views/conf/warehouse/BaseWarehouseForm.vue
new file mode 100644
index 0000000..3e9ab05
--- /dev/null
+++ b/src/views/conf/warehouse/BaseWarehouseForm.vue
@@ -0,0 +1,148 @@
+<template>
+  <div class="app-container">
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="45%" v-dialogDrag append-to-body>
+      <el-form ref="formRef" :model="formData" :rules="formRules" v-loading="formLoading" label-width="100px">
+                    <el-form-item label="父id" prop="parentId">
+                      <TreeSelect
+                        v-model="formData.parentId"
+                        :options="baseWarehouseTree"
+                        :normalizer="normalizer"
+                        placeholder="请选择父id"
+                      />
+                    </el-form-item>
+                    <el-form-item label="仓库/货架名称" prop="name">
+                      <el-input v-model="formData.name" placeholder="请输入仓库/货架名称" />
+                    </el-form-item>
+                    <el-form-item label="仓库/货架编码" prop="code">
+                      <el-input v-model="formData.code" placeholder="请输入仓库/货架编码" />
+                    </el-form-item>
+                    <el-form-item label="状态（01启用，02禁用）" prop="status">
+                      <el-radio-group v-model="formData.status">
+                            <el-radio label="1">请选择字典生成</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="备注" prop="remark">
+                      <el-input v-model="formData.remark" placeholder="请输入备注" />
+                    </el-form-item>
+                    <el-form-item label="所属子公司" prop="corpId">
+                      <el-input v-model="formData.corpId" placeholder="请输入所属子公司" />
+                    </el-form-item>
+      </el-form>
+              <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import * as BaseWarehouseApi from '@/api/conf/warehouse';
+    import TreeSelect from "@riophae/vue-treeselect";
+  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+    export default {
+    name: "BaseWarehouseForm",
+    components: {
+                  TreeSelect,
+            },
+    data() {
+      return {
+        // 弹出层标题
+        dialogTitle: "",
+        // 是否显示弹出层
+        dialogVisible: false,
+        // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+        formLoading: false,
+        // 表单参数
+        formData: {
+                            parentId: undefined,
+                            name: undefined,
+                            code: undefined,
+                            status: undefined,
+                            remark: undefined,
+                            corpId: undefined,
+        },
+        // 表单校验
+        formRules: {
+        },
+                       baseWarehouseTree: [], // 树形结构
+              };
+    },
+    methods: {
+      /** 打开弹窗 */
+     async open(id) {
+        this.dialogVisible = true;
+        this.reset();
+        // 修改时，设置数据
+        if (id) {
+          this.formLoading = true;
+          try {
+            const res = await BaseWarehouseApi.getBaseWarehouse(id);
+            this.formData = res.data;
+            this.title = "修改仓库";
+          } finally {
+            this.formLoading = false;
+          }
+        }
+        this.title = "新增仓库";
+                await this.getBaseWarehouseTree();
+      },
+      /** 提交按钮 */
+      async submitForm() {
+        // 校验主表
+        await this.$refs["formRef"].validate();
+                  this.formLoading = true;
+        try {
+          const data = this.formData;
+                  // 修改的提交
+          if (data.id) {
+            await BaseWarehouseApi.updateBaseWarehouse(data);
+            this.$modal.msgSuccess("修改成功");
+            this.dialogVisible = false;
+            this.$emit('success');
+            return;
+          }
+          // 添加的提交
+          await BaseWarehouseApi.createBaseWarehouse(data);
+          this.$modal.msgSuccess("新增成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+        } finally {
+          this.formLoading = false;
+        }
+      },
+                  /** 获得仓库树 */
+         async getBaseWarehouseTree() {
+            this.baseWarehouseTree = [];
+            const res = await BaseWarehouseApi.getBaseWarehouseList();
+            const root = { id: 0, name: '顶级仓库', children: [] };
+            root.children = this.handleTree(res.data, 'id', 'parentId')
+            this.baseWarehouseTree.push(root)
+          },
+                  /** 转换仓库数据结构 */
+          normalizer(node) {
+            if (node.children && !node.children.length) {
+              delete node.children;
+            }
+                return {
+                  id: node.id,
+                  label: node.name,
+                  children: node.children
+                };
+          },
+      /** 表单重置 */
+      reset() {
+        this.formData = {
+                            parentId: undefined,
+                            name: undefined,
+                            code: undefined,
+                            status: undefined,
+                            remark: undefined,
+                            corpId: undefined,
+        };
+        this.resetForm("formRef");
+      }
+    }
+  };
+</script>
\ No newline at end of file
diff --git a/src/views/conf/warehouse/index.vue b/src/views/conf/warehouse/index.vue
new file mode 100644
index 0000000..2ea483e
--- /dev/null
+++ b/src/views/conf/warehouse/index.vue
@@ -0,0 +1,184 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="父id" prop="parentId">
+        <el-input v-model="queryParams.parentId" placeholder="请输入父id" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="仓库/货架名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入仓库/货架名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="仓库/货架编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入仓库/货架编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="状态（01启用，02禁用）" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态（01启用，02禁用）" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="所属子公司" prop="corpId">
+        <el-input v-model="queryParams.corpId" placeholder="请输入所属子公司" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
+                   v-hasPermi="['conf:base-warehouse:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['conf:base-warehouse:export']">导出</el-button>
+      </el-col>
+                  <el-col :span="1.5">
+            <el-button type="danger" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">
+              展开/折叠
+            </el-button>
+          </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+            <el-table
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        v-if="refreshTable"
+        row-key="id"
+        :default-expand-all="isExpandAll"
+        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+      >
+            <el-table-column label="父id" align="center" prop="parentId" />
+      <el-table-column label="仓库/货架名称" align="center" prop="name" />
+      <el-table-column label="仓库/货架编码" align="center" prop="code" />
+      <el-table-column label="状态（01启用，02禁用）" align="center" prop="status" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="所属子公司" align="center" prop="corpId" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template v-slot="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
+                     v-hasPermi="['conf:base-warehouse:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['conf:base-warehouse:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 对话框(添加 / 修改) -->
+    <BaseWarehouseForm ref="formRef" @success="getList" />
+    </div>
+</template>
+
+<script>
+import * as BaseWarehouseApi from '@/api/conf/warehouse';
+import BaseWarehouseForm from './BaseWarehouseForm.vue';
+export default {
+  name: "BaseWarehouse",
+  components: {
+          BaseWarehouseForm,
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+            // 仓库列表
+      list: [],
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 选中行
+      currentRow: {},
+      // 查询参数
+      queryParams: {
+                parentId: null,
+        name: null,
+        code: null,
+        status: null,
+        remark: null,
+        corpId: null,
+        createTime: [],
+      },
+            };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    async getList() {
+      try {
+      this.loading = true;
+             const res = await BaseWarehouseApi.getBaseWarehouseList(this.queryParams);
+       this.list = this.handleTree(res.data, 'id', 'parentId');
+      } finally {
+        this.loading = false;
+      }
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 添加/修改操作 */
+    openForm(id) {
+      this.$refs["formRef"].open(id);
+    },
+    /** 删除按钮操作 */
+    async handleDelete(row) {
+      const id = row.id;
+      await this.$modal.confirm('是否确认删除仓库编号为"' + id + '"的数据项?')
+      try {
+       await BaseWarehouseApi.deleteBaseWarehouse(id);
+       await this.getList();
+       this.$modal.msgSuccess("删除成功");
+      } catch {}
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      await this.$modal.confirm('是否确认导出所有仓库数据项?');
+      try {
+        this.exportLoading = true;
+        const data = await BaseWarehouseApi.exportBaseWarehouseExcel(this.queryParams);
+        this.$download.excel(data, '仓库.xls');
+      } catch {
+      } finally {
+        this.exportLoading = false;
+      }
+    },
+                    /** 展开/折叠操作 */
+        toggleExpandAll() {
+          this.refreshTable = false
+          this.isExpandAll = !this.isExpandAll
+          this.$nextTick(function () {
+            this.refreshTable = true
+          })
+        }
+  }
+};
+</script>
\ No newline at end of file