diff --git a/ruoyi-ui/src/api/bas/cargoSpace.js b/ruoyi-ui/src/api/bas/cargoSpace.js
new file mode 100644
index 0000000..9813ecd
--- /dev/null
+++ b/ruoyi-ui/src/api/bas/cargoSpace.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询库存信息列表
+export function listCargoSpace(query) {
+  return request({
+    url: '/bas/cargoSpace/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库存信息详细
+export function getCargoSpace(cargoSpaceId) {
+  return request({
+    url: '/bas/cargoSpace/' + cargoSpaceId,
+    method: 'get'
+  })
+}
+
+// 新增库存信息
+export function addCargoSpace(data) {
+  return request({
+    url: '/bas/cargoSpace',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存信息
+export function updateCargoSpace(data) {
+  return request({
+    url: '/bas/cargoSpace',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库存信息
+export function delCargoSpace(cargoSpaceId) {
+  return request({
+    url: '/bas/cargoSpace/' + cargoSpaceId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/bas/warehouse.js b/ruoyi-ui/src/api/bas/warehouse.js
new file mode 100644
index 0000000..52e5490
--- /dev/null
+++ b/ruoyi-ui/src/api/bas/warehouse.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询仓库管理列表
+export function listWarehouse(query) {
+  return request({
+    url: '/bas/warehouse/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询仓库管理详细
+export function getWarehouse(warehouseId) {
+  return request({
+    url: '/bas/warehouse/' + warehouseId,
+    method: 'get'
+  })
+}
+
+// 新增仓库管理
+export function addWarehouse(data) {
+  return request({
+    url: '/bas/warehouse',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改仓库管理
+export function updateWarehouse(data) {
+  return request({
+    url: '/bas/warehouse',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除仓库管理
+export function delWarehouse(warehouseId) {
+  return request({
+    url: '/bas/warehouse/' + warehouseId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/views/bas/cargoSpace/index.vue b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
new file mode 100644
index 0000000..e5a070d
--- /dev/null
+++ b/ruoyi-ui/src/views/bas/cargoSpace/index.vue
@@ -0,0 +1,477 @@
+<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="warehouseId">
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入仓库id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="巷道id" prop="roadwayId">
+        <el-input
+          v-model="queryParams.roadwayId"
+          placeholder="请输入巷道id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货区id" prop="cargoAreaId">
+        <el-input
+          v-model="queryParams.cargoAreaId"
+          placeholder="请输入货区id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位类型" prop="theTypeName">
+        <el-input
+          v-model="queryParams.theTypeName"
+          placeholder="请输入货位类型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="货位名称" prop="cargoSpaceName">
+        <el-input
+          v-model="queryParams.cargoSpaceName"
+          placeholder="请输入货位名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="排" prop="thePlatoon">
+        <el-input
+          v-model="queryParams.thePlatoon"
+          placeholder="请输入排"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="列" prop="theColumn">
+        <el-input
+          v-model="queryParams.theColumn"
+          placeholder="请输入列"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="层" prop="theFloor">
+        <el-input
+          v-model="queryParams.theFloor"
+          placeholder="请输入层"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否锁定" prop="locked">
+        <el-input
+          v-model="queryParams.locked"
+          placeholder="请输入是否锁定"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode">
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      
+      <!-- <el-form-item label="是否双伸 Y N " prop="issDouble">
+        <el-input
+          v-model="queryParams.issDouble"
+          placeholder="请输入是否双伸 Y N "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="双货位分组编码" prop="groupCodingNo">
+        <el-input
+          v-model="queryParams.groupCodingNo"
+          placeholder="请输入双货位分组编码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="双货位分组编码1、2… " prop="groupCoding">
+        <el-input
+          v-model="queryParams.groupCoding"
+          placeholder="请输入双货位分组编码1、2… "
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="双货位标识 0 外1内" prop="cargoSpaceLogo">
+        <el-input
+          v-model="queryParams.cargoSpaceLogo"
+          placeholder="请输入双货位标识 0 外1内"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="本仓库区域 1--8 A 
+9--15 B" prop="thisCargoArea">
+        <el-input
+          v-model="queryParams.thisCargoArea"
+          placeholder="请输入本仓库区域 1--8 A 
+9--15 B"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="handleAdd"
+          v-hasPermi="['bas:cargoSpace:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bas:cargoSpace:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bas:cargoSpace:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['bas:cargoSpace:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="cargoSpaceList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="货位id     主键 " align="center" prop="cargoSpaceId" />
+      <el-table-column label="仓库id" align="center" prop="warehouseId" />
+      <el-table-column label="巷道id" align="center" prop="roadwayId" />
+      <el-table-column label="货区id" align="center" prop="cargoAreaId" />
+      <el-table-column label="货位类型" align="center" prop="theType" />
+      <el-table-column label="货位类型名称" align="center" prop="theTypeName" />
+      <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
+      <el-table-column label="排" align="center" prop="thePlatoon" />
+      <el-table-column label="列" align="center" prop="theColumn" />
+      <el-table-column label="层" align="center" prop="theFloor" />
+      <el-table-column label="货位状态1空2满" align="center" prop="status" />
+      <el-table-column label="是否锁定" align="center" prop="locked" />
+      <el-table-column label="托盘条码" align="center" prop="trayCode" />
+      <el-table-column label="货位高度" align="center" prop="cargoHight" />
+      <el-table-column label="是否双伸 Y N " align="center" prop="issDouble" />
+      <el-table-column label="双货位分组编码" align="center" prop="groupCodingNo" />
+      <el-table-column label="双货位分组编码1、2… " align="center" prop="groupCoding" />
+      <el-table-column label="双货位标识 0 外1内" align="center" prop="cargoSpaceLogo" />
+      <el-table-column label="本仓库区域 1--8 A 
+9--15 B" align="center" prop="thisCargoArea" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['bas:cargoSpace:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['bas:cargoSpace:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改库存信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="仓库id" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入仓库id" />
+        </el-form-item>
+        <el-form-item label="巷道id" prop="roadwayId">
+          <el-input v-model="form.roadwayId" placeholder="请输入巷道id" />
+        </el-form-item>
+        <el-form-item label="货区id" prop="cargoAreaId">
+          <el-input v-model="form.cargoAreaId" placeholder="请输入货区id" />
+        </el-form-item>
+        <el-form-item label="货位类型名称" prop="theTypeName">
+          <el-input v-model="form.theTypeName" placeholder="请输入货位类型名称" />
+        </el-form-item>
+        <el-form-item label="货位名称" prop="cargoSpaceName">
+          <el-input v-model="form.cargoSpaceName" placeholder="请输入货位名称" />
+        </el-form-item>
+        <el-form-item label="排" prop="thePlatoon">
+          <el-input v-model="form.thePlatoon" placeholder="请输入排" />
+        </el-form-item>
+        <el-form-item label="列" prop="theColumn">
+          <el-input v-model="form.theColumn" placeholder="请输入列" />
+        </el-form-item>
+        <el-form-item label="层" prop="theFloor">
+          <el-input v-model="form.theFloor" placeholder="请输入层" />
+        </el-form-item>
+        <el-form-item label="是否锁定" prop="locked">
+          <el-input v-model="form.locked" placeholder="请输入是否锁定" />
+        </el-form-item>
+        <el-form-item label="托盘条码" prop="trayCode">
+          <el-input v-model="form.trayCode" placeholder="请输入托盘条码" />
+        </el-form-item>
+        <el-form-item label="是否双伸 Y N " prop="issDouble">
+          <el-input v-model="form.issDouble" placeholder="请输入是否双伸 Y N " />
+        </el-form-item>
+        <el-form-item label="双货位分组编码" prop="groupCodingNo">
+          <el-input v-model="form.groupCodingNo" placeholder="请输入双货位分组编码" />
+        </el-form-item>
+        <el-form-item label="双货位分组编码1、2… " prop="groupCoding">
+          <el-input v-model="form.groupCoding" placeholder="请输入双货位分组编码1、2… " />
+        </el-form-item>
+        <el-form-item label="双货位标识 0 外1内" prop="cargoSpaceLogo">
+          <el-input v-model="form.cargoSpaceLogo" placeholder="请输入双货位标识 0 外1内" />
+        </el-form-item>
+        <el-form-item label="本仓库区域 1--8 A 
+9--15 B" prop="thisCargoArea">
+          <el-input v-model="form.thisCargoArea" placeholder="请输入本仓库区域 1--8 A 
+9--15 B" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCargoSpace, getCargoSpace, delCargoSpace, addCargoSpace, updateCargoSpace } from "@/api/bas/cargoSpace"
+
+export default {
+  name: "CargoSpace",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库存信息表格数据
+      cargoSpaceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        warehouseId: null,
+        roadwayId: null,
+        cargoAreaId: null,
+        theType: null,
+        theTypeName: null,
+        cargoSpaceName: null,
+        thePlatoon: null,
+        theColumn: null,
+        theFloor: null,
+        status: null,
+        locked: null,
+        trayCode: null,
+        cargoHight: null,
+        issDouble: null,
+        groupCodingNo: null,
+        groupCoding: null,
+        cargoSpaceLogo: null,
+        thisCargoArea: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        warehouseId: [
+          { required: true, message: "仓库id不能为空", trigger: "blur" }
+        ],
+        cargoSpaceName: [
+          { required: true, message: "货位名称不能为空", trigger: "blur" }
+        ],
+        thePlatoon: [
+          { required: true, message: "排不能为空", trigger: "blur" }
+        ],
+        theColumn: [
+          { required: true, message: "列不能为空", trigger: "blur" }
+        ],
+        theFloor: [
+          { required: true, message: "层不能为空", trigger: "blur" }
+        ],
+        status: [
+          { required: true, message: "货位状态1空2满不能为空", trigger: "change" }
+        ],
+        locked: [
+          { required: true, message: "是否锁定不能为空", trigger: "blur" }
+        ],
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询库存信息列表 */
+    getList() {
+      this.loading = true
+      listCargoSpace(this.queryParams).then(response => {
+        this.cargoSpaceList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        cargoSpaceId: null,
+        warehouseId: null,
+        roadwayId: null,
+        cargoAreaId: null,
+        theType: null,
+        theTypeName: null,
+        cargoSpaceName: null,
+        thePlatoon: null,
+        theColumn: null,
+        theFloor: null,
+        status: null,
+        locked: null,
+        trayCode: null,
+        cargoHight: null,
+        issDouble: null,
+        groupCodingNo: null,
+        groupCoding: null,
+        cargoSpaceLogo: null,
+        thisCargoArea: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.cargoSpaceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加库存信息"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const cargoSpaceId = row.cargoSpaceId || this.ids
+      getCargoSpace(cargoSpaceId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改库存信息"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.cargoSpaceId != null) {
+            updateCargoSpace(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addCargoSpace(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const cargoSpaceIds = row.cargoSpaceId || this.ids
+      this.$modal.confirm('是否确认删除库存信息编号为"' + cargoSpaceIds + '"的数据项？').then(function() {
+        return delCargoSpace(cargoSpaceIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('bas/cargoSpace/export', {
+        ...this.queryParams
+      }, `cargoSpace_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/ruoyi-ui/src/views/bas/warehouse/index.vue b/ruoyi-ui/src/views/bas/warehouse/index.vue
new file mode 100644
index 0000000..65caafd
--- /dev/null
+++ b/ruoyi-ui/src/views/bas/warehouse/index.vue
@@ -0,0 +1,371 @@
+<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="warehouseId"> 
+        <el-input
+          v-model="queryParams.warehouseId"
+          placeholder="请输入id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库id" prop="warehouseNo">
+        <el-input
+          v-model="queryParams.warehouseNo"
+          placeholder="请输入仓库id"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="项目编号" prop="projectNo">
+        <el-input
+          v-model="queryParams.projectNo"
+          placeholder="请输入项目编号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库名称" prop="warehouseName">
+        <el-input
+          v-model="queryParams.warehouseName"
+          placeholder="请输入仓库名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入仓库地址"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库描述" prop="cDesc">
+        <el-input
+          v-model="queryParams.cDesc"
+          placeholder="请输入仓库描述"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="仓库级别" prop="warehouseKind">
+        <el-input
+          v-model="queryParams.warehouseKind"
+          placeholder="请输入仓库级别"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否可用" prop="isCurrent">
+        <el-select v-model="queryParams.isCurrent" placeholder="请选择是否可用" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_yes_no"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="handleAdd"
+          v-hasPermi="['bas:warehouse:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['bas:warehouse:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['bas:warehouse:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['bas:warehouse:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="warehouseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="id" align="center" prop="warehouseId" />
+      <el-table-column label="仓库id" align="center" prop="warehouseNo" />
+      <el-table-column label="项目编号" align="center" prop="projectNo" />
+      <el-table-column label="仓库名称" align="center" prop="warehouseName" />
+      <el-table-column label="仓库地址" align="center" prop="address" />
+      <el-table-column label="仓库描述" align="center" prop="cDesc" />
+      <el-table-column label="仓库级别" align="center" prop="warehouseKind" />
+      <el-table-column label="仓库类型" align="center" prop="warehouseType" />
+      <el-table-column label="是否可用" align="center" prop="isCurrent">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isCurrent"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['bas:warehouse:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['bas:warehouse:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改仓库管理对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="id" prop="warehouseId">
+          <el-input v-model="form.warehouseId" placeholder="请输入id"/>
+        </el-form-item>
+        <el-form-item label="仓库id" prop="warehouseNo">
+          <el-input v-model="form.warehouseNo" placeholder="请输入仓库id" />
+        </el-form-item>
+        <el-form-item label="项目编号" prop="projectNo">
+          <el-input v-model="form.projectNo" placeholder="请输入项目编号" />
+        </el-form-item>
+        <el-form-item label="仓库名称" prop="warehouseName">
+          <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
+        </el-form-item>
+        <el-form-item label="仓库地址" prop="address">
+          <el-input v-model="form.address" placeholder="请输入仓库地址" />
+        </el-form-item>
+        <el-form-item label="仓库描述" prop="cDesc">
+          <el-input v-model="form.cDesc" placeholder="请输入仓库描述" />
+        </el-form-item>
+        <el-form-item label="仓库级别" prop="warehouseKind">
+          <el-input v-model="form.warehouseKind" placeholder="请输入仓库级别" />
+        </el-form-item>
+        <el-form-item label="是否可用" prop="isCurrent">
+          <el-select v-model="form.isCurrent" placeholder="请选择是否可用">
+            <el-option
+              v-for="dict in dict.type.sys_yes_no"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listWarehouse, getWarehouse, delWarehouse, addWarehouse, updateWarehouse } from "@/api/bas/warehouse"
+
+export default {
+  name: "Warehouse",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 仓库管理表格数据
+      warehouseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        warehouseId: null,
+        warehouseNo: null,
+        projectNo: null,
+        warehouseName: null,
+        address: null,
+        cDesc: null,
+        warehouseKind: null,
+        warehouseType: null,
+        isCurrent: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        warehouseId: [
+          { required: true, message: "id不能为空", trigger: "blur" }
+        ],
+        warehouseNo: [
+          { required: true, message: "仓库id不能为空", trigger: "blur" }
+        ],
+        warehouseName: [
+          { required: true, message: "仓库名称不能为空", trigger: "blur" }
+        ],
+        isCurrent: [
+          { required: true, message: "是否可用不能为空", trigger: "change" }
+        ]
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询仓库管理列表 */
+    getList() {
+      this.loading = true
+      listWarehouse(this.queryParams).then(response => {
+        this.warehouseList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        warehouseId: null,
+        warehouseNo: null,
+        projectNo: null,
+        warehouseName: null,
+        address: null,
+        cDesc: null,
+        warehouseKind: null,
+        warehouseType: null,
+        isCurrent: null
+      }
+      this.resetForm("form")
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.warehouseId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = "添加仓库管理"
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const warehouseId = row.warehouseId || this.ids
+      getWarehouse(warehouseId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = "修改仓库管理"
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.title == "修改仓库管理") {
+            updateWarehouse(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功")
+              this.open = false
+              this.getList()
+            })
+          } 
+          if (this.title == "添加仓库管理") {
+            addWarehouse(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功")
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const warehouseIds = row.warehouseId || this.ids
+      this.$modal.confirm('是否确认删除仓库管理编号为"' + warehouseIds + '"的数据项？').then(function() {
+        return delWarehouse(warehouseIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess("删除成功")
+      }).catch(() => {})
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('bas/warehouse/export', {
+        ...this.queryParams
+      }, `warehouse_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>