diff --git a/src/views/wms/location/index.vue b/src/views/wms/location/index.vue
index b5136bb..e4cb8cc 100644
--- a/src/views/wms/location/index.vue
+++ b/src/views/wms/location/index.vue
@@ -90,8 +90,11 @@
       <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="shelfOrder" />
+      <el-table-column label="盘点顺序" align="center" prop="checkOrder" />
+      <el-table-column label="拣货顺序" align="center" prop="pickOrder" />
 			<el-table-column label="创建人" align="center" prop="createBy" />
-      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
       <el-table-column prop="activeFlag" label="是否启用" align="center">
         <template slot-scope="scope">
           {{ scope.row.activeFlag == 1 ? "是" : "否" }}
@@ -128,37 +131,29 @@
 		<!-- 添加或修改货位管理对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+			      <el-form-item label="货位编码" prop="locationCode">
+      				<el-input v-model="form.locationCode" placeholder="请输入货位编码" style="width:300px"/>
+      			</el-form-item>
 						<el-form-item label="仓库编码" prop="warehouseCode">
 					    <el-input v-model="form.warehouseCode" placeholder="请输入仓库编码" style="width:300px"/>
 				        </el-form-item>
 					  <el-form-item label="库区编码" prop="areaCode">
 							<el-input v-model="form.areaCode" placeholder="请输入库区编码" style="width:300px"/>
 						</el-form-item>
-						</el-col>
-						 </el-row>
-               <el-form-item label="货位编码" prop="locationCode">
-							<el-input v-model="form.locationCode" placeholder="请输入货位编码" style="width:300px"/>
-						</el-form-item>
 					  <el-form-item label="是否启用" prop="activeFlag" >
               <el-select v-model="form.activeFlag" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:300px">
                 <el-option v-for="item in options" :key="item.activeFlag" :label="item.label" :value="item.activeFlag"></el-option>
               </el-select>
             </el-form-item>
-				                        <!-- <el-form-item label="上架顺序" prop="shelfOrder">
-                            <el-input v-model="form.shelfOrder" placeholder="请输入上架顺序" />
-                        </el-form-item> -->
- 			  	<!-- <el-row :gutter="10" class="mb8">
- 			    	<el-col :span="12">
-      					<el-form-item label="盘点顺序" prop="checkOrder">
-      						<el-input v-model="form.checkOrder" placeholder="请输入盘点顺序" />
+				     <el-form-item label="上架顺序" prop="shelfOrder" >
+                <el-input v-model="form.shelfOrder" placeholder="请输入上架顺序" style="width:300px"/>
+             </el-form-item>
+      					<el-form-item label="盘点顺序" prop="checkOrder" >
+      						<el-input v-model="form.checkOrder" placeholder="请输入盘点顺序" style="width:300px"/>
       					</el-form-item>
-           			</el-col>
-           			<el-col :span="12">
-             			<el-form-item label="拣货顺序" prop="pickOrder">
-             				<el-input v-model="form.pickOrder" placeholder="请输入拣货顺序" />
+             			<el-form-item label="拣货顺序" prop="pickOrder" >
+             				<el-input v-model="form.pickOrder" placeholder="请输入拣货顺序" style="width:300px"/>
              			</el-form-item>
-           			</el-col>
-        		</el-row> -->
 		 		<!-- <el-row :gutter="10" class="mb8">
 			    	<el-col :span="12">
             			<el-form-item label="货位使用" prop="locationUse">
diff --git a/src/views/wms/supplier/index.vue b/src/views/wms/supplier/index.vue
index fcfe807..23f15ab 100644
--- a/src/views/wms/supplier/index.vue
+++ b/src/views/wms/supplier/index.vue
@@ -198,24 +198,24 @@
 			<el-table-column label="供应商名字" align="center" prop="zhDesc" width="100"/>
 			<el-table-column label="英文描述" align="center" prop="enDesc" />
 			<el-table-column label="供应商类型" align="center" prop="supplierType" width="100"/>
-			<el-table-column label="账号" align="center" prop="accountNumber" />
-			<el-table-column label="证照编码" align="center" prop="licenceNumber" />
+			<el-table-column label="账号" align="center" prop="accountNumber" width="100"/>
+			<el-table-column label="证照编码" align="center" prop="licenceNumber" width="200"/>
 			<el-table-column label="经营范围" align="center" prop="businessScope" />
+			<el-table-column label="国家" align="center" prop="userDefined1" />
 			<el-table-column label="省" align="center" prop="province" />
 			<el-table-column label="市" align="center" prop="city" />
 			<el-table-column label="区" align="center" prop="area" />
-			<el-table-column label="详细地址" align="center" prop="address" />
+			<el-table-column label="详细地址" align="center" prop="address" width="300"/>
 			<el-table-column label="邮编" align="center" prop="postcode" />
 			<el-table-column label="联系人" align="center" prop="contact" />
-			<el-table-column label="联系人电话" align="center" prop="contactPhone" width="100"/>
+			<el-table-column label="联系人电话" align="center" prop="contactPhone" width="120"/>
 			<el-table-column label="联系人职务" align="center" prop="contactPosition" width="100"/>
-			<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="120"/>
+			<el-table-column label="联系人电子邮件" align="center" prop="contactEmail" width="200"/>
 			<el-table-column label="激活标记" align="center" prop="activeFlag">
 			<template slot-scope="scope">
               {{ scope.row.activeFlag == 1 ? "是" : "否" }}
             </template>
 		    </el-table-column>
-			<el-table-column label="国家" align="center" prop="userDefined1" />
 			<el-table-column label="税号" align="center" prop="userDefined2" />
 			<!-- <el-table-column label="用户自定义3" align="center" prop="userDefined3" />
 			<el-table-column label="备注" align="center" prop="remark" /> -->