diff --git a/src/views/wms/area/index.vue b/src/views/wms/area/index.vue
index 1cc3e42..d0ef17b 100644
--- a/src/views/wms/area/index.vue
+++ b/src/views/wms/area/index.vue
@@ -79,8 +79,9 @@
         :index="indexMethod"
         label="序号">
       </el-table-column>
+      <el-table-column label="库区编码" align="center" prop="areaCode" />
+      <el-table-column label="库区描述" align="center" prop="areaDesc" />
 			<el-table-column label="仓库编码" align="center" prop="whCode" />
-			<el-table-column label="库区编码" align="center" prop="areaCode" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
 			<el-table-column label="创建时间" align="center" prop="createTime" />
 			<el-table-column prop="activeFlag" label="是否启用" align="center">
diff --git a/src/views/wms/location/index.vue b/src/views/wms/location/index.vue
index 49caf48..b5136bb 100644
--- a/src/views/wms/location/index.vue
+++ b/src/views/wms/location/index.vue
@@ -1,6 +1,14 @@
 <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="locationCode">
+          	<el-input
+          		v-model="queryParams.locationCode"
+          		placeholder="请输入货位编码"
+          		clearable
+          		@keyup.enter.native="handleQuery"
+          	/>
+          </el-form-item>
 			<el-form-item label="仓库编码" prop="warehouseCode">
 				<el-input
 					v-model="queryParams.warehouseCode"
@@ -17,14 +25,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="货位编码" prop="locationCode">
-      	<el-input
-      		v-model="queryParams.locationCode"
-      		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>
@@ -87,9 +87,9 @@
         :index="indexMethod"
         label="序号">
       </el-table-column>
+      <el-table-column label="货位编码" align="center" prop="locationCode" />
 			<el-table-column label="仓库编码" align="center" prop="warehouseCode" />
 			<el-table-column label="库区编码" align="center" prop="areaCode" />
-			<el-table-column label="货位编码" align="center" prop="locationCode" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column prop="activeFlag" label="是否启用" align="center">