diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue
index 4030043..8f3ba65 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/Edit.vue
@@ -5,6 +5,7 @@
 <script>
 import BASE_URL from '@/services/mes/api.js';
 
+const settings = require('../../basic/settings.js');
 
 export default {
 
@@ -107,10 +108,10 @@ export default {
 					warehouse_phone: "",
 					warehouse_remark: "",
 					warehouse_negative_stock: 0,
-					warehouse_location: 0,
-					warehouse_batch: 0,
-					warehouse_serial: 0,
-					warehouse_storage_type: 0,
+					warehouse_location: 1,
+					warehouse_batch: 1,
+					warehouse_serial: 1,
+					warehouse_storage_type: 1,
 					warehouse_effective_date: new Date(2100, 1, 1).getTime() / 10000,
 					warehouse_invalid_date: new Date(2100, 1, 1).getTime() / 10000,
 					warehouse_status: 0,
@@ -122,7 +123,7 @@ export default {
           // =============================== 表单数据 自动生成 End ===============================
         },
           // 标题宽度
-          titleWidth: 100,
+          titleWidth: 150,
           // 标题对齐方式
           titleAlign: 'right',
 
@@ -132,6 +133,9 @@ export default {
 
             code: [
               { required: true, message: '请输入编码' }
+            ] ,
+            warehouse_name: [
+              { required: true, message: '请输入仓库名称' }
             ] 
             // =============================== 表单校验 自动生成 End ===============================
           },
@@ -140,24 +144,25 @@ export default {
             // =============================== 表单项 自动生成 Start ===============================
 
 					{ field: 'code', title: '编码', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_title', title: '仓库名称', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_name', title: '仓库英文名称', span: 12, itemRender: { name: '$input' } },
+					//{ field: 'warehouse_title', title: '仓库名称', span: 12, itemRender: { name: '$input' } },
+					{ field: 'warehouse_name', title: '仓库名称', span: 12, itemRender: { name: '$input' } },
+
 					{ field: 'warehouse_code', title: '仓库编码', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_type', title: '仓库类型:1.普通仓库,2.现场仓库,3.委外仓库', span: 12, itemRender: { name: '$input' } },
+					{ field: 'warehouse_type', title: '仓库类型', span: 12, itemRender: { name: '$select',props:{options:settings.options_warehouse_type} } },
 					{ field: 'warehouse_address', title: '仓库地址', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_uid', title: '仓库负责人UID', span: 12, itemRender: { name: '$input' } },
+					//{ field: 'warehouse_uid', title: '仓库负责人UID', span: 12, itemRender: { name: '$input' } },
 					{ field: 'warehouse_uname', title: '仓库负责人姓名', span: 12, itemRender: { name: '$input' } },
 					{ field: 'warehouse_mobile', title: '仓库负责人手机号', span: 12, itemRender: { name: '$input' } },
 					{ field: 'warehouse_phone', title: '仓库电话', span: 12, itemRender: { name: '$input' } },
 					{ field: 'warehouse_remark', title: '仓库备注', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_negative_stock', title: '仓库是否允许负库存:0.不允许,1.允许', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_location', title: '是否启用库位管理:0.不启用,1.启用', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_batch', title: '是否启用批次管理:0.不启用,1.启用', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_serial', title: '是否启用序列号:0.不启用,1.启用', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_storage_type', title: '存储类型:1.可用,2.待检,3.在检,4.不合格,5.报废,6.待返工', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_effective_date', title: '仓库生效日期', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_invalid_date', title: '仓库失效日期', span: 12, itemRender: { name: '$input' } },
-					{ field: 'warehouse_status', title: '仓库状态:0.禁用,1.启用', span: 12, itemRender: { name: '$input' } },
+					{ field: 'warehouse_negative_stock', title: '仓库是否允许负库存', span: 12, itemRender: { name: '$select',props:{options:settings.options_warehouse_negative_stock} } },
+					{ field: 'warehouse_location', title: '是否启用库位管理', span: 12, itemRender: { name: '$select',props:{options:settings.options_is_open} } },
+					{ field: 'warehouse_batch', title: '是否启用批次管理', span: 12, itemRender: { name: '$select',props:{options:settings.options_is_open} } },
+					{ field: 'warehouse_serial', title: '是否启用序列号', span: 12, itemRender: { name: '$select',props:{options:settings.options_is_open} } },
+					{ field: 'warehouse_storage_type', title: '存储类型', span: 12, itemRender: { name: '$select',props:{options:settings.options_warehouse_storage_type} } },
+					{ field: 'warehouse_effective_date',dataRule:{type:"timestamp"}, title: '仓库生效日期', span: 12, itemRender: { name: '$input',props:{type:"date"} } },
+					{ field: 'warehouse_invalid_date', dataRule:{type:"timestamp"},title: '仓库失效日期', span: 12, itemRender: { name: '$input',props:{type:"date"} } },
+					{ field: 'warehouse_status', title: '仓库状态', span: 12, itemRender: { name: '$select',props:{options:settings.options_is_enabled} } },
 
           // =============================== 表单项 自动生成 End ===============================
           ]
diff --git a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue
index a7399b9..349033e 100644
--- a/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue
+++ b/src/pages/Middle/Mes/MesWarehouse/MesWarehouse/List.vue
@@ -5,6 +5,7 @@
 <script>
 import BASE_URL from '@/services/mes/api.js';
 
+const settings = require('../../basic/settings.js');
 
 export default { 
   i18n: require("./i18n"), 
@@ -115,21 +116,21 @@ export default {
 					{ field: 'warehouse_title', sortable: true, title: '仓库名称', width: 250 }, // 仓库名称
 					{ field: 'warehouse_name', sortable: true, title: '仓库英文名称', width: 250 }, // 仓库英文名称
 					{ field: 'warehouse_code', sortable: true, title: '仓库编码', width: 250 }, // 仓库编码
-					{ field: 'warehouse_type', sortable: true, title: '仓库类型:1.普通仓库,2.现场仓库,3.委外仓库', width: 250 }, // 仓库类型:1.普通仓库,2.现场仓库,3.委外仓库
+					{ field: 'warehouse_type',params:settings.options_warehouse_type,   formatter: 'formatEnum', sortable: true, title: '仓库类型', width: 250 }, // 仓库类型:1.普通仓库,2.现场仓库,3.委外仓库
 					{ field: 'warehouse_address', sortable: true, title: '仓库地址', width: 250 }, // 仓库地址
-					{ field: 'warehouse_uid', sortable: true, title: '仓库负责人UID', width: 250 }, // 仓库负责人UID
+					//{ field: 'warehouse_uid', sortable: true, title: '仓库负责人UID', width: 250 }, // 仓库负责人UID
 					{ field: 'warehouse_uname', sortable: true, title: '仓库负责人姓名', width: 250 }, // 仓库负责人姓名
 					{ field: 'warehouse_mobile', sortable: true, title: '仓库负责人手机号', width: 250 }, // 仓库负责人手机号
 					{ field: 'warehouse_phone', sortable: true, title: '仓库电话', width: 250 }, // 仓库电话
 					{ field: 'warehouse_remark', sortable: true, title: '仓库备注', width: 250 }, // 仓库备注
-					{ field: 'warehouse_negative_stock', sortable: true, title: '仓库是否允许负库存:0.不允许,1.允许', width: 250 }, // 仓库是否允许负库存:0.不允许,1.允许
-					{ field: 'warehouse_location', sortable: true, title: '是否启用库位管理:0.不启用,1.启用', width: 250 }, // 是否启用库位管理:0.不启用,1.启用
-					{ field: 'warehouse_batch', sortable: true, title: '是否启用批次管理:0.不启用,1.启用', width: 250 }, // 是否启用批次管理:0.不启用,1.启用
-					{ field: 'warehouse_serial', sortable: true, title: '是否启用序列号:0.不启用,1.启用', width: 250 }, // 是否启用序列号:0.不启用,1.启用
-					{ field: 'warehouse_storage_type', sortable: true, title: '存储类型:1.可用,2.待检,3.在检,4.不合格,5.报废,6.待返工', width: 250 }, // 存储类型:1.可用,2.待检,3.在检,4.不合格,5.报废,6.待返工
-					{ field: 'warehouse_effective_date', sortable: true, title: '仓库生效日期', width: 250 }, // 仓库生效日期
-					{ field: 'warehouse_invalid_date', sortable: true, title: '仓库失效日期', width: 250 }, // 仓库失效日期
-					{ field: 'warehouse_status', sortable: true, title: '仓库状态:0.禁用,1.启用', width: 250 }, // 仓库状态:0.禁用,1.启用
+					{ field: 'warehouse_negative_stock',params:settings.options_warehouse_negative_stock,   formatter: 'formatEnum', sortable: true, title: '仓库是否允许负库存', width: 250 }, // 仓库是否允许负库存:0.不允许,1.允许
+					{ field: 'warehouse_location', params:settings.options_is_open,   formatter: 'formatEnum', sortable: true, title: '是否启用库位管理', width: 250 }, // 是否启用库位管理:0.不启用,1.启用
+					{ field: 'warehouse_batch',params:settings.options_is_open,   formatter: 'formatEnum',  sortable: true, title: '是否启用批次管理', width: 250 }, // 是否启用批次管理:0.不启用,1.启用
+					{ field: 'warehouse_serial',params:settings.options_is_open,   formatter: 'formatEnum',  sortable: true, title: '是否启用序列号', width: 250 }, // 是否启用序列号:0.不启用,1.启用
+					{ field: 'warehouse_storage_type',params:settings.options_warehouse_storage_type,   formatter: 'formatEnum',  sortable: true, title: '存储类型', width: 250 }, // 存储类型:1.可用,2.待检,3.在检,4.不合格,5.报废,6.待返工
+					{ field: 'warehouse_effective_date',  formatter: 'formatDate', sortable: true, title: '仓库生效日期', width: 250 }, // 仓库生效日期
+					{ field: 'warehouse_invalid_date',  formatter: 'formatDate', sortable: true, title: '仓库失效日期', width: 250 }, // 仓库失效日期
+					{ field: 'warehouse_status',params:settings.options_is_enabled,   formatter: 'formatEnum', sortable: true, title: '仓库状态', width: 250 }, // 仓库状态:0.禁用,1.启用
  
 					{ field: 'create_time', formatter: 'formatDate', width: 160, sortable: true, title: '创建时间', showHeaderOverflow: true }, // 创建时间
 					{ field: 'update_time', formatter: 'formatDate', width: 160, sortable: true, title: '更新时间', showHeaderOverflow: true }, // 更新时间
diff --git a/src/pages/Middle/Mes/basic/settings.js b/src/pages/Middle/Mes/basic/settings.js
index 773db6d..2a9df5d 100644
--- a/src/pages/Middle/Mes/basic/settings.js
+++ b/src/pages/Middle/Mes/basic/settings.js
@@ -10,6 +10,40 @@ var config = {
         {value:'开启',label:'开启'},
         {value:'暂停',label:'暂停'}
     ],
+
+    options_is_open:[
+        {value:0,label:'不开启'},
+        {value:1,label:'开启'} 
+    ],
+
+    //:0.禁用,1.启用
+    options_is_enabled:[
+        {value:0,label:'禁用'},
+        {value:1,label:'启用'} 
+    ],
+
+
+    options_warehouse_type:[
+        {value:1,label:'普通仓库'},
+        {value:2,label:'现场仓库'},
+        {value:3,label:'委外仓库'}
+    ],
+
+
+    options_warehouse_negative_stock:[
+        {value:0,label:'不允许'},
+        {value:1,label:'允许'} 
+    ],
+
+    //1.可用,2.待检,3.在检,4.不合格,5.报废,6.待返工
+    options_warehouse_storage_type:[
+        {value:1,label:'可用'},
+        {value:2,label:'待检'} ,
+        {value:3,label:'在检'} ,
+        {value:4,label:'不合格'} ,
+        {value:5,label:'报废'} ,
+        {value:6,label:'待返工'} 
+    ],
 }
 
 module.exports = config
\ No newline at end of file