diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 17c0a44..ea5bb60 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -94,7 +94,11 @@
 			<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="100"/>
 			<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="100"/>
 			<el-table-column label="所属车间名称" align="center" prop="workshopName" width="100"/>
-			<el-table-column label="设备状态" align="center" prop="status" />
+			<el-table-column label="设备状态" align="center" prop="status">
+        <template slot-scope="scope">
+          {{ scope.row.status == 1 ? "是" : "否" }}
+        </template>
+      </el-table-column>
 			<el-table-column label="单台能力工时" align="center" prop="unitWorkingHours" width="100"/>
 			<el-table-column label="工段" align="center" prop="workshopSection" />
 			<el-table-column label="设备位置" align="center" prop="equipmentLocation" />
@@ -150,7 +154,7 @@
                     </el-col>
                     <el-col :span="12">
 						<el-form-item label="设备类型" prop="equipmentTypeCode">
-							<el-select v-model="form.equipmentTypeCode" placeholder="请选择设备类型">
+							<el-select v-model="form.equipmentTypeCode" placeholder="请选择设备类型" style="width:355px">
                 <el-option
                   v-for="dict in dict.type.equ_type"
                   :key="dict.value"
@@ -197,6 +201,11 @@
 						</el-form-item>
                     </el-col>
                 </el-row>
+            <el-form-item label="设备状态" prop="status" >
+              <el-select v-model="form.status" placeholder="请选择是否启用"  @change="$forceUpdate()" clearable style="width:350px">
+                 <el-option v-for="item in options" :key="item.status" :label="item.label" :value="item.status"></el-option>
+              </el-select>
+            </el-form-item>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -255,6 +264,13 @@ export default {
 				equipmentLocation: null,
 				hourlyUnitPrice: null
 			},
+			  options: [{
+          status: "1",
+          label: '是'
+        }, {
+          status: "0",
+          label: '否'
+        }],
 			// 表单参数
 			form: {},
 			// 表单校验