diff --git a/src/api/mes/wm/location.js b/src/api/mes/wm/location.js
new file mode 100644
index 0000000..9ab6d4c
--- /dev/null
+++ b/src/api/mes/wm/location.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询库区设置列表
+export function listLocation(query) {
+  return request({
+    url: '/mes/wm/location/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询库区设置详细
+export function getLocation(locationId) {
+  return request({
+    url: '/mes/wm/location/' + locationId,
+    method: 'get'
+  })
+}
+
+// 新增库区设置
+export function addLocation(data) {
+  return request({
+    url: '/mes/wm/location',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库区设置
+export function updateLocation(data) {
+  return request({
+    url: '/mes/wm/location',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除库区设置
+export function delLocation(locationId) {
+  return request({
+    url: '/mes/wm/location/' + locationId,
+    method: 'delete'
+  })
+}
diff --git a/src/router/index.js b/src/router/index.js
index c6caf31..c6f8a48 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -143,11 +143,25 @@ export const dynamicRoutes = [
       {
         path: 'index/:ruleId(\\d+)',
         component: () => import('@/views/system/autocode/part'),
-        name: 'Data',
+        name: 'AutoCode',
         meta: { title: '规则组成', activeMenu: '/system/autocode' }
       }
     ]
   },
+  {
+    path: '/mes/wm/location',
+    component: Layout,
+    hidden: true,
+    permissions: ['mes:wm:location:list'],
+    children: [
+      {
+        path: 'index',
+        component: () => import('@/views/mes/wm/location/index'),
+        name: 'locationList',
+        meta: { title: '库区设置', activeMenu: '/mes/wm/location' }
+      }
+    ]
+  },
   {
     path: '/monitor/job-log',
     component: Layout,
diff --git a/src/views/mes/wm/location/index.vue b/src/views/mes/wm/location/index.vue
new file mode 100644
index 0000000..a8d6362
--- /dev/null
+++ b/src/views/mes/wm/location/index.vue
@@ -0,0 +1,365 @@
+<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="库区名称" prop="locationName">
+        <el-input
+          v-model="queryParams.locationName"
+          placeholder="请输入库区名称"
+          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="['mes:wm:location: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="['mes:wm:location: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="['mes:wm:location:remove']"
+        >删除</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="locationList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="库区编码" align="center" prop="locationCode" >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row)"
+            v-hasPermi="['mes:md:location:query']"
+          >{{scope.row.locationCode}}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="库区名称" align="center" prop="locationName" />
+      <el-table-column label="面积" align="center" prop="area" />
+      <el-table-column label="是否开启库位管理" align="center" prop="areaFlag" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.areaFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
+      <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-s-shop"
+            v-if="scope.row.areaFlag =='Y'"
+            @click="handleArea(scope.row.locationId)"
+            v-hasPermi="['wm:area:edit']"
+          >库位</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:wm:location:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:wm:location: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="960px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="库区编码" prop="locationCode">
+            <el-input v-model="form.locationCode" placeholder="请输入库区编码" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-form-item  label-width="80">
+            <el-switch v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)" v-if="optType != 'view'">               
+            </el-switch>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="库区名称" prop="locationName">
+            <el-input v-model="form.locationName" placeholder="请输入库区名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="面积" prop="area">
+            <el-input v-model="form.area" placeholder="请输入面积" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="是否开启库位管理" prop="areaFlag">
+            <el-radio-group v-model="form.areaFlag" disabled v-if="optType=='view'">
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+              <el-radio-group v-model="form.areaFlag" v-else>
+                <el-radio
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
+        <el-button type="primary" @click="submitForm" v-else>确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listLocation, getLocation, delLocation, addLocation, updateLocation } from "@/api/mes/wm/location";
+import {genCode} from "@/api/system/autocode/rule"
+export default {
+  name: "Location",
+  dicts: ['sys_yes_no'],
+  data() {
+    return {
+      //自动生成编码
+      autoGenFlag:false,
+      optType: undefined,
+      warehouseId: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 库区设置表格数据
+      locationList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        locationCode: null,
+        locationName: null,
+        warehouseId: null,
+        area: null,
+        areaFlag: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        locationCode: [
+          { required: true, message: "库区编码不能为空", trigger: "blur" }
+        ],
+        locationName: [
+          { required: true, message: "库区名称不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    //从上级页面获取的规则ID
+    const warehouseId = this.$route.query.warehouseId;
+    this.warehouseId = warehouseId;
+    this.queryParams.warehouseId = warehouseId;
+    this.getList();
+  },
+  methods: {
+    /** 查询库区设置列表 */
+    getList() {
+      this.loading = true;
+      listLocation(this.queryParams).then(response => {
+        this.locationList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        locationId: null,
+        locationCode: null,
+        locationName: null,
+        warehouseId: this.warehouseId,
+        area: null,
+        areaFlag: null,
+        remark: null,
+        attr1: null,
+        attr2: null,
+        attr3: null,
+        attr4: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.locationId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加库区设置";
+      this.optType = "add";
+    },
+    // 查询明细按钮操作
+    handleView(row){
+      this.reset();
+      const locationId = row.locationId || this.ids
+      getWarehouse(locationId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "查看库区";
+        this.optType = "view";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const locationId = row.locationId || this.ids
+      getLocation(locationId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改库区设置";
+        this.optType = "edit";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.locationId != null) {
+            updateLocation(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLocation(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const locationIds = row.locationId || this.ids;
+      this.$modal.confirm('是否确认删除库区设置编号为"' + locationIds + '"的数据项？').then(function() {
+        return delLocation(locationIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wm/location/export', {
+        ...this.queryParams
+      }, `location_${new Date().getTime()}.xlsx`)
+    },
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag){
+      if(autoGenFlag){
+        genCode('LOCATION_CODE').then(response =>{
+          this.form.locationCode = response;
+        });
+      }else{
+        this.form.locationCode = null;
+      }      
+    }
+  }
+};
+</script>
diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue
index c0e2b0a..c8fa693 100644
--- a/src/views/mes/wm/warehouse/index.vue
+++ b/src/views/mes/wm/warehouse/index.vue
@@ -87,7 +87,7 @@
             icon="el-icon-s-shop"
             @click="handleLocation(scope.row.warehouseId)"
             v-hasPermi="['wm:warehouse:edit']"
-          >设置库区</el-button>
+          >库区</el-button>
           <el-button
             size="mini"
             type="text"
@@ -347,10 +347,8 @@ export default {
       }, `warehouse_${new Date().getTime()}.xlsx`)
     },
     handleLocation(warehouseId){
-      this.$router.push({
-        path: "/mes/wm/location/index/"+warehouseId,
-        params: {'optType': this.optType}
-      });
+      debugger;
+      this.$router.push({ path: '/mes/wm/location/index', query: { warehouseId: warehouseId || 0 ,optType: this.optType} })
     },
     //自动生成编码
     handleAutoGenChange(autoGenFlag){